Merge branch 'master' into master

.github/workflows/gradle-wrapper-validation.yml

@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push, pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl

@@ -100,6 +100,8 @@ import net.osmand.aidlapi.lock.SetLockStateParams;
 
 import net.osmand.aidlapi.events.AKeyEventsParams;
 
+import net.osmand.aidlapi.info.AppInfoParams;
+
 // NOTE: Add new methods at the end of file!!!
 
 interface IOsmAndAidlInterface {
@@ -860,4 +862,6 @@ interface IOsmAndAidlInterface {
      * @params keyEventList (List<Integer>) - list of requested key events
      */
     long registerForKeyEvents(in AKeyEventsParams params, IOsmAndAidlCallback callback);
+
+    AppInfoParams getAppInfo();
 }

OsmAnd-api/src/net/osmand/aidlapi/info/AppInfoParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.info;
+
+parcelable AppInfoParams;

OsmAnd-api/src/net/osmand/aidlapi/info/AppInfoParams.java

@@ -0,0 +1,95 @@
+package net.osmand.aidlapi.info;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+import net.osmand.aidlapi.map.ALatLon;
+
+public class AppInfoParams extends AidlParams {
+
+	private ALatLon lastKnownLocation;
+	private ALatLon mapLocation;
+
+	private Bundle turnInfo;
+	private int leftTime;
+	private int leftDistance;
+	private long arrivalTime;
+	private boolean mapVisible;
+
+	public AppInfoParams(ALatLon lastKnownLocation, ALatLon mapLocation, Bundle turnInfo, int leftTime, int leftDistance, long arrivalTime, boolean mapVisible) {
+		this.lastKnownLocation = lastKnownLocation;
+		this.mapLocation = mapLocation;
+		this.leftTime = leftTime;
+		this.leftDistance = leftDistance;
+		this.arrivalTime = arrivalTime;
+		this.turnInfo = turnInfo;
+		this.mapVisible = mapVisible;
+	}
+
+	public AppInfoParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<AppInfoParams> CREATOR = new Creator<AppInfoParams>() {
+		@Override
+		public AppInfoParams createFromParcel(Parcel in) {
+			return new AppInfoParams(in);
+		}
+
+		@Override
+		public AppInfoParams[] newArray(int size) {
+			return new AppInfoParams[size];
+		}
+	};
+
+	public ALatLon getLastKnownLocation() {
+		return lastKnownLocation;
+	}
+
+	public ALatLon getMapLocation() {
+		return mapLocation;
+	}
+
+	public int getLeftTime() {
+		return leftTime;
+	}
+
+	public long getArrivalTime() {
+		return arrivalTime;
+	}
+
+	public int getLeftDistance() {
+		return leftDistance;
+	}
+
+	public boolean isMapVisible() {
+		return mapVisible;
+	}
+
+	public Bundle getTurnInfo() {
+		return turnInfo;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putParcelable("lastKnownLocation", lastKnownLocation);
+		bundle.putParcelable("mapLocation", mapLocation);
+		bundle.putInt("leftTime", leftTime);
+		bundle.putLong("arrivalTime", arrivalTime);
+		bundle.putInt("leftDistance", leftDistance);
+		bundle.putBundle("turnInfo", turnInfo);
+		bundle.putBoolean("mapVisible", mapVisible);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		lastKnownLocation = bundle.getParcelable("lastKnownLocation");
+		mapLocation = bundle.getParcelable("mapLocation");
+		leftTime = bundle.getInt("leftTime");
+		arrivalTime = bundle.getLong("arrivalTime");
+		leftDistance = bundle.getInt("leftDistance");
+		turnInfo = bundle.getBundle("turnInfo");
+		mapVisible = bundle.getBoolean("mapVisible");
+	}
+}

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

@@ -0,0 +1,159 @@
+package net.osmand;
+
+import net.osmand.GPXUtilities.WptPt;
+import net.osmand.data.LatLon;
+import net.osmand.util.Algorithms;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LocationsHolder {
+
+	private static final int LOCATION_TYPE_UNKNOWN = -1;
+	private static final int LOCATION_TYPE_LATLON = 0;
+	private static final int LOCATION_TYPE_LOCATION = 1;
+	private static final int LOCATION_TYPE_WPTPT = 2;
+
+	private List<LatLon> latLonList;
+	private List<Location> locationList;
+	private List<WptPt> wptPtList;
+	private int locationType;
+	private int size;
+
+	@SuppressWarnings("unchecked")
+	public LocationsHolder(List<?> locations) {
+		this.locationType = resolveLocationType(locations);
+		switch (locationType) {
+			case LOCATION_TYPE_LATLON:
+				latLonList = (List<LatLon>) locations;
+				size = locations.size();
+				break;
+			case LOCATION_TYPE_LOCATION:
+				locationList = (List<Location>) locations;
+				size = locations.size();
+				break;
+			case LOCATION_TYPE_WPTPT:
+				wptPtList = (List<WptPt>) locations;
+				size = locations.size();
+				break;
+		}
+	}
+
+	private int resolveLocationType(List<?> locations) {
+		if (!Algorithms.isEmpty(locations)) {
+			Object locationObj = locations.get(0);
+			if (locationObj instanceof LatLon) {
+				return LOCATION_TYPE_LATLON;
+			} else if (locationObj instanceof WptPt) {
+				return LOCATION_TYPE_WPTPT;
+			} else if (locationObj instanceof Location) {
+				return LOCATION_TYPE_LOCATION;
+			} else {
+				throw new IllegalArgumentException("Unsupported location type: " + locationObj.getClass().getSimpleName());
+			}
+		}
+		return LOCATION_TYPE_UNKNOWN;
+	}
+
+	public double getLatitude(int index) {
+		switch (locationType) {
+			case LOCATION_TYPE_LATLON:
+				return latLonList.get(index).getLatitude();
+			case LOCATION_TYPE_LOCATION:
+				return locationList.get(index).getLatitude();
+			case LOCATION_TYPE_WPTPT:
+				return wptPtList.get(index).getLatitude();
+			default:
+				return 0;
+		}
+	}
+
+	public double getLongitude(int index) {
+		switch (locationType) {
+			case LOCATION_TYPE_LATLON:
+				return latLonList.get(index).getLongitude();
+			case LOCATION_TYPE_LOCATION:
+				return locationList.get(index).getLongitude();
+			case LOCATION_TYPE_WPTPT:
+				return wptPtList.get(index).getLongitude();
+			default:
+				return 0;
+		}
+	}
+
+	public int getSize() {
+		return size;
+	}
+
+	@SuppressWarnings("unchecked")
+	private <T> List<T> getList(int locationType) {
+		List<T> res = new ArrayList<>();
+		if (size > 0) {
+			for (int i = 0; i < size; i++) {
+				switch (locationType) {
+					case LOCATION_TYPE_LATLON:
+						res.add((T) getLatLon(i));
+						break;
+					case LOCATION_TYPE_LOCATION:
+						res.add((T) getLocation(i));
+						break;
+					case LOCATION_TYPE_WPTPT:
+						res.add((T) getWptPt(i));
+						break;
+				}
+			}
+		}
+		return res;
+	}
+
+	public List<LatLon> getLatLonList() {
+		if (this.locationType == LOCATION_TYPE_LATLON) {
+			return latLonList;
+		} else {
+			return getList(LOCATION_TYPE_LATLON);
+		}
+	}
+
+	public List<WptPt> getWptPtList() {
+		if (this.locationType == LOCATION_TYPE_WPTPT) {
+			return wptPtList;
+		} else {
+			return getList(LOCATION_TYPE_WPTPT);
+		}
+	}
+
+	public List<Location> getLocationsList() {
+		if (this.locationType == LOCATION_TYPE_LOCATION) {
+			return locationList;
+		} else {
+			return getList(LOCATION_TYPE_LOCATION);
+		}
+	}
+
+	public LatLon getLatLon(int index) {
+		if (this.locationType == LOCATION_TYPE_LATLON) {
+			return latLonList.get(index);
+		} else {
+			return new LatLon(getLatitude(index), getLongitude(index));
+		}
+	}
+
+	public WptPt getWptPt(int index) {
+		if (this.locationType == LOCATION_TYPE_WPTPT) {
+			return wptPtList.get(index);
+		} else {
+			WptPt wptPt = new WptPt();
+			wptPt.lat = getLatitude(index);
+			wptPt.lon = getLongitude(index);
+			return wptPt;
+		}
+	}
+
+	public Location getLocation(int index) {
+		if (this.locationType == LOCATION_TYPE_LOCATION) {
+			return locationList.get(index);
+		} else {
+			return new Location("", getLatitude(index), getLongitude(index));
+		}
+	}
+}

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

@@ -292,8 +292,9 @@ public abstract class MapRenderingTypes {
 		rtype.category = parentCategory == null ? null : parentCategory.category;
 		rtype.onlyPoint = Boolean.parseBoolean(parser.getAttributeValue("", "point")); //$NON-NLS-1$
 		rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); //$NON-NLS-1$
+		rtype.relationGroup = Boolean.parseBoolean(parser.getAttributeValue("", "relationGroup")); //$NON-NLS-1$
 		if (rtype.isMain()) {
-			if (rtype.relation) {
+			if (rtype.relationGroup) {
 				MapRulType mrt = MapRulType.createMainEntity(tag + "_" + value, null);
 				mrt.order = rtype.order;
 				mrt.category = rtype.category;
@@ -340,13 +341,20 @@ public abstract class MapRenderingTypes {
 			}
 			
 			String nmts = parser.getAttributeValue("", "nameTags");
-			if(nmts != null) {
-				String namePrefix = parser.getAttributeValue("", "namePrefix"); //$NON-NLS-1$
-				if (namePrefix == null) {
-					namePrefix = "";
+			if (nmts != null) {
+				if (rtype.relation || rtype.relationGroup) {
+					String namePrefix = parser.getAttributeValue("", "namePrefix"); //$NON-NLS-1$
+					if (namePrefix == null) {
+						namePrefix = "";
+					}
+					rtype.relationNames = new LinkedHashMap<String, String>();
+					putNameTags(nmts, rtype.relationNames, namePrefix);
+				} else {
+					String[] nameSplit = nmts.split(",");
+					for (String nameTag : nameSplit) {
+						checkOrCreateTextRule(nameTag, null);
+					}
 				}
-				rtype.relationNames = new LinkedHashMap<String, String>();
-				putNameTags(nmts, rtype.relationNames, namePrefix);
 			}
 			String rnmts = parser.getAttributeValue("", "relationGroupNameTags");
 			if (rnmts != null) {
@@ -533,6 +541,7 @@ public abstract class MapRenderingTypes {
 		
 		protected String category = null;
 		protected boolean relation;
+		protected boolean relationGroup;
 		// creation of only section
 		protected boolean map = true;
 		protected boolean poi = true;

OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStorage.java

@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -18,6 +17,7 @@ import java.util.Map.Entry;
 import java.util.Stack;
 
 import net.osmand.PlatformUtil;
+import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
 import org.xmlpull.v1.XmlPullParser;
@@ -26,7 +26,7 @@ import org.xmlpull.v1.XmlPullParserException;
 public class RenderingRulesStorage {
 
 	private final static Log log = PlatformUtil.getLog(RenderingRulesStorage.class);
-	static boolean STORE_ATTTRIBUTES = false;
+	static boolean STORE_ATTRIBUTES = false;
 	
 	// keep sync !
 	// keep sync ! not change values
@@ -40,6 +40,10 @@ public class RenderingRulesStorage {
 	
 	private final static int SHIFT_TAG_VAL = 16;
 	
+
+	private final static String SEQ_ATTR_KEY = "seq";
+	private final static String SEQ_PLACEHOLDER = "#SEQ";
+	
 	// C++
 	List<String> dictionary = new ArrayList<String>();
 	Map<String, Integer> dictionaryMap = new LinkedHashMap<String, Integer>();
@@ -183,31 +187,86 @@ public class RenderingRulesStorage {
 		}
 	}
 	
+	private class XmlTreeSequence {
+		XmlTreeSequence parent;
+		String seqOrder;
+		Map<String, String> attrsMap = new LinkedHashMap<String, String>();
+		String name;
+		List<XmlTreeSequence> children = new ArrayList<RenderingRulesStorage.XmlTreeSequence>();
+		
+		private void process(RenderingRulesHandler handler, int el) throws XmlPullParserException, IOException {
+			Map<String, String> seqAttrsMap = new HashMap<String, String>(attrsMap);
+			if (attrsMap.containsKey(SEQ_ATTR_KEY)) {
+				attrsMap.remove(SEQ_ATTR_KEY);
+			}
+			
+			for (Entry<String, String> attr: attrsMap.entrySet()) {
+				if (attr.getValue().contains(SEQ_PLACEHOLDER)) {
+					seqAttrsMap.put(attr.getKey(), attr.getValue().replace(SEQ_PLACEHOLDER, el+""));
+				} else {
+					seqAttrsMap.put(attr.getKey(), attr.getValue());
+				}
+			}
+			handler.startElement(seqAttrsMap, name);
+			for(XmlTreeSequence s : children) {
+				s.process(handler, el);
+			}
+			handler.endElement(name);
+		}
+	}
+	
 	private class RenderingRulesHandler {
 		private final XmlPullParser parser;
 		private int state;
-
 		Stack<RenderingRule> stack = new Stack<RenderingRule>();
-		
-		Map<String, String> attrsMap = new LinkedHashMap<String, String>();
 		private final RenderingRulesStorageResolver resolver;
 		private RenderingRulesStorage dependsStorage;
 		
-		
-		
 		public RenderingRulesHandler(XmlPullParser parser, RenderingRulesStorageResolver resolver){
 			this.parser = parser;
 			this.resolver = resolver;
 		}
 		
 		public void parse(InputStream is) throws XmlPullParserException, IOException {
+			XmlPullParser parser = this.parser;
+			Map<String, String> attrsMap = new LinkedHashMap<String, String>();
 			parser.setInput(is, "UTF-8");
 			int tok;
+			XmlTreeSequence currentSeqElement = null;
 			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
 				if (tok == XmlPullParser.START_TAG) {
-					startElement(parser.getName());
+					attrsMap.clear();
+					parseAttributes(parser, attrsMap);
+					String name = parser.getName();
+					if (!Algorithms.isEmpty(parser.getAttributeValue("", SEQ_ATTR_KEY)) || currentSeqElement != null) {
+						XmlTreeSequence seq = new XmlTreeSequence();
+						seq.name = name;
+						seq.attrsMap = new HashMap<String, String>(attrsMap);
+						seq.parent = currentSeqElement;
+						if (currentSeqElement == null) {
+							seq.seqOrder = parser.getAttributeValue("", SEQ_ATTR_KEY);
+						} else {
+							currentSeqElement.children.add(seq);
+							seq.seqOrder = currentSeqElement.seqOrder;
+						}
+						currentSeqElement = seq;
+					} else {
+						startElement(attrsMap, name);
+					}
 				} else if (tok == XmlPullParser.END_TAG) {
-					endElement(parser.getName());
+					if(currentSeqElement == null) {
+						endElement(parser.getName());
+					} else {
+						XmlTreeSequence process = currentSeqElement;
+						currentSeqElement = currentSeqElement.parent;
+						if (currentSeqElement == null) {
+							// Here we process sequence element
+							int seqEnd = Integer.parseInt(process.seqOrder.substring(process.seqOrder.indexOf(':') + 1, process.seqOrder.length()));
+							for(int i = 1; i < seqEnd; i++) {
+								process.process(this, i);
+							}
+						}
+					}
 				}
 			}
 			
@@ -226,16 +285,14 @@ public class RenderingRulesStorage {
 			return true;
 		}
 		
-		public void startElement(String name) throws XmlPullParserException, IOException {
+		public void startElement(Map<String, String> attrsMap, String name) throws XmlPullParserException, IOException {
 			boolean stateChanged = false;
 			final boolean isCase = isCase(name);
 			final boolean isSwitch = isSwitch(name);
 			if(isCase || isSwitch){ //$NON-NLS-1$
-				attrsMap.clear();
 				boolean top = stack.size() == 0 || isTopCase();
-				parseAttributes(attrsMap);
 				RenderingRule renderingRule = new RenderingRule(attrsMap, isSwitch, RenderingRulesStorage.this);
-				if(top || STORE_ATTTRIBUTES){
+				if(top || STORE_ATTRIBUTES){
 					renderingRule.storeAttributes(attrsMap);
 				}
 				if (stack.size() > 0 && stack.peek() instanceof RenderingRule) {
@@ -244,10 +301,8 @@ public class RenderingRulesStorage {
 				}
 				stack.push(renderingRule);
 			} else if(isApply(name)){ //$NON-NLS-1$
-				attrsMap.clear();
-				parseAttributes(attrsMap);
 				RenderingRule renderingRule = new RenderingRule(attrsMap, false, RenderingRulesStorage.this);
-				if(STORE_ATTTRIBUTES) {
+				if(STORE_ATTRIBUTES) {
 					renderingRule.storeAttributes(attrsMap);
 				}
 				if (stack.size() > 0 && stack.peek() instanceof RenderingRule) {
@@ -272,14 +327,14 @@ public class RenderingRulesStorage {
 				state = POLYGON_RULES;
 				stateChanged = true;
 			} else if("renderingAttribute".equals(name)){ //$NON-NLS-1$
-				String attr = parser.getAttributeValue("", "name");
+				String attr = attrsMap.get("name");
 				RenderingRule root = new RenderingRule(new HashMap<String, String>(), false, RenderingRulesStorage.this);
 				renderingAttributes.put(attr, root);
 				stack.push(root);
 			} else if("renderingProperty".equals(name)){ //$NON-NLS-1$
-				String attr = parser.getAttributeValue("", "attr");
+				String attr = attrsMap.get("attr");
 				RenderingRuleProperty prop;
-				String type = parser.getAttributeValue("", "type");
+				String type = attrsMap.get("type");
 				if("boolean".equalsIgnoreCase(type)){
 					prop = RenderingRuleProperty.createInputBooleanProperty(attr);
 				} else if("string".equalsIgnoreCase(type)){
@@ -287,20 +342,20 @@ public class RenderingRulesStorage {
 				} else {
 					prop = RenderingRuleProperty.createInputIntProperty(attr);
 				}
-				prop.setDescription(parser.getAttributeValue("", "description"));
-				prop.setDefaultValueDescription(parser.getAttributeValue("", "defaultValueDescription"));
-				prop.setCategory(parser.getAttributeValue("", "category"));
-				prop.setName(parser.getAttributeValue("", "name"));
-				if(parser.getAttributeValue("", "possibleValues") != null){
-					prop.setPossibleValues(parser.getAttributeValue("", "possibleValues").split(","));
+				prop.setDescription(attrsMap.get("description"));
+				prop.setDefaultValueDescription(attrsMap.get("defaultValueDescription"));
+				prop.setCategory(attrsMap.get("category"));
+				prop.setName(attrsMap.get("name"));
+				if (attrsMap.get("possibleValues") != null) {
+					prop.setPossibleValues(attrsMap.get("possibleValues").split(","));
 				}
 				PROPS.registerRule(prop);
 			} else if("renderingConstant".equals(name)){ //$NON-NLS-1$
-				if(!renderingConstants.containsKey(parser.getAttributeValue("", "name"))){
-					renderingConstants.put(parser.getAttributeValue("", "name"), parser.getAttributeValue("", "value"));
+				if(!renderingConstants.containsKey(attrsMap.get("name"))){
+					renderingConstants.put(attrsMap.get("name"), attrsMap.get("value"));
 				}
 			} else if("renderingStyle".equals(name)){ //$NON-NLS-1$
-				String depends = parser.getAttributeValue("", "depends");
+				String depends = attrsMap.get("depends");
 				if(depends != null && depends.length()> 0){
 					this.dependsStorage = resolver.resolve(depends, resolver);
 				}
@@ -311,7 +366,7 @@ public class RenderingRulesStorage {
 					PROPS = new RenderingRuleStorageProperties(dependsStorage.PROPS);
 					
 				}
-				internalRenderingName = parser.getAttributeValue("", "name");
+				internalRenderingName = attrsMap.get("name");
 				
 			} else if("renderer".equals(name)){ //$NON-NLS-1$
 				throw new XmlPullParserException("Rendering style is deprecated and no longer supported.");
@@ -337,7 +392,7 @@ public class RenderingRulesStorage {
 			return "group".equals(name) || "switch".equals(name);
 		}
 		
-		private Map<String, String> parseAttributes(Map<String, String> m) {
+		private Map<String, String> parseAttributes(XmlPullParser parser, Map<String, String> m) {
 			for (int i = 0; i < parser.getAttributeCount(); i++) {
 				String name = parser.getAttributeName(i);
 				String vl = parser.getAttributeValue(i);
@@ -396,7 +451,7 @@ public class RenderingRulesStorage {
 				vl = ns.remove("value");
 				// reset rendering rule attributes
 				renderingRule.init(ns);
-				if(STORE_ATTTRIBUTES) {
+				if(STORE_ATTRIBUTES) {
 					renderingRule.storeAttributes(ns);
 				}
 				
@@ -469,7 +524,7 @@ public class RenderingRulesStorage {
 	
 	
 	public static void main(String[] args) throws XmlPullParserException, IOException {
-		STORE_ATTTRIBUTES = true;
+		STORE_ATTRIBUTES = true;
 //		InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml");
 		final String loc = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/";
 		String defaultFile = loc + "UniRS.render.xml";

OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStoragePrinter.java

@@ -21,7 +21,7 @@ import org.xmlpull.v1.XmlPullParserException;
 public class RenderingRulesStoragePrinter {
 	
 	public static void main(String[] args) throws XmlPullParserException, IOException {
-		RenderingRulesStorage.STORE_ATTTRIBUTES = true;
+		RenderingRulesStorage.STORE_ATTRIBUTES = true;
 //		InputStream is = RenderingRulesStorage.class.getResourceAsStream("default.render.xml");
 		String defaultFile = "/Users/victorshcherb/osmand/repos/resources/rendering_styles/default.render.xml";
 		if(args.length > 0) {

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

@@ -1,14 +1,7 @@
 package net.osmand.router;
 
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-
+import net.osmand.LocationsHolder;
 import net.osmand.NativeLibrary;
 import net.osmand.PlatformUtil;
 import net.osmand.binary.BinaryMapIndexReader;
@@ -23,6 +16,14 @@ import net.osmand.util.MapUtils;
 
 import org.apache.commons.logging.Log;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+
 import gnu.trove.list.array.TIntArrayList;
 
 public class RoutePlannerFrontEnd {
@@ -214,13 +215,12 @@ public class RoutePlannerFrontEnd {
 		useSmartRouteRecalculation = use;
 	}
 
-	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<LatLon> points) throws IOException, InterruptedException {
+	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints) throws IOException, InterruptedException {
 		long timeToCalculate = System.nanoTime();
 		if (gctx.ctx.calculationProgress == null) {
 			gctx.ctx.calculationProgress = new RouteCalculationProgress();
 		}
 		gctx.ctx.keepNativeRoutingContext = true;
-		List<GpxPoint> gpxPoints = generageGpxPoints(points, gctx);
 		GpxPoint start = null;
 		GpxPoint prev = null;
 		if(gpxPoints.size() > 0) {
@@ -288,7 +288,7 @@ public class RoutePlannerFrontEnd {
 		BinaryRoutePlanner.printDebugMemoryInformation(gctx.ctx);
 		calculateGpxRoute(gctx, gpxPoints);
 		if (!gctx.result.isEmpty()) {
-			new RouteResultPreparation().printResults(gctx.ctx, points.get(0), points.get(points.size() - 1), gctx.result);
+			new RouteResultPreparation().printResults(gctx.ctx, gpxPoints.get(0).loc, gpxPoints.get(gpxPoints.size() - 1).loc, gctx.result);
 			System.out.println(gctx);
 		}
 		return gctx;
@@ -382,13 +382,13 @@ public class RoutePlannerFrontEnd {
 		cleanupResultAndAddTurns(gctx);
 	}
 
-	private List<GpxPoint> generageGpxPoints(List<LatLon> points, GpxRouteApproximation gctx) {
-		List<GpxPoint> gpxPoints = new ArrayList<>(points.size());
+	public List<GpxPoint> generateGpxPoints(GpxRouteApproximation gctx, LocationsHolder locationsHolder) {
+		List<GpxPoint> gpxPoints = new ArrayList<>(locationsHolder.getSize());
 		GpxPoint prev = null;
-		for(int i = 0; i < points.size(); i++) {
+		for(int i = 0; i < locationsHolder.getSize(); i++) {
 			GpxPoint p = new GpxPoint();
 			p.ind = i;
-			p.loc = points.get(i);
+			p.loc = locationsHolder.getLatLon(i);
 			if (prev != null) {
 				p.cumDist = MapUtils.getDistance(p.loc, prev.loc) + prev.cumDist;
 			}

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

@@ -2,27 +2,16 @@ package net.osmand.router;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
+import java.util.Locale;
 import java.util.PriorityQueue;
 
 
-import gnu.trove.iterator.TIntIterator;
 import gnu.trove.list.array.TIntArrayList;
-import gnu.trove.map.hash.TIntObjectHashMap;
 import gnu.trove.map.hash.TLongObjectHashMap;
-import net.osmand.NativeLibrary;
-import net.osmand.binary.BinaryMapIndexReader;
-import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
-import net.osmand.data.IncompleteTransportRoute;
+
 import net.osmand.data.LatLon;
 import net.osmand.data.QuadRect;
 import net.osmand.data.TransportRoute;
@@ -31,9 +20,6 @@ import net.osmand.data.TransportStop;
 import net.osmand.data.TransportStopExit;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.Way;
-import net.osmand.router.TransportRoutePlanner.TransportRouteResult;
-import net.osmand.router.TransportRoutePlanner.TransportRouteResultSegment;
-import net.osmand.router.TransportRoutePlanner.TransportRouteSegment;
 import net.osmand.util.MapUtils;
 
 public class TransportRoutePlanner {
@@ -224,11 +210,10 @@ public class TransportRoutePlanner {
 		}		
 	}
 
-
 	private List<TransportRouteResult> prepareResults(TransportRoutingContext ctx, List<TransportRouteSegment> results) {
 		Collections.sort(results, new SegmentsComparator(ctx));
 		List<TransportRouteResult> lst = new ArrayList<TransportRouteResult>();
-		System.out.println(String.format("Calculated %.1f seconds, found %d results, visited %d routes / %d stops, loaded %d tiles (%d ms read, %d ms total), loaded ways %d (%d wrong)",
+		System.out.println(String.format(Locale.US, "Calculated %.1f seconds, found %d results, visited %d routes / %d stops, loaded %d tiles (%d ms read, %d ms total), loaded ways %d (%d wrong)",
 				(System.currentTimeMillis() - ctx.startCalcTime) / 1000.0, results.size(), 
 				ctx.visitedRoutesCount, ctx.visitedStops, 
 				ctx.quadTree.size(), ctx.readTime / (1000 * 1000), ctx.loadTime / (1000 * 1000),
@@ -314,7 +299,6 @@ public class TransportRoutePlanner {
 		}
 	}
 	
-	
 	public static class TransportRouteResultSegment {
 		
 		private static final boolean DISPLAY_FULL_SEGMENT_ROUTE = false;
@@ -487,156 +471,12 @@ public class TransportRoutePlanner {
 		}
 	}
 
-	public static class TransportRouteResult {
-		
-		List<TransportRouteResultSegment> segments  = new ArrayList<TransportRouteResultSegment>(4);
-		double finishWalkDist;
-		double routeTime;
-		private final TransportRoutingConfiguration cfg;
-		
-		public TransportRouteResult(TransportRoutingContext ctx) {
-			cfg = ctx.cfg;
-		}
-
-		public TransportRouteResult(TransportRoutingConfiguration cfg) {
-			this.cfg = cfg;
-		}
-
-		public List<TransportRouteResultSegment> getSegments() {
-			return segments;
-		}
-
-		public void setFinishWalkDist(double finishWalkDist) {
-			this.finishWalkDist = finishWalkDist;
-		}
-
-		public void setRouteTime(double routeTime) {
-			this.routeTime = routeTime;
-		}
-
-		public void addSegment(TransportRouteResultSegment seg) {
-			segments.add(seg);
-		}
-
-		public double getWalkDist() {
-			double d = finishWalkDist;
-			for (TransportRouteResultSegment s : segments) {
-				d += s.walkDist;
-			}
-			return d;
-		}
-
-		public double getFinishWalkDist() {
-			return finishWalkDist;
-		}
-
-		public double getWalkSpeed() {
-			return  cfg.walkSpeed;
-		}
-
-		public double getRouteTime() {
-			return routeTime;
-		}
-		
-		public int getStops() {
-			int stops = 0;
-			for(TransportRouteResultSegment s : segments) {
-				stops += (s.end - s.start);
-			}
-			return stops;
-		}
-
-		public boolean isRouteStop(TransportStop stop) {
-			for(TransportRouteResultSegment s : segments) {
-				if (s.getTravelStops().contains(stop)) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public TransportRouteResultSegment getRouteStopSegment(TransportStop stop) {
-			for(TransportRouteResultSegment s : segments) {
-				if (s.getTravelStops().contains(stop)) {
-					return s;
-				}
-			}
-			return null;
-		}
-
-		public double getTravelDist() {
-			double d = 0;
-			for (TransportRouteResultSegment s : segments) {
-				d += s.getTravelDist();
-			}
-			return d;
-		}
-		
-		public double getTravelTime() {
-			double t = 0;
-			for (TransportRouteResultSegment s : segments) {
-				if (cfg.useSchedule) {
-					TransportSchedule sts = s.route.getSchedule();
-					for (int k = s.start; k < s.end; k++) {
-						t += sts.getAvgStopIntervals()[k] * 10;
-					}
-				} else {
-					t += cfg.getBoardingTime();
-					t += s.getTravelTime();
-				}
-			}
-			return t;
-		}
-		
-		public double getWalkTime() {
-			return getWalkDist() / cfg.walkSpeed;
-		}
-
-		public double getChangeTime() {
-			return cfg.getChangeTime();
-		}
-
-		public double getBoardingTime() {
-			return cfg.getBoardingTime();
-		}
-
-		public int getChanges() {
-			return segments.size() - 1;
-		}
-		
-		@Override
-		public String toString() {
-			StringBuilder bld = new StringBuilder();
-			bld.append(String.format("Route %d stops, %d changes, %.2f min: %.2f m (%.1f min) to walk, %.2f m (%.1f min) to travel\n",
-					getStops(), getChanges(), routeTime / 60, getWalkDist(), getWalkTime() / 60.0, 
-					getTravelDist(), getTravelTime() / 60.0));
-			for(int i = 0; i < segments.size(); i++) {
-				TransportRouteResultSegment s = segments.get(i);
-				String time = "";
-				String arriveTime = "";
-				if(s.depTime != -1) {
-					time = String.format("at %s", formatTransporTime(s.depTime));
-				}
-				int aTime = s.getArrivalTime();
-				if(aTime != -1) {
-					arriveTime = String.format("and arrive at %s", formatTransporTime(aTime));
-				}
-				bld.append(String.format(" %d. %s [%d]: walk %.1f m to '%s' and travel %s to '%s' by %s %d stops %s\n",
-						i + 1, s.route.getRef(), s.route.getId() / 2, s.walkDist, s.getStart().getName(), 
-						 time, s.getEnd().getName(),s.route.getName(),  (s.end - s.start), arriveTime));
-			}
-			bld.append(String.format(" F. Walk %.1f m to reach your destination", finishWalkDist));
-			return bld.toString();
-		}
-	}
-	
-	public static String formatTransporTime(int i) {
+	public static String formatTransportTime(int i) {
 		int h = i / 60 / 6;
 		int mh = i - h * 60 * 6;
 		int m = mh / 6;
 		int s = (mh - m * 6) * 10;
-		String tm = String.format("%02d:%02d:%02d ", h, m, s);
-		return tm;
+		return String.format(Locale.US, "%02d:%02d:%02d ", h, m, s);
 	}
 	
 	public static class TransportRouteSegment {
@@ -653,13 +493,9 @@ public class TransportRoutePlanner {
 		double parentTravelDist; // travel distance for parent route (inaccurate) 
 		// walk distance to start route location (or finish in case last segment)
 		double walkDist = 0;
-		
 		// main field accumulated all time spent from beginning of journey
 		double distFromStart = 0;
 		
-		
-		
-		
 		public TransportRouteSegment(TransportRoute road, int stopIndex) {
 			this.road = road;
 			this.segStart = (short) stopIndex;
@@ -678,7 +514,6 @@ public class TransportRoutePlanner {
 			this.departureTime = c.departureTime;
 		}
 
-		
 		public boolean wasVisited(TransportRouteSegment rrs) {
 			if (rrs.road.getId().longValue() == road.getId().longValue() && 
 					rrs.departureTime == departureTime) {
@@ -690,22 +525,18 @@ public class TransportRoutePlanner {
 			return false;
 		}
 
-
 		public TransportStop getStop(int i) {
 			return road.getForwardStops().get(i);
 		}
 
-
 		public LatLon getLocation() {
 			return road.getForwardStops().get(segStart).getLocation();
 		}
 
-
 		public int getLength() {
 			return road.getForwardStops().size();
 		}
 		
-		
 		public long getId() {
 			long l = road.getId();
 			
@@ -727,7 +558,6 @@ public class TransportRoutePlanner {
 			return l  ;
 		}
 
-		
 		public int getDepth() {
 			if(parentRoute != null) {
 				return parentRoute.getDepth() + 1;
@@ -738,162 +568,7 @@ public class TransportRoutePlanner {
 		@Override
 		public String toString() {
 			return String.format("Route: %s, stop: %s %s", road.getName(), road.getForwardStops().get(segStart).getName(),
-					departureTime == -1 ? "" : formatTransporTime(departureTime) );
-		}
-
-	}
-	
-	public static class TransportRoutingContext {
-		
-		public NativeLibrary library;
-		public RouteCalculationProgress calculationProgress;
-		public TLongObjectHashMap<TransportRouteSegment> visitedSegments = new TLongObjectHashMap<TransportRouteSegment>();
-		public TransportRoutingConfiguration cfg;
-		public TLongObjectHashMap<TransportRoute> combinedRoutesCache = new TLongObjectHashMap<TransportRoute>();
-		public Map<TransportStop, List<TransportRoute>> missingStopsCache = new HashMap<TransportStop, List<TransportRoute>>();
-		
-		public TLongObjectHashMap<List<TransportRouteSegment>> quadTree;
-		// Here we don't limit files by bbox, so it could be an issue while searching for multiple unused files 
-		// Incomplete routes usually don't need more files than around Max-BBOX of start/end, 
-		// so here an improvement could be introduced
-		final TransportStopsRouteReader transportStopsReader;
-		public int finishTimeSeconds;
-		
-		// stats
-		public long startCalcTime;
-		public int visitedRoutesCount;
-		public int visitedStops;
-		public int wrongLoadedWays;
-		public int loadedWays;
-		public long loadTime;
-		public long readTime;
-		
-		
-		
-		private final int walkRadiusIn31;
-		private final int walkChangeRadiusIn31;
-		
-		
-		
-		public TransportRoutingContext(TransportRoutingConfiguration cfg, NativeLibrary library, BinaryMapIndexReader... readers) {
-			this.cfg = cfg;
-			walkRadiusIn31 = (int) (cfg.walkRadius / MapUtils.getTileDistanceWidth(31));
-			walkChangeRadiusIn31 = (int) (cfg.walkChangeRadius / MapUtils.getTileDistanceWidth(31));
-			quadTree = new TLongObjectHashMap<List<TransportRouteSegment>>();
-			this.library = library;
-			transportStopsReader = new TransportStopsRouteReader(Arrays.asList(readers));
-		}
-		
-		public List<TransportRouteSegment> getTransportStops(LatLon loc) throws IOException {
-			int y = MapUtils.get31TileNumberY(loc.getLatitude());
-			int x = MapUtils.get31TileNumberX(loc.getLongitude());
-			return getTransportStops(x, y, false, new ArrayList<TransportRouteSegment>());
-		}
-		
-		public List<TransportRouteSegment> getTransportStops(int x, int y, boolean change, List<TransportRouteSegment> res) throws IOException {
-			return loadNativeTransportStops(x, y, change, res);
-		}
-
-		private List<TransportRouteSegment> loadNativeTransportStops(int sx, int sy, boolean change, List<TransportRouteSegment> res) throws IOException {
-			long nanoTime = System.nanoTime();
-			int d = change ? walkChangeRadiusIn31 : walkRadiusIn31;
-			int lx = (sx - d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
-			int rx = (sx + d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
-			int ty = (sy - d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
-			int by = (sy + d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
-			for(int x = lx; x <= rx; x++) {
-				for(int y = ty; y <= by; y++) {
-					long tileId = (((long)x) << (cfg.ZOOM_TO_LOAD_TILES + 1)) + y;
-					List<TransportRouteSegment> list = quadTree.get(tileId);
-					if(list == null) {
-						list = loadTile(x, y);
-						quadTree.put(tileId, list);
-					}
-					for(TransportRouteSegment r : list) {
-						TransportStop st = r.getStop(r.segStart);
-						if (Math.abs(st.x31 - sx) > walkRadiusIn31 || Math.abs(st.y31 - sy) > walkRadiusIn31) {
-							wrongLoadedWays++;
-						} else {
-							loadedWays++;
-							res.add(r);
-						}
-					}
-				}
-			}
-			loadTime += System.nanoTime() - nanoTime;
-			return res;
-		}
-
-
-		private List<TransportRouteSegment> loadTile(int x, int y) throws IOException {
-			long nanoTime = System.nanoTime();
-			List<TransportRouteSegment> lst = new ArrayList<TransportRouteSegment>();
-			int pz = (31 - cfg.ZOOM_TO_LOAD_TILES);
-			SearchRequest<TransportStop> sr = BinaryMapIndexReader.buildSearchTransportRequest(x << pz, (x + 1) << pz,
-					y << pz, (y + 1) << pz, -1, null);
-			Collection<TransportStop> stops = transportStopsReader.readMergedTransportStops(sr);
-			loadTransportSegments(stops, lst);
-			readTime += System.nanoTime() - nanoTime;
-			return lst;
-		}
-		
-		private void loadTransportSegments(Collection<TransportStop> stops, List<TransportRouteSegment> lst) throws IOException {
-			for(TransportStop s : stops) {
-				if (s.isDeleted() || s.getRoutes() == null) {
-					continue;
-				}
-				for (TransportRoute route : s.getRoutes()) {
-					int stopIndex = -1;
-					double dist = TransportRoute.SAME_STOP;
-					for (int k = 0; k < route.getForwardStops().size(); k++) {
-						TransportStop st = route.getForwardStops().get(k);
-						if(st.getId().longValue() == s.getId().longValue() ) {
-							stopIndex = k;
-							break;
-						}
-						double d = MapUtils.getDistance(st.getLocation(), s.getLocation());
-						if (d < dist) {
-							stopIndex = k;
-							dist = d;
-						}
-					}
-					if (stopIndex != -1) {
-						if (cfg != null && cfg.useSchedule) {
-							loadScheduleRouteSegment(lst, route, stopIndex);
-						} else {
-							TransportRouteSegment segment = new TransportRouteSegment(route, stopIndex);
-							lst.add(segment);
-						}
-					} else {
-						System.err.println(String.format("Routing error: missing stop '%s' in route '%s' id: %d",
-								s.toString(), route.getRef(), route.getId() / 2));
-					}
-				}
-			}
-		}
-		
-		private void loadScheduleRouteSegment(List<TransportRouteSegment> lst, TransportRoute route, int stopIndex) {
-			if(route.getSchedule() != null) {
-				TIntArrayList ti = route.getSchedule().tripIntervals;
-				int cnt = ti.size();
-				int t = 0;
-				// improve by using exact data
-				int stopTravelTime = 0;
-				TIntArrayList avgStopIntervals = route.getSchedule().avgStopIntervals;
-				for (int i = 0; i < stopIndex; i++) {
-					if (avgStopIntervals.size() > i) {
-						stopTravelTime += avgStopIntervals.getQuick(i);
-					}
-				}
-				for(int i = 0; i < cnt; i++) {
-					t += ti.getQuick(i);
-					int startTime = t + stopTravelTime;
-					if(startTime >= cfg.scheduleTimeOfDay && startTime <= cfg.scheduleTimeOfDay + cfg.scheduleMaxTime ) {
-						TransportRouteSegment segment = new TransportRouteSegment(route, stopIndex, startTime);
-						lst.add(segment);
-					}
-				}
-			}
+					departureTime == -1 ? "" : formatTransportTime(departureTime) );
 		}
 	}
 

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

@@ -0,0 +1,151 @@
+package net.osmand.router;
+
+import net.osmand.data.TransportSchedule;
+import net.osmand.data.TransportStop;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+public class TransportRouteResult {
+
+	List<TransportRoutePlanner.TransportRouteResultSegment> segments  = new ArrayList<TransportRoutePlanner.TransportRouteResultSegment>(4);
+	double finishWalkDist;
+	double routeTime;
+	private final TransportRoutingConfiguration cfg;
+
+	public TransportRouteResult(TransportRoutingContext ctx) {
+		cfg = ctx.cfg;
+	}
+
+	public TransportRouteResult(TransportRoutingConfiguration cfg) {
+		this.cfg = cfg;
+	}
+
+	public List<TransportRoutePlanner.TransportRouteResultSegment> getSegments() {
+		return segments;
+	}
+
+	public void setFinishWalkDist(double finishWalkDist) {
+		this.finishWalkDist = finishWalkDist;
+	}
+
+	public void setRouteTime(double routeTime) {
+		this.routeTime = routeTime;
+	}
+
+	public void addSegment(TransportRoutePlanner.TransportRouteResultSegment seg) {
+		segments.add(seg);
+	}
+
+	public double getWalkDist() {
+		double d = finishWalkDist;
+		for (TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			d += s.walkDist;
+		}
+		return d;
+	}
+
+	public double getFinishWalkDist() {
+		return finishWalkDist;
+	}
+
+	public double getWalkSpeed() {
+		return  cfg.walkSpeed;
+	}
+
+	public double getRouteTime() {
+		return routeTime;
+	}
+
+	public int getStops() {
+		int stops = 0;
+		for(TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			stops += (s.end - s.start);
+		}
+		return stops;
+	}
+
+	public boolean isRouteStop(TransportStop stop) {
+		for(TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			if (s.getTravelStops().contains(stop)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public TransportRoutePlanner.TransportRouteResultSegment getRouteStopSegment(TransportStop stop) {
+		for(TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			if (s.getTravelStops().contains(stop)) {
+				return s;
+			}
+		}
+		return null;
+	}
+
+	public double getTravelDist() {
+		double d = 0;
+		for (TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			d += s.getTravelDist();
+		}
+		return d;
+	}
+
+	public double getTravelTime() {
+		double t = 0;
+		for (TransportRoutePlanner.TransportRouteResultSegment s : segments) {
+			if (cfg.useSchedule) {
+				TransportSchedule sts = s.route.getSchedule();
+				for (int k = s.start; k < s.end; k++) {
+					t += sts.getAvgStopIntervals()[k] * 10;
+				}
+			} else {
+				t += cfg.getBoardingTime();
+				t += s.getTravelTime();
+			}
+		}
+		return t;
+	}
+
+	public double getWalkTime() {
+		return getWalkDist() / cfg.walkSpeed;
+	}
+
+	public double getChangeTime() {
+		return cfg.getChangeTime();
+	}
+
+	public double getBoardingTime() {
+		return cfg.getBoardingTime();
+	}
+
+	public int getChanges() {
+		return segments.size() - 1;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder bld = new StringBuilder();
+		bld.append(String.format(Locale.US, "Route %d stops, %d changes, %.2f min: %.2f m (%.1f min) to walk, %.2f m (%.1f min) to travel\n",
+				getStops(), getChanges(), routeTime / 60, getWalkDist(), getWalkTime() / 60.0,
+				getTravelDist(), getTravelTime() / 60.0));
+		for(int i = 0; i < segments.size(); i++) {
+			TransportRoutePlanner.TransportRouteResultSegment s = segments.get(i);
+			String time = "";
+			String arriveTime = "";
+			if(s.depTime != -1) {
+				time = String.format("at %s", TransportRoutePlanner.formatTransportTime(s.depTime));
+			}
+			int aTime = s.getArrivalTime();
+			if(aTime != -1) {
+				arriveTime = String.format("and arrive at %s", TransportRoutePlanner.formatTransportTime(aTime));
+			}
+			bld.append(String.format(Locale.US, " %d. %s [%d]: walk %.1f m to '%s' and travel %s to '%s' by %s %d stops %s\n",
+					i + 1, s.route.getRef(), s.route.getId() / 2, s.walkDist, s.getStart().getName(),
+					 time, s.getEnd().getName(),s.route.getName(),  (s.end - s.start), arriveTime));
+		}
+		bld.append(String.format(" F. Walk %.1f m to reach your destination", finishWalkDist));
+		return bld.toString();
+	}
+}

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

@@ -0,0 +1,171 @@
+package net.osmand.router;
+
+import net.osmand.NativeLibrary;
+import net.osmand.binary.BinaryMapIndexReader;
+import net.osmand.data.LatLon;
+import net.osmand.data.TransportRoute;
+import net.osmand.data.TransportStop;
+import net.osmand.router.TransportRoutePlanner.TransportRouteSegment;
+import net.osmand.util.MapUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TLongObjectHashMap;
+
+public class TransportRoutingContext {
+
+	public NativeLibrary library;
+	public RouteCalculationProgress calculationProgress;
+	public TLongObjectHashMap<TransportRouteSegment> visitedSegments = new TLongObjectHashMap<TransportRouteSegment>();
+	public TransportRoutingConfiguration cfg;
+	public TLongObjectHashMap<TransportRoute> combinedRoutesCache = new TLongObjectHashMap<TransportRoute>();
+	public Map<TransportStop, List<TransportRoute>> missingStopsCache = new HashMap<TransportStop, List<TransportRoute>>();
+
+	public TLongObjectHashMap<List<TransportRouteSegment>> quadTree;
+	// Here we don't limit files by bbox, so it could be an issue while searching for multiple unused files
+	// Incomplete routes usually don't need more files than around Max-BBOX of start/end,
+	// so here an improvement could be introduced
+	final TransportStopsRouteReader transportStopsReader;
+	public int finishTimeSeconds;
+
+	// stats
+	public long startCalcTime;
+	public int visitedRoutesCount;
+	public int visitedStops;
+	public int wrongLoadedWays;
+	public int loadedWays;
+	public long loadTime;
+	public long readTime;
+
+	private final int walkRadiusIn31;
+	private final int walkChangeRadiusIn31;
+
+	public TransportRoutingContext(TransportRoutingConfiguration cfg, NativeLibrary library, BinaryMapIndexReader... readers) {
+		this.cfg = cfg;
+		walkRadiusIn31 = (int) (cfg.walkRadius / MapUtils.getTileDistanceWidth(31));
+		walkChangeRadiusIn31 = (int) (cfg.walkChangeRadius / MapUtils.getTileDistanceWidth(31));
+		quadTree = new TLongObjectHashMap<List<TransportRouteSegment>>();
+		this.library = library;
+		transportStopsReader = new TransportStopsRouteReader(Arrays.asList(readers));
+	}
+
+	public List<TransportRouteSegment> getTransportStops(LatLon loc) throws IOException {
+		int y = MapUtils.get31TileNumberY(loc.getLatitude());
+		int x = MapUtils.get31TileNumberX(loc.getLongitude());
+		return getTransportStops(x, y, false, new ArrayList<TransportRouteSegment>());
+	}
+
+	public List<TransportRouteSegment> getTransportStops(int x, int y, boolean change, List<TransportRouteSegment> res) throws IOException {
+		return loadNativeTransportStops(x, y, change, res);
+	}
+
+	private List<TransportRouteSegment> loadNativeTransportStops(int sx, int sy, boolean change, List<TransportRouteSegment> res) throws IOException {
+		long nanoTime = System.nanoTime();
+		int d = change ? walkChangeRadiusIn31 : walkRadiusIn31;
+		int lx = (sx - d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
+		int rx = (sx + d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
+		int ty = (sy - d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
+		int by = (sy + d ) >> (31 - cfg.ZOOM_TO_LOAD_TILES);
+		for(int x = lx; x <= rx; x++) {
+			for(int y = ty; y <= by; y++) {
+				long tileId = (((long)x) << (cfg.ZOOM_TO_LOAD_TILES + 1)) + y;
+				List<TransportRouteSegment> list = quadTree.get(tileId);
+				if(list == null) {
+					list = loadTile(x, y);
+					quadTree.put(tileId, list);
+				}
+				for(TransportRouteSegment r : list) {
+					TransportStop st = r.getStop(r.segStart);
+					if (Math.abs(st.x31 - sx) > walkRadiusIn31 || Math.abs(st.y31 - sy) > walkRadiusIn31) {
+						wrongLoadedWays++;
+					} else {
+						loadedWays++;
+						res.add(r);
+					}
+				}
+			}
+		}
+		loadTime += System.nanoTime() - nanoTime;
+		return res;
+	}
+
+
+	private List<TransportRouteSegment> loadTile(int x, int y) throws IOException {
+		long nanoTime = System.nanoTime();
+		List<TransportRouteSegment> lst = new ArrayList<TransportRouteSegment>();
+		int pz = (31 - cfg.ZOOM_TO_LOAD_TILES);
+		BinaryMapIndexReader.SearchRequest<TransportStop> sr = BinaryMapIndexReader.buildSearchTransportRequest(x << pz, (x + 1) << pz,
+				y << pz, (y + 1) << pz, -1, null);
+		Collection<TransportStop> stops = transportStopsReader.readMergedTransportStops(sr);
+		loadTransportSegments(stops, lst);
+		readTime += System.nanoTime() - nanoTime;
+		return lst;
+	}
+
+	private void loadTransportSegments(Collection<TransportStop> stops, List<TransportRouteSegment> lst) throws IOException {
+		for(TransportStop s : stops) {
+			if (s.isDeleted() || s.getRoutes() == null) {
+				continue;
+			}
+			for (TransportRoute route : s.getRoutes()) {
+				int stopIndex = -1;
+				double dist = TransportRoute.SAME_STOP;
+				for (int k = 0; k < route.getForwardStops().size(); k++) {
+					TransportStop st = route.getForwardStops().get(k);
+					if(st.getId().longValue() == s.getId().longValue() ) {
+						stopIndex = k;
+						break;
+					}
+					double d = MapUtils.getDistance(st.getLocation(), s.getLocation());
+					if (d < dist) {
+						stopIndex = k;
+						dist = d;
+					}
+				}
+				if (stopIndex != -1) {
+					if (cfg != null && cfg.useSchedule) {
+						loadScheduleRouteSegment(lst, route, stopIndex);
+					} else {
+						TransportRouteSegment segment = new TransportRouteSegment(route, stopIndex);
+						lst.add(segment);
+					}
+				} else {
+					System.err.println(String.format(Locale.US, "Routing error: missing stop '%s' in route '%s' id: %d",
+							s.toString(), route.getRef(), route.getId() / 2));
+				}
+			}
+		}
+	}
+
+	private void loadScheduleRouteSegment(List<TransportRouteSegment> lst, TransportRoute route, int stopIndex) {
+		if(route.getSchedule() != null) {
+			TIntArrayList ti = route.getSchedule().tripIntervals;
+			int cnt = ti.size();
+			int t = 0;
+			// improve by using exact data
+			int stopTravelTime = 0;
+			TIntArrayList avgStopIntervals = route.getSchedule().avgStopIntervals;
+			for (int i = 0; i < stopIndex; i++) {
+				if (avgStopIntervals.size() > i) {
+					stopTravelTime += avgStopIntervals.getQuick(i);
+				}
+			}
+			for(int i = 0; i < cnt; i++) {
+				t += ti.getQuick(i);
+				int startTime = t + stopTravelTime;
+				if(startTime >= cfg.scheduleTimeOfDay && startTime <= cfg.scheduleTimeOfDay + cfg.scheduleMaxTime ) {
+					TransportRouteSegment segment = new TransportRouteSegment(route, stopIndex, startTime);
+					lst.add(segment);
+				}
+			}
+		}
+	}
+}

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

@@ -160,7 +160,7 @@ public class SearchPhrase {
 	
 	
 	public SearchPhrase generateNewPhrase(String text, SearchSettings settings) {
-		String textToSearch = text;
+		String textToSearch = Algorithms.normalizeSearchText(text);
 		List<SearchWord> leftWords = this.words;
 		String thisTxt = getText(true);
 		List<SearchWord> foundWords = new ArrayList<>();
@@ -183,6 +183,7 @@ public class SearchPhrase {
 	}
 
 	
+
 	public static SearchPhrase emptyPhrase() {
 		return emptyPhrase(null);
 	}

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

@@ -45,6 +45,29 @@ public class Algorithms {
 		return c == null || c.size() == 0;
 	}
 	
+	private static char[] CHARS_TO_NORMALIZE_KEY = new char['’'];
+	private static char[] CHARS_TO_NORMALIZE_VALUE = new char['\''];
+
+	public static String normalizeSearchText(String s) {
+		boolean norm = false;
+		for (int i = 0; i < s.length() && !norm; i++) {
+			char ch = s.charAt(i);
+			for (int j = 0; j < CHARS_TO_NORMALIZE_KEY.length; j++) {
+				if (ch == CHARS_TO_NORMALIZE_KEY[j]) {
+					norm = true;
+					break;
+				}
+			}
+		}
+		if (!norm) {
+			return s;
+		}
+		for (int k = 0; k < CHARS_TO_NORMALIZE_KEY.length; k++) {
+			s = s.replace(CHARS_TO_NORMALIZE_KEY[k], CHARS_TO_NORMALIZE_VALUE[k]);
+		}
+		return s;
+	}
+
 	public static boolean isEmpty(Map<?, ?> map) {
 		return map == null || map.size() == 0;
 	}
@@ -320,10 +343,8 @@ public class Algorithms {
 	 * exception. Supported formats are:
 	 * #RRGGBB
 	 * #AARRGGBB
-	 * 'red', 'blue', 'green', 'black', 'white', 'gray', 'cyan', 'magenta',
-	 * 'yellow', 'lightgray', 'darkgray'
 	 */
-	public static int parseColor(String colorString) {
+	public static int parseColor(String colorString) throws IllegalArgumentException {
 		if (colorString.charAt(0) == '#') {
 			// Use a long to avoid rollovers on #ffXXXXXX
 			if (colorString.length() == 4) {

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

@@ -264,4 +264,5 @@
     <string name="send_my_location_desc">Définir l\'intervalle minimum pour partager sa position.</string>
     <string name="stale_location_desc">La dernière fois qu\'un contact s\'est déplacé.</string>
     <string name="location_history_desc">Cacher les contacts qui ne se sont pas déplacés depuis un temps donné.</string>
+    <string name="set_time_description">Définissez l\'heure à laquelle les contacts et groupes sélectionnés verront votre position en temps réel.</string>
 </resources>

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

@@ -70,7 +70,7 @@
     <string name="saved_messages">Iznan yettwaskelsen</string>
     <string name="unit_of_speed_system">Tayunt n urured</string>
     <string name="unit_of_speed_system_descr">Ad isbadu tayunt n urured.</string>
-    <string name="unit_of_length">Tayunin n umeccaq</string>
+    <string name="unit_of_length">Tayunin n teɣzef</string>
     <string name="unit_of_length_descr">Beddel tayunt n uktili n umeccaq.</string>
     <string name="units_and_formats">Tayunin d yimasalen</string>
     <string name="time_zone_descr">Fren izḍi usrig ara d-tsekneḍ deg yiznan-ik n usideg.</string>
@@ -137,7 +137,7 @@
     <string name="shared_string_group">Agraw</string>
     <string name="last_response">Dernier temps de réponse</string>
     <string name="time_ago">aya</string>
-    <string name="shared_string_exit">Tufɣa</string>
+    <string name="shared_string_exit">Tuffɣa</string>
     <string name="shared_string_sort">Smizzwer</string>
     <string name="by_name">S yisem</string>
     <string name="share_location_as">Bḍu adɣar</string>

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

@@ -102,7 +102,7 @@
     <string name="minutes_format">%1$d m</string>
     <string name="hours_format">%1$d h</string>
     <string name="shared_string_install">Instalar</string>
-    <string name="shared_string_share">Enviar</string>
+    <string name="shared_string_share">Compartilhe</string>
     <string name="shared_string_back">Voltar</string>
     <string name="visible_time_for_all">Hora visível para todos</string>
     <string name="set_time_description">Defina a hora em que seus contatos e grupos selecionados verão sua localização em tempo real.</string>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="last_update_from_telegram_date">Senaste uppdatering från Telegram: %1$s</string>
+</resources>

OsmAnd/build.gradle

@@ -563,6 +563,7 @@ dependencies {
 	implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
 		exclude group: 'com.android.support'
 	}
+	implementation 'com.jaredrummler:colorpicker:1.1.0'
 
 	huaweiImplementation files('libs/huawei-android-drm_v2.5.2.300.jar')
 	freehuaweiImplementation files('libs/huawei-android-drm_v2.5.2.300.jar')

OsmAnd/res/drawable/ic_action_add_to_track.xml

@@ -0,0 +1,16 @@
+<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="M5,15C5,13.8954 5.8954,13 7,13H10C10.5523,13 11,12.5523 11,12C11,11.4477 10.5523,11 10,11H7C4.7909,11 3,12.7909 3,15C3,17.2091 4.7909,19 7,19H15.1707C15.5825,20.1652 16.6938,21 18,21C19.6569,21 21,19.6569 21,18C21,16.3431 19.6569,15 18,15C16.6938,15 15.5825,15.8348 15.1707,17H7C5.8954,17 5,16.1046 5,15ZM17,18C17,18.5523 17.4477,19 18,19C18.5523,19 19,18.5523 19,18C19,17.4477 18.5523,17 18,17C17.4477,17 17,17.4477 17,18Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M3,6C3,4.3432 4.3432,3 6,3C7.3062,3 8.4175,3.8348 8.8293,5H17C19.2091,5 21,6.7909 21,9C21,11.2091 19.2091,13 17,13H14C13.4477,13 13,12.5523 13,12C13,11.4477 13.4477,11 14,11H17C18.1046,11 19,10.1046 19,9C19,7.8954 18.1046,7 17,7H8.8293C8.4175,8.1652 7.3062,9 6,9C4.3432,9 3,7.6568 3,6ZM7,6C7,5.4477 6.5523,5 6,5C5.4477,5 5,5.4477 5,6C5,6.5523 5.4477,7 6,7C6.5523,7 7,6.5523 7,6Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_direction_arrow.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="6dp"
+    android:viewportWidth="12"
+    android:viewportHeight="6">
+  <path
+      android:pathData="M0,6L6,0L12,6H0Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_track_line_bold_transparency.xml

@@ -0,0 +1,10 @@
+<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="M3.3542,9C3.2289,9.1106 3.1106,9.2289 3,9.3542V12H2C2,13.0144 2.3776,13.9407 3,14.6458V12H6V15H3.3542C4.0593,15.6224 4.9855,16 6,16V15H9V16H12V15H15V16H18L18,15H20.6458C20.7711,14.8894 20.8894,14.7711 21,14.6458V12H22C22,10.9856 21.6224,10.0593 21,9.3542V12H18V9H20.6458C19.9407,8.3776 19.0144,8 18,8L18,9H15V8H12V9H9V8H6V9H3.3542ZM9,12H6V9H9V12ZM12,12V9H15V12H12ZM12,12V15H9V12H12ZM15,12H18V15H15V12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_track_line_medium_transparency.xml

@@ -0,0 +1,9 @@
+<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="M5,9C4.2316,9 3.5308,9.2888 3,9.7639V12H2C2,12.8885 2.3863,13.6868 3,14.2361V12H6V15H9V12H12V15H15V12H18V15H19C19.7684,15 20.4692,14.7111 21,14.2361V12H22C22,11.1115 21.6137,10.3132 21,9.7639V12H18V9H15V12H12V9H9V12H6V9H5Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_track_line_thin_transparency.xml

@@ -0,0 +1,9 @@
+<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="M6,11H3L3,12H2C2,12.5523 2.4477,13 3,13V12H6V13H9V12H12V13H15V12H18V13H21V12H22C22,11.4477 21.5523,11 21,11V12H18V11H15V12H12V11H9V12H6V11Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_bg_transparency.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M18,18V24H12V18H18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,1.0242C9.7643,1.8145 7.7313,3.0338 6,4.5834V6H4.5834C3.0338,7.7313 1.8145,9.7643 1.0242,12H6V18H0C0,20.1038 0.3609,22.1233 1.0242,24H6V30H4.5834C5.029,30.498 5.502,30.971 6,31.4166V30H12V34.9758C13.8767,35.6391 15.8962,36 18,36V30H24V34.9758C26.2357,34.1856 28.2687,32.9662 30,31.4166V30H31.4166C32.9662,28.2687 34.1856,26.2357 34.9758,24H30V18H36C36,15.8962 35.6391,13.8767 34.9758,12H30V6H31.4166C30.971,5.502 30.498,5.029 30,4.5834V6H24V1.0242C22.1233,0.3609 20.1038,0 18,0V6H12V1.0242ZM12,12H6V6H12V12ZM18,12V6H24V12H18ZM18,18V12H12V18H6V24H12V30H18V24H24V30H30V24H24V18H30V12H24V18H18Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/layout/bottom_sheet_plan_route_select_file.xml

@@ -14,10 +14,11 @@
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		android:paddingTop="@dimen/bottom_sheet_title_padding_top"
+		android:paddingTop="@dimen/multi_selection_menu_padding_top"
 		android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom"
 		android:text="@string/plan_route_open_existing_track"
-		android:textAppearance="@style/TextAppearance.ListItemCategoryTitle" />
+		android:textAppearance="@style/TextAppearance.ListItemTitle"
+		osmand:typeface="@string/font_roboto_medium" />
 
 	<net.osmand.plus.widgets.TextViewEx
 		android:id="@+id/description"
@@ -27,8 +28,7 @@
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		android:paddingTop="@dimen/bottom_sheet_title_padding_top"
-		android:paddingBottom="@dimen/bottom_sheet_title_padding_bottom"
+		android:paddingBottom="@dimen/content_padding"
 		android:text="@string/plan_route_select_track_file_for_open"
 		android:textColor="?android:textColorPrimary"
 		android:textSize="@dimen/default_desc_text_size"

OsmAnd/res/layout/bottom_sheet_plan_route_start.xml

@@ -22,9 +22,10 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:text="@string/plan_route_last_edited"
+			android:letterSpacing="@dimen/description_letter_spacing"
 			android:textColor="?attr/active_color_basic"
 			android:textSize="@dimen/default_desc_text_size"
-			osmand:typeface="@string/font_roboto_regular" />
+			osmand:typeface="@string/font_roboto_medium" />
 
 	</LinearLayout>
 

OsmAnd/res/layout/custom_color_picker.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<com.jaredrummler.android.colorpicker.ColorPickerView
+		android:id="@+id/color_picker_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+
+		android:paddingBottom="@dimen/content_padding_small"
+		app:cpv_alphaChannelVisible="true" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<com.jaredrummler.android.colorpicker.ColorPanelView
+			android:id="@+id/color_panel_new"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			app:cpv_colorShape="square" />
+
+		<Space
+			android:layout_width="@dimen/content_padding"
+			android:layout_height="match_parent" />
+
+		<com.google.android.material.textfield.TextInputLayout
+			android:id="@+id/color_hex_text_input"
+			style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			app:boxBackgroundColor="@color/material_text_input_layout_bg"
+			app:hintEnabled="false"
+			app:prefixText="#">
+
+			<com.google.android.material.textfield.TextInputEditText
+				android:id="@+id/color_hex_edit_text"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:inputType="textMultiLine"
+				android:maxLines="4"
+				android:minHeight="@dimen/bottom_sheet_list_item_height"
+				android:paddingStart="@dimen/content_padding_small"
+				android:paddingLeft="@dimen/content_padding_small"
+				android:paddingEnd="@dimen/content_padding_small"
+				android:paddingRight="@dimen/content_padding_small"
+				android:textSize="@dimen/default_list_text_size"
+				tools:text="F1FF00" />
+
+		</com.google.android.material.textfield.TextInputLayout>
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/custom_radio_buttons.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/custom_radio_buttons"
+	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:background="?attr/btn_bg_border_inactive"
+	android:baselineAligned="false"
+	android:orientation="horizontal"
+	tools:showIn="@layout/fragment_route_between_points_bottom_sheet_dialog">
+
+	<FrameLayout
+		android:id="@+id/left_button_container"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/left_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="center"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="@string/shared_string_left"/>
+
+	</FrameLayout>
+
+	<FrameLayout
+		android:id="@+id/center_button_container"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:visibility="gone">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/center_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="center"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="@string/position_on_map_center"/>
+
+	</FrameLayout>
+
+	<FrameLayout
+		android:id="@+id/right_button_container"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_weight="1">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/right_button"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:background="?attr/selectableItemBackground"
+			android:gravity="center"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="@string/shared_string_right"/>
+
+	</FrameLayout>
+
+</LinearLayout>

OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:background="@color/color_transparent">
+
+	<LinearLayout
+		android:id="@+id/main_view"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<include layout="@layout/context_menu_top_shadow" />
+
+		<FrameLayout
+			android:id="@+id/bottom_container"
+			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"
+				android:layout_height="match_parent"
+				android:background="?attr/route_info_bg">
+
+				<LinearLayout
+					android:id="@+id/route_menu_cards_container"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/route_info_bg"
+					android:orientation="vertical"
+					android:paddingBottom="@dimen/dialog_button_ex_height">
+
+				</LinearLayout>
+
+			</net.osmand.plus.LockableScrollView>
+		</FrameLayout>
+
+	</LinearLayout>
+
+	<FrameLayout
+		android:id="@+id/map_controls_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom">
+
+		<include
+			layout="@layout/map_ruler"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start|bottom"
+			android:layout_marginStart="@dimen/fab_margin_right"
+			android:layout_marginLeft="@dimen/fab_margin_right"
+			android:layout_marginEnd="@dimen/fab_margin_right"
+			android:layout_marginRight="@dimen/fab_margin_right"
+			tools:visibility="invisible" />
+
+		<include
+			layout="@layout/map_hud_controls"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end|bottom"
+			android:layout_marginStart="@dimen/fab_margin_right"
+			android:layout_marginLeft="@dimen/fab_margin_right"
+			android:layout_marginEnd="@dimen/fab_margin_right"
+			android:layout_marginRight="@dimen/fab_margin_right"
+			tools:visibility="invisible" />
+
+	</FrameLayout>
+
+	<LinearLayout
+		android:id="@+id/control_buttons"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:orientation="vertical">
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/buttons_shadow"
+			android:layout_width="match_parent"
+			android:layout_height="10dp"
+			android:layout_gravity="bottom"
+			android:background="@drawable/bg_contextmenu_shadow_top_light" />
+
+		<include
+			layout="@layout/bottom_buttons"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_ex_height"
+			android:layout_gravity="bottom" />
+
+	</LinearLayout>
+
+</FrameLayout>

OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/bg_color"
+		android:orientation="vertical">
+
+		<LinearLayout
+			android:id="@+id/navigation_types_container"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingBottom="@dimen/bottom_sheet_content_padding_small">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/choose_navigation_title"
+				android:layout_width="match_parent"
+				android:layout_height="@dimen/bottom_sheet_title_height"
+				android:gravity="center_vertical"
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding"
+				android:text="@string/route_between_points"
+				android:textAppearance="@style/TextAppearance.ListItemTitle"
+				osmand:typeface="@string/font_roboto_medium" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding"
+				android:paddingBottom="@dimen/content_padding"
+				android:text="@string/rourte_between_points_desc"
+				android:textColor="?android:textColorPrimary"
+				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+				osmand:typeface="@string/font_roboto_regular"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:textSize="@dimen/default_desc_text_size" />
+
+			<include layout="@layout/custom_radio_buttons" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/button_description"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingEnd="@dimen/content_padding"
+				android:paddingLeft="@dimen/content_padding"
+				android:paddingRight="@dimen/content_padding"
+				android:paddingStart="@dimen/content_padding"
+				android:paddingTop="@dimen/measurement_tool_content_padding_medium"
+				android:paddingBottom="@dimen/measurement_tool_content_padding_medium"
+				android:text="@string/rourte_between_points_next_segment_button_desc"
+				android:textColor="?android:textColorPrimary"
+				android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+				osmand:typeface="@string/font_roboto_regular"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:textSize="@dimen/default_desc_text_size" />
+		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/buttons_container"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dialog_button_ex_height"
+			android:gravity="center"
+			android:layout_gravity="bottom"
+			android:orientation="horizontal"
+			android:paddingLeft="@dimen/content_padding"
+			android:paddingRight="@dimen/content_padding"
+			android:paddingEnd="@dimen/content_padding"
+			android:paddingStart="@dimen/content_padding">
+
+			<include
+				android:id="@+id/dismiss_button"
+				layout="@layout/bottom_sheet_dialog_button" />
+		</LinearLayout>
+
+	</LinearLayout>
+
+</androidx.core.widget.NestedScrollView>

OsmAnd/res/layout/fragment_terrain.xml

@@ -92,52 +92,7 @@
 					android:background="?attr/bg_color"
 					android:orientation="vertical">
 
-					<LinearLayout
-						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:background="?attr/btn_bg_border_inactive"
-						android:baselineAligned="false"
-						android:orientation="horizontal">
-
-						<FrameLayout
-							android:id="@+id/hillshade_btn_container"
-							android:layout_width="0dp"
-							android:layout_height="match_parent"
-							android:layout_weight="1">
-
-							<net.osmand.plus.widgets.TextViewEx
-								android:id="@+id/hillshade_btn"
-								android:layout_width="match_parent"
-								android:layout_height="match_parent"
-								android:background="?attr/selectableItemBackground"
-								android:gravity="center"
-								android:text="@string/shared_string_hillshade"
-								android:textSize="@dimen/default_desc_text_size"
-								osmand:typeface="@string/font_roboto_medium" />
-
-						</FrameLayout>
-
-						<FrameLayout
-							android:id="@+id/slope_btn_container"
-							android:layout_width="0dp"
-							android:layout_height="match_parent"
-							android:layout_weight="1">
-
-							<net.osmand.plus.widgets.TextViewEx
-								android:id="@+id/slope_btn"
-								android:layout_width="match_parent"
-								android:layout_height="match_parent"
-								android:background="?attr/selectableItemBackground"
-								android:gravity="center"
-								android:text="@string/shared_string_slope"
-								android:textSize="@dimen/default_desc_text_size"
-								osmand:typeface="@string/font_roboto_medium" />
-
-						</FrameLayout>
-
-					</LinearLayout>
+					<include layout="@layout/custom_radio_buttons" />
 
 					<net.osmand.plus.widgets.TextViewEx
 						android:id="@+id/description"

OsmAnd/res/layout/navigation_profiles_card.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/navigation_profile"
+		android:layout_width="wrap_content"
+		android:layout_height="@dimen/measurement_tool_button_height"
+		android:gravity="start|center_vertical"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		osmand:typeface="@string/font_roboto_medium"
+		android:textColor="@color/active_color_primary_light"
+		android:textSize="@dimen/default_list_text_size"
+		android:text="@string/navigation_profile" />
+
+	<LinearLayout
+		android:id="@+id/content_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_horizontal|bottom"
+		android:orientation="vertical" />
+</LinearLayout>

OsmAnd/res/layout/plan_route_threshold_slider.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="start"
+			osmand:typeface="@string/font_roboto_regular"
+			android:textColor="?android:textColorPrimary"
+			android:textSize="@dimen/default_list_text_size"
+			android:text="@string/threshold_distance" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/value"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end"
+			osmand:typeface="@string/font_roboto_regular"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_list_text_size"
+			tools:text="5 m" />
+
+	</FrameLayout>
+
+	<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"
+		android:layout_height="wrap_content" />
+
+	<include layout="@layout/divider" />
+
+</LinearLayout>

OsmAnd/res/layout/track_appearance.xml

@@ -50,7 +50,7 @@
 					osmand:typeface="@string/font_roboto_medium" />
 
 				<androidx.appcompat.widget.AppCompatImageView
-					android:id="@+id/appearance_icon"
+					android:id="@+id/track_icon"
 					android:layout_width="@dimen/standard_icon_size"
 					android:layout_height="@dimen/standard_icon_size"
 					android:layout_gravity="center_vertical"
@@ -94,7 +94,8 @@
 		android:id="@+id/map_controls_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom">
+		android:layout_gravity="bottom"
+		tools:visibility="invisible">
 
 		<include
 			layout="@layout/map_ruler"
@@ -104,8 +105,7 @@
 			android:layout_marginStart="@dimen/fab_margin_right"
 			android:layout_marginLeft="@dimen/fab_margin_right"
 			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right"
-			tools:visibility="invisible" />
+			android:layout_marginRight="@dimen/fab_margin_right" />
 
 		<include
 			layout="@layout/map_hud_controls"
@@ -115,8 +115,7 @@
 			android:layout_marginStart="@dimen/fab_margin_right"
 			android:layout_marginLeft="@dimen/fab_margin_right"
 			android:layout_marginEnd="@dimen/fab_margin_right"
-			android:layout_marginRight="@dimen/fab_margin_right"
-			tools:visibility="invisible" />
+			android:layout_marginRight="@dimen/fab_margin_right" />
 
 	</FrameLayout>
 

OsmAnd/res/layout/track_coloring_card.xml

@@ -40,7 +40,7 @@
 
 	</LinearLayout>
 
-	<net.osmand.plus.widgets.FlowLayout
+	<com.google.android.material.internal.FlowLayout
 		android:id="@+id/select_color"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"

OsmAnd/res/values-af/strings.xml

@@ -283,7 +283,7 @@
   <string name="search_position_current_location_found">Ligging (gevind)</string>
   <string name="search_position_address">Adres…</string>
   <string name="search_position_favorites">Gunstelinge…</string>
-  <string name="search_position_undefined">ongedefinieerd</string>
+  <string name="shared_string_undefined">ongedefinieerd</string>
   
   
   <string name="search_position_map_view">Laaste kaart uitsig</string>

OsmAnd/res/values-ar/strings.xml

@@ -666,7 +666,7 @@
     <string name="search_position_current_location_found">موقعي ( تم تحديده )</string>
     <string name="search_position_address">عنوان…</string>
     <string name="search_position_favorites">المفضلة…</string>
-    <string name="search_position_undefined">غير محدد</string>
+    <string name="shared_string_undefined">غير محدد</string>
     <string name="search_position_map_view">مركز الخريطة الحالي</string>
     <string name="select_search_position">المنطلق:</string>
     <string name="context_menu_item_search">بحث بالجوار</string>
@@ -3095,7 +3095,7 @@
     <string name="quick_action_hillshade_hide">إخفاء التضاريس</string>
     <string name="quick_action_show_hide_hillshade">إظهار/إخفاء التضاريس</string>
     <string name="tts_initialization_error">لا يمكن بدء تشغيل أداة تحويل النص إلى كلام.</string>
-    <string name="export_profile">تصدير الوضع</string>
+    <string name="export_profile">تصدير الملف الشخصي</string>
     <string name="exported_osmand_profile">وضع أوسماند: %1$s</string>
     <string name="overwrite_profile_q">الوضع \'%1$s\' موجود بالفعل، هل تريد استبداله؟</string>
     <string name="export_profile_failed">لا يمكن تصدير الوضع.</string>
@@ -3154,7 +3154,7 @@
     <string name="list_of_installed_plugins">الإضافات المثبتة</string>
     <string name="configure_navigation">تكوين الملاحة</string>
     <string name="general_settings_profile_descr">ثيم التطبيق ، وحدات ، المنطقة</string>
-    <string name="configure_profile">إعداد الوضع</string>
+    <string name="configure_profile">تكوين ملف التعريف</string>
     <string name="screen_alerts_descr">تظهر التنبيهات في أسفل اليسار أثناء التنقل.</string>
     <string name="switch_profile">تبديل الوضع</string>
     <string name="language_and_output">اللغة والإخراج</string>
@@ -3401,10 +3401,10 @@
     <string name="edit_profiles_descr">لا يمكنك حذف أوضاع أوسماند الافتراضية ، ولكن يمكنك تعطيلها في الشاشة السابقة ، أو نقلها إلى الأسفل.</string>
     <string name="edit_profiles">تحرير الأوضاع</string>
     <string name="select_nav_profile_dialog_message">يؤثر نوع التنقل على قواعد حسابات المسار.</string>
-    <string name="profile_appearance">مظهر الوضع</string>
+    <string name="profile_appearance">مظهر الملف الشخصي</string>
     <string name="choose_icon_color_name">اختر الايقونة واللون والاسم</string>
     <string name="reorder_profiles">تحرير قائمة الأوضاع</string>
-    <string name="selected_profile">الوضع المحدد</string>
+    <string name="selected_profile">الملف الشخصي المحدد</string>
     <string name="reset_confirmation_descr">بالضغط على %1$s، ستفقد كل تغييراتك.</string>
     <string name="reset_all_profile_settings_descr">سيتم إعادة ضبط جميع إعدادات الوضع إلى الحالة الافتراضية بعد التثبيت.</string>
     <string name="reset_all_profile_settings">استعادة الضبط الافتراضي؟</string>
@@ -3828,4 +3828,18 @@
     <string name="plan_route_create_new_route">إنشاء مسار جديد</string>
     <string name="plan_route_select_track_file_for_open">حدد ملف المسار للفتح.</string>
     <string name="shared_string_done">تم</string>
+    <string name="overwrite_track">الكتابة فوق المسار</string>
+    <string name="navigation_profile">ملف تعريف التنقل</string>
+    <string name="rourte_between_points_add_track_desc">حدد ملف المسار الذي سيتم إضافة مقطع جديد إليه.</string>
+    <string name="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>
 </resources>

OsmAnd/res/values-b+be+Latn/strings.xml

@@ -920,7 +920,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="search_position_current_location_found">Majo stanovіšča (znojdziena)</string>
     <string name="search_position_address">Adras…</string>
     <string name="search_position_favorites">Ulubionyja…</string>
-    <string name="search_position_undefined">Niavyznačana</string>
+    <string name="shared_string_undefined">Niavyznačana</string>
     <string name="search_position_map_view">Ciapierašni centr mapy</string>
     <string name="select_search_position">Pačatak:</string>
     <string name="context_menu_item_search">Šukać navokal</string>

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

@@ -1090,7 +1090,7 @@
     <string name="animate_route">Simulaciju startować</string>
     <string name="file_can_not_be_renamed">Dataja njehodźi so přemjenować.</string>
     <string name="file_with_name_already_exists">Dataja z tutym mjenom hižo eksistuje.</string>
-    <string name="search_position_undefined">njedefinowane</string>
+    <string name="shared_string_undefined">njedefinowane</string>
     <string name="route_successfully_saved_at">Čara składowana jako \'%1$s\'.</string>
     <string name="local_index_descr_title">Kartowe dataje zrjadować.</string>
     <string name="local_indexes_cat_poi">POI-daty</string>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="poi_road_obstacle">Ugur n webrid</string>
+    <string name="poi_road_obstacle">Ugur n ubrid</string>
     <string name="poi_healthcare">Tazmart</string>
     <string name="poi_fuel_type">Tawsit n userɣu</string>
     <string name="poi_fuel_avia_type">Tawsit n userɣu (isafagen)</string>
@@ -10,15 +10,15 @@
     <string name="poi_highway_crossing_type">Tawsit</string>
     <string name="poi_zoo_type">Anaw</string>
     <string name="poi_traffic_signals_sound">Imesli</string>
-    <string name="poi_shop">Tazenzut</string>
+    <string name="poi_shop">Asekles</string>
     <string name="poi_sport">Addal</string>
     <string name="poi_tourism">Tamerrit</string>
     <string name="poi_sustenance">Učči</string>
     <string name="poi_finance">Tadrimt</string>
     <string name="poi_wine">Tazenzut n crab</string>
-    <string name="poi_shoes">Tazenzut u sebbaḍ</string>
-    <string name="poi_candles">Tazenzut n cmaɛ</string>
-    <string name="poi_computer">Tazenzut u selkim</string>
+    <string name="poi_shoes">Taḥanut u sebbaḍ</string>
+    <string name="poi_candles">Taḥanut n ccmaɛ</string>
+    <string name="poi_computer">Taḥanut n yiselkimen</string>
     <string name="poi_school">Aγerbaz</string>
     <string name="poi_pharmacy">Tansafart</string>
     <string name="poi_hospital">Sbiṭaṛ</string>
@@ -28,14 +28,14 @@
     <string name="poi_payment_type">Tawsit n lexlaṣ</string>
     <string name="poi_payment_fuel_type">Tikaṛḍiwin n userɣu</string>
     <string name="poi_service_general">Ameẓlu</string>
-    <string name="poi_pump">Tamejγart</string>
-    <string name="poi_city_capital">Tamaneγt</string>
-    <string name="poi_religion_type">Asγan</string>
+    <string name="poi_pump">Tamejɣart</string>
+    <string name="poi_city_capital">Tamanaɣt</string>
+    <string name="poi_religion_type">Asɣan</string>
     <string name="poi_fee">Taṣerrift</string>
-    <string name="poi_cafeteria">Taneγlust</string>
+    <string name="poi_cafeteria">Taneɣlust</string>
     <string name="poi_filling_station">Taγsert n yimeẓla</string>
     <string name="poi_power">Taẓwert</string>
-    <string name="poi_education">Assegmi</string>
+    <string name="poi_education">Asegmi</string>
     <string name="poi_bakery">Taneγrumt</string>
     <string name="poi_police">Tamsulta</string>
     <string name="poi_post_office">Tanazent</string>
@@ -61,7 +61,7 @@
     <string name="poi_video_yes">Ih</string>
     <string name="poi_sms_no">Uhu</string>
     <string name="poi_sms_yes">Ih</string>
-    <string name="poi_video_telephone">Ividyuten</string>
+    <string name="poi_video_telephone">Tavidyut</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_volcano_type_mud">Ixmiṛ</string>
     <string name="poi_volcano_status_inactive">Insa</string>
@@ -179,14 +179,14 @@
     <string name="poi_reservation_no">Asuter n uḥeṛṛi</string>
     <string name="poi_animal_shelter_purpose_release_no">Tasuffeɣt n lqem</string>
     <string name="poi_animal_shelter_purpose_adoption_no">Ɣef uqbal</string>
-    <string name="poi_animal_shelter_purpose">Glem asentel n tugna</string>
+    <string name="poi_animal_shelter_purpose">Asaɣed</string>
     <string name="poi_owner">Bab</string>
     <string name="poi_motorcycle_type_standard">Anaway</string>
     <string name="poi_motorcycle_parts_yes">amuren</string>
     <string name="poi_motorcycle_repair_no">Seggem azadur n isefka</string>
     <string name="poi_motorcycle_repair_yes">Seggem azadur n isefka</string>
     <string name="poi_motorcycle_rental_no">Kerru n tkerrust</string>
-    <string name="poi_motorcycle_services">Services</string>
+    <string name="poi_motorcycle_services">Imeẓla</string>
     <string name="poi_fast_food_cafeteria">Ih</string>
     <string name="poi_gambling_type">Anaw</string>
     <string name="poi_theatre_genre_circus">Cirque</string>
@@ -501,10 +501,10 @@
     <string name="poi_recycling_type">Anaw</string>
     <string name="poi_beauty_salon_service">Ameẓlu</string>
     <string name="poi_drive_in">Aḍebsi aquṛan</string>
-    <string name="poi_delivery">Livraison de nourriture</string>
-    <string name="poi_theatre_genre">Genre</string>
+    <string name="poi_delivery">Asiweḍ n wučči</string>
+    <string name="poi_theatre_genre">Tawsit</string>
     <string name="poi_resort_type">Anaw</string>
-    <string name="poi_clock_option">Ayen nniḍen</string>
+    <string name="poi_clock_option">Ayen-nniḍen</string>
     <string name="poi_information_contents">Agbur</string>
     <string name="poi_information_type">Anaw</string>
     <string name="poi_wheelchair_yes">Ih</string>
@@ -596,19 +596,19 @@
     <string name="poi_marketplace">Ssuq</string>
     <string name="poi_sports">Articles de sport</string>
     <string name="poi_musical_instrument">Allalen n uẓawan</string>
-    <string name="poi_books">Librairie</string>
+    <string name="poi_books">Tanedlist</string>
     <string name="poi_vending_machine">Asedgar awurman</string>
-    <string name="poi_coffee">Café</string>
-    <string name="poi_user_defined_other">Aseqdac arussin</string>
+    <string name="poi_coffee">Taneɣlust</string>
+    <string name="poi_user_defined_other">Yemla-t-id useqdac</string>
     <string name="poi_osmwiki">Wikipedia</string>
     <string name="poi_natural">Agaman</string>
     <string name="poi_service">Ameẓlu</string>
     <string name="poi_club">Club</string>
     <string name="poi_internet_access">Anekcum ɣer Internet</string>
     <string name="poi_office">Tanarit</string>
-    <string name="poi_administrative">Tadbelant</string>
+    <string name="poi_administrative">Tadeblant</string>
     <string name="poi_communication">taɣwalt</string>
-    <string name="poi_transportation">Transport de Fret</string>
+    <string name="poi_transportation">Asiweḍ</string>
     <string name="poi_emergency">Tanesɣiwlt</string>
     <string name="poi_bicycle_parking_type">Taswit</string>
     <string name="poi_covered">Idel</string>
@@ -681,4 +681,53 @@
     <string name="poi_ice_rink">Patinoire</string>
     <string name="poi_stadium">Annar</string>
     <string name="poi_studio">Astudyu</string>
+    <string name="poi_hardware">Taḥanut n warrum</string>
+    <string name="poi_gift">Taḥanut n yisefken</string>
+    <string name="poi_florist">Taḥanut n tjeǧǧigin</string>
+    <string name="poi_doors">Tiwwura</string>
+    <string name="poi_carpet">Taḥanut n yigertilen</string>
+    <string name="poi_bed">Taḥanut n wusu</string>
+    <string name="poi_bathroom_furnishing">Iruka n texxamt n usired</string>
+    <string name="poi_bag">Taḥanut n yiqraben</string>
+    <string name="poi_baby_goods">Alzazen n yiṭufanen</string>
+    <string name="poi_art">Taḥanut n tẓuri</string>
+    <string name="poi_antiques">Taḥanut n tɣawsiwin n teglest</string>
+    <string name="poi_butcher">Ulzuz n uksum</string>
+    <string name="poi_chocolate">Taḥanut n cakula</string>
+    <string name="poi_cheese">Taḥanut n uguglu</string>
+    <string name="poi_alcohol">Taḥanut n ccrab</string>
+    <string name="poi_military">Aserdas</string>
+    <string name="poi_craft">Tinḍi</string>
+    <string name="poi_cafe_and_restaurant">Taneɣlust d tneččit</string>
+    <string name="poi_accomodation">Tanezduɣt</string>
+    <string name="poi_sightseeing">Tamerrit</string>
+    <string name="poi_transport_construction">Lebni n usiweḍ</string>
+    <string name="poi_man_made">Afares n umdan</string>
+    <string name="poi_water_transport">Asiweḍ deg waman</string>
+    <string name="poi_air_transport">Asiweḍ deg yigenni</string>
+    <string name="poi_public_transport">Asiweḍ azayez</string>
+    <string name="poi_personal_transport">Asiweḍ udmawan</string>
+    <string name="poi_traffic_signals_arrow">Aneccab</string>
+    <string name="poi_traffic_signals_vibration">Anhaz</string>
+    <string name="poi_bath_open_air">Beṛṛa</string>
+    <string name="poi_access_caravan">Anekcum n teɣlemt</string>
+    <string name="poi_snowmobile_filter">Anekcum n tkeṛyas n udfel</string>
+    <string name="poi_denotation">Asmussen</string>
+    <string name="poi_books_type">Idlisen</string>
+    <string name="poi_glacier_type">Anaw n ugris</string>
+    <string name="poi_service_car">Ameẓlu n tkeṛyas</string>
+    <string name="poi_socket_cee_blue_output_filter">Tuffɣa tazegzawt CEE</string>
+    <string name="poi_socket_type3_output_filter">Tuffɣa n wanaw wis 3</string>
+    <string name="poi_socket_type2_output_filter">Tuffɣa n wanaw wis 2</string>
+    <string name="poi_water_place_access">Anekcum ɣer wadeg n waman</string>
+    <string name="poi_water_purification">Asizdeg n waman</string>
+    <string name="poi_animal_shelter_type">Iɣersiwen yettwaqeblen</string>
+    <string name="poi_payment_transport_type">Anaw n uxelleṣ (asiweḍ)</string>
+    <string name="poi_home_visit">Tirza ɣer uxxam</string>
+    <string name="poi_caravans">Tiɣlamin</string>
+    <string name="poi_washing_machine">Tamacint n usired</string>
+    <string name="poi_tents">Iqiḍunen</string>
+    <string name="poi_beach_surface_type">Tajumma</string>
+    <string name="poi_smoking">Akeyyef</string>
+    <string name="poi_outdoor_seating">Tiɣimit deg beṛṛa</string>
 </resources>

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

@@ -434,7 +434,7 @@
     <string name="shared_string_download">Sider</string>
     <string name="shared_string_downloading">Azdam…</string>
     <string name="shared_string_close">Mdel</string>
-    <string name="shared_string_exit">Tufɣa</string>
+    <string name="shared_string_exit">Tuffɣa</string>
     <string name="shared_string_collapse">Ḍfes</string>
     <string name="shared_string_show_on_map">"Sken ɣef  tkarḍa"</string>
     <string name="shared_string_map">Takarḍa</string>
@@ -540,7 +540,7 @@
     <string name="global_settings">Iɣewwaren Imuta</string>
     <string name="city_type_city">Tiɣremt</string>
     <string name="search_position_favorites">Imenyafen …</string>
-    <string name="search_position_undefined">D arbadu</string>
+    <string name="shared_string_undefined">D arbadu</string>
     <string name="select_search_position">Taneṣlit :</string>
     <string name="favorite_places_category">Imukan</string>
     <string name="shared_string_release">Yeffeɣ-d</string>
@@ -645,8 +645,8 @@
     <string name="context_menu_read_full_article">Γer amagrad akk</string>
     <string name="context_menu_read_article">Γer amagrad</string>
     <string name="context_menu_points_of_group">Akk tinqiḍin n ugraw</string>
-    <string name="open_from">Yeldi si</string>
-    <string name="open_till">Yeldi si</string>
+    <string name="open_from">Yeldi seg</string>
+    <string name="open_till">Yeldi almi</string>
     <string name="will_close_at">Ad imdel ɣef</string>
     <string name="will_open_at">Ad yeldi ɣef</string>
     <string name="will_open_on">Ad yeldi ass</string>
@@ -704,15 +704,15 @@
     <string name="reset_to_default">Err-d azalen s lexṣas</string>
     <string name="analytics_pref_title">Analytics</string>
     <string name="price_free">Ilelli</string>
-    <string name="years_5">Iseggassen</string>
-    <string name="years_2_4">Iseggassen</string>
-    <string name="year">Iseggasen</string>
-    <string name="months_5">Igguren</string>
-    <string name="months_2_4">Igguren</string>
-    <string name="month">Aggur</string>
+    <string name="years_5">Iseggasen</string>
+    <string name="years_2_4">Iseggasen</string>
+    <string name="year">Aseggas</string>
+    <string name="months_5">Ayyuren</string>
+    <string name="months_2_4">Ayyuren</string>
+    <string name="month">Ayyur</string>
     <string name="weeks_5">Imalasen</string>
     <string name="weeks_2_4">Imalasen</string>
-    <string name="week">Amalas</string>
+    <string name="week">Imalas</string>
     <string name="days_5">Ussan</string>
     <string name="days_2_4">Ussan</string>
     <string name="day">Ass</string>
@@ -866,7 +866,7 @@
     <string name="lang_lmo">Talumbardit</string>
     <string name="average_speed">Arured alemmas</string>
     <string name="average_altitude">Awrir alemmas</string>
-    <string name="unit_of_length">Tayunin n umeccaq</string>
+    <string name="unit_of_length">Tayunin n teɣzef</string>
     <string name="unit_of_length_descr">Beddel tayunt n uktili n umeccaq.</string>
     <string name="units_and_formats">Tayunin d yimasalen</string>
     <string name="si_m_s">Imitren di tasint (m/tasint)</string>
@@ -1010,8 +1010,8 @@
     <string name="purchase_dialog_title">Fren</string>
     <string name="shared_string_travel_book">Voyage</string>
     <string name="shared_string_dont">Ur aɣ-ṭṭafaṛ ara</string>
-    <string name="clear_all_intermediates">Sfeḍ akk tineqqidin</string>
-    <string name="transport_nearby_routes">Sider i useqdec deg usnas.</string>
+    <string name="clear_all_intermediates">Sfeḍ akk tineqqiḍin</string>
+    <string name="transport_nearby_routes">Deg</string>
     <string name="osm_notes">Tizmilin</string>
     <string name="all_data">Akk isefka ttunefken-d ddaw n CC-BY-SA 2.0:</string>
     <string name="osc_file">Afaylu</string>
@@ -1114,7 +1114,7 @@
     <string name="context_menu_item_search_poi">Nadi</string>
     <string name="layer_map">aɣbalu</string>
     <string name="error_occurred_loading_gpx">\"ur izmir ara ad yali: \"</string>
-    <string name="rotate_map_to_bearing">Orientation</string>
+    <string name="rotate_map_to_bearing">Taɣda n tkarḍa</string>
     <string name="rotate_map_to_bearing_descr">Areyyec</string>
     <string name="poi_context_menu_delete">Kkes</string>
     <string name="poi_context_menu_modify">Beddel</string>
@@ -1175,7 +1175,7 @@
     <string name="item_checked">Senqedeɣ. Ɛeyyen anezri amaynut</string>
     <string name="map_widget_gps_info">Talɣut</string>
     <string name="select_address_activity">Veuillez renseigner le champs \"address\".</string>
-    <string name="cancel_navigation">Tunigin</string>
+    <string name="cancel_navigation">Seḥbes tunigin</string>
     <string name="install_paid">lqem</string>
     <string name="gpx_file_name">Isem n ufaylu</string>
     <string name="plugin_distance_point_ele">Élevation satellite en dixièmes de degré</string>
@@ -1195,7 +1195,7 @@
     <string name="enable_proxy_title">Rmed Apruksi HTTP</string>
     <string name="confirm_every_run">Sutur yal tikelt</string>
     <string name="traffic_warning_stop">Seḥbes</string>
-    <string name="search_radius_proximity">Sider i useqdec deg usnas.</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="download_tab_downloads">Sken akkw isidar</string>
@@ -1313,4 +1313,20 @@
     <string name="lang_sh">Tasiṛbu-karwaṣit</string>
     <string name="rendering_attr_hideBuildings_name">Ixxamen</string>
     <string name="item_deleted">%1$s yettwasfeḍ</string>
+    <string name="routing_attr_length_name">Talast n teɣzef</string>
+    <string name="driving_region">Tamnaḍt n tenhaṛt</string>
+    <string name="animate_routing_route_not_calculated">Ttxil siḍen abrid qbel</string>
+    <string name="daynight_mode_auto">Alluy n yiṭij/aɣelluy n yiṭij</string>
+    <string name="day_night_info">Talɣut n wass/iḍ</string>
+    <string name="starting_point">Taneqqiḍt n beddu</string>
+    <string name="replace_destination_point">Semselsi taɣerwaḍt</string>
+    <string name="intermediate_items_sort_by_distance">Smizzwer s tewwurt ɣer tewwurt</string>
+    <string name="transport_nearby_routes_within">Iberdan iqerben deg</string>
+    <string name="map_widget_intermediate_time">Akud agrayan</string>
+    <string name="shared_string_done">Yemmug</string>
+    <string name="search_download_wikipedia_maps">Sader tikarḍiwin n Wikipedia</string>
+    <string name="route_between_points">Abrid gar wagazen</string>
+    <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>
 </resources>

OsmAnd/res/values-b+sr+Latn/strings.xml

@@ -132,7 +132,7 @@
 	
 	<string name="poi_filter_nominatim">Online Nominatim</string>
 	<string name="search_position_address">Adresa …</string>
-	<string name="search_position_undefined">Neodređeno</string>
+	<string name="shared_string_undefined">Neodređeno</string>
 	
 	<string name="layer_map_appearance">Konfiguracija ekrana</string>
 	<string name="show_lanes">Prikaži trake</string>

OsmAnd/res/values-be/strings.xml

@@ -605,7 +605,7 @@
     <string name="search_position_current_location_found">Маё становішча (знойдзена)</string>
     <string name="search_position_address">Адрас…</string>
     <string name="search_position_favorites">Улюбёныя мясціны…</string>
-    <string name="search_position_undefined">Нявызначана</string>
+    <string name="shared_string_undefined">Нявызначана</string>
     <string name="search_position_map_view">Цяперашні цэнтр мапы</string>
     <string name="select_search_position">Пачатак:</string>
     <string name="context_menu_item_search">Шукаць навокал</string>

OsmAnd/res/values-bg/strings.xml

@@ -505,7 +505,7 @@
     <string name="search_position_current_location_found">Моето място (намерено)</string>
     <string name="search_position_address">Адрес…</string>
     <string name="search_position_favorites">Предпочитани…</string>
-    <string name="search_position_undefined">Неопределена</string>
+    <string name="shared_string_undefined">Неопределена</string>
     <string name="search_position_map_view">Текущ център на картата</string>
     <string name="select_search_position">Начална точка:</string>
     <string name="context_menu_item_search">Търси близо до това място</string>

OsmAnd/res/values-ca/strings.xml

@@ -219,7 +219,7 @@
     <string name="search_position_current_location_search">S\'està cercant la posició…</string>
     <string name="search_position_current_location_found">La meva posició (trobada)</string>
     <string name="search_position_address">Adreça…</string>
-    <string name="search_position_undefined">Indefinida</string>
+    <string name="shared_string_undefined">Indefinida</string>
     <string name="context_menu_item_search">Cerca pel voltant</string>
     <string name="shared_string_save_as_gpx">Desa com un nou fitxer GPX</string>
     <string name="route_successfully_saved_at">La ruta s\'ha desat com a «%1$s».</string>
@@ -778,7 +778,7 @@
     <string name="search_osm_nominatim">Cerca una adreça utilitzant OSM Nominatim</string>
     <string name="hint_search_online">Cerca en línia: Núm. de la casa, carrer, ciutat</string>
     <string name="max_level_download_tile_descr">No mostris mapes en línia per un nivell de zoom més enllà d\'aquest.</string>
-    <string name="route_general_information">"Distància total %1$s,  temps de viatge %2$d h %3$d min."</string>
+    <string name="route_general_information">Distància total %1$s, temps de viatge %2$d h %3$d min.</string>
     <string name="router_service_descr">Servei de navegació en línia o local.</string>
     <string name="download_question">Voleu baixar {0} - {1} ?</string>
     <string name="download_question_exist">Ja existeixen dades locals ({1}) per {0}. Voleu actualitzar-les ({2}) ?</string>
@@ -2833,7 +2833,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="poi_cannot_be_found">No s\'ha pogut trobar el node o la via.</string>
     <string name="search_no_results_feedback">Cap resultat en la cerca?
 \nComenteu-nos-ho</string>
-    <string name="test_voice_desrc">Premeu un botó i escolteu la corresponent descripció de veu per identificar les descripcions pendents o errònies.</string>
+    <string name="test_voice_desrc">Premeu un botó i escolteu la corresponent descripció de veu per identificar si estan pendents o són errònies</string>
     <string name="release_3_2_pre">"• S\'ha corregit el bloqueig d\'entrada d\'alguns dispositius 
 \n
 \n 
@@ -3711,4 +3711,41 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_remove_next_destination_descr">La propera fita de la ruta s\'esborrarà. Si es tractés de la Destinació final, la navegació s\'aturaria.</string>
     <string name="search_download_wikipedia_maps">Baixa mapes de la Viquipèdia</string>
     <string name="plugin_wikipedia_description">Obteniu informació de punts d\'interès des la Viquipèdia. Serà la vostra guia de butxaca en desconnexió - només cal que activeu el connector Viquipèdia i fruireu dels articles que tracten de les coses que us rodegen.</string>
+    <string name="gpx_split_interval_none_descr">Seleccioneu el criteri limitant desitjat: temps o distància.</string>
+    <string name="gpx_direction_arrows">Fletxes de direcció</string>
+    <string name="track_coloring_solid">Sòlid</string>
+    <string name="plan_route_last_edited">Darrera modificació</string>
+    <string name="plan_route_import_track">Importa una traça</string>
+    <string name="plan_route_open_existing_track">Obre una traça existent</string>
+    <string name="plan_route_create_new_route">Crea una ruta nova</string>
+    <string name="plan_route_select_track_file_for_open">Seleccioneu un fitxer de traça per obrir-lo.</string>
+    <string name="shared_string_done">Fet</string>
+    <string name="overwrite_track">Substitueix la traça</string>
+    <string name="width_limit_description">Proporcioneu l\'amplada del vostre vehicle, pot haver-hi rutes restringides als vehicles amples.</string>
+    <string name="height_limit_description">Proporcioneu l\'alçada del vostre vehicle, pot haver-hi rutes restringides als vehicles alts.</string>
+    <string name="weight_limit_description">Proporcioneu el pes del vostre vehicle, pot haver-hi rutes restringides als vehicles pesants.</string>
+    <string name="add_hidden_group_info">El punt afegit no serà visible al mapa, perquè el grup seleccionat és ocult, el podeu trobar a \"%s\".</string>
+    <string name="app_mode_wheelchair">Cadira de rodes</string>
+    <string name="osm_edit_closed_note">Nota d\'OSM tancada</string>
+    <string name="set_working_days_to_continue">Heu d\'indicar els dies laborals abans de continuar</string>
+    <string name="route_between_points">Ruta entre dos punts</string>
+    <string name="plan_a_route">Planejar una ruta</string>
+    <string name="add_to_a_track">Afegir a una ruta</string>
+    <string name="track_show_start_finish_icons">Mostrar icones d\'inici final</string>
+    <string name="select_track_width">Triar amplària</string>
+    <string name="rourte_between_points_add_track_desc">Trieu un arxiu de ruta al qual s\'afegirà un nou segment.</string>
+    <string name="rourte_between_points_warning_desc">Per usar aquesta opció OsmAnd ha d\'ajustar la seua ruta a les vies del mapa.
+\n
+\nEn el pas següent cal que elegiu el perfil de navegació per detectar vies permeses i el llindar de distància per aproximar la ruta a les vies.</string>
+    <string name="rourte_between_points_desc">Trieu com connectar els punts, amb una línia recta, o calcular la ruta entre ells d\'acord amb el perfil seleccionat.</string>
+    <string name="gpx_split_interval_descr">Trieu l\'interval a què les marques de distància o temps sobre la ruta es mostraran.</string>
+    <string name="shared_string_custom">Personalitzat</string>
+    <string name="save_as_new_track">Desar com a una ruta nova</string>
+    <string name="reverse_route">Ruta inversa</string>
+    <string name="rourte_between_points_whole_track_button_desc">La ruta sencera serà recalculada fent ús del perfil seleccionat.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Només el següent segment serà recalculat fent ús del perfil seleccionat.</string>
+    <string name="whole_track">Ruta sencera</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>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -156,7 +156,7 @@
     <string name="search_position_current_location_found">Moje poloha [nalezeno]</string>
     <string name="search_position_address">Adresy…</string>
     <string name="search_position_favorites">Oblíbených…</string>
-    <string name="search_position_undefined">Nedefinováno</string>
+    <string name="shared_string_undefined">Nedefinováno</string>
     <string name="search_position_map_view">Současný střed mapy</string>
     <string name="select_search_position">Počáteční bod:</string>
     <string name="context_menu_item_search">Hledat v okolí</string>

OsmAnd/res/values-da/strings.xml

@@ -427,7 +427,7 @@
     <string name="search_position_current_location_found">Positionen (fundet)</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favoritter…</string>
-    <string name="search_position_undefined">Ikke defineret</string>
+    <string name="shared_string_undefined">Ikke defineret</string>
     <string name="search_position_map_view">Nuværende kortcenter</string>
     <string name="select_search_position">Udgangspunkt:</string>
     <string name="context_menu_item_search">Søg i nærheden</string>

OsmAnd/res/values-de/phrases.xml

@@ -1574,7 +1574,7 @@
     <string name="poi_urban">Städtisch</string>
     <string name="poi_pump_powered">Angetrieben</string>
     <string name="poi_water_characteristic_mineral">Mineral</string>
-    <string name="poi_water_characteristic_mud">Wassercharakteristik: schlammig</string>
+    <string name="poi_water_characteristic_mud">Schlamm</string>
     <string name="poi_water_characteristic_sulfuric">Schweflig</string>
     <string name="poi_water_point">Wasseranschluss</string>
     <string name="poi_payment_electronic_purses_no">Elektronische Zahlungsmittel nicht akzeptiert</string>
@@ -1852,7 +1852,7 @@
     <string name="poi_memorial_koshinto">Koshinto</string>
     <string name="poi_memorial_blue_plaque">Blaue Plakette</string>
     <string name="poi_memorial_jizo">Jizo</string>
-    <string name="poi_memorial_cross">Kreuzförmig</string>
+    <string name="poi_memorial_cross">Kreuzform</string>
     <string name="poi_memorial_vehicle">Fahrzeug</string>
     <string name="poi_memorial_stolperstein">Stolperstein</string>
     <string name="poi_memorial_obelisk">Obelisk</string>

OsmAnd/res/values-de/strings.xml

@@ -358,7 +358,7 @@
     <string name="search_position_current_location_found">Mein Standort (gefunden)</string>
     <string name="search_position_address">Adresse …</string>
     <string name="search_position_favorites">Favoriten …</string>
-    <string name="search_position_undefined">Undefiniert</string>
+    <string name="shared_string_undefined">Undefiniert</string>
     <!-- string name="search_position_current_location">Aktueller Standort…</string -->
     <string name="search_position_map_view">Aktueller Kartenmittelpunkt</string>
     <string name="select_search_position">Ausgangspunkt:</string>
@@ -3786,7 +3786,7 @@
     <string name="clear_tiles_warning">Durch die Anwendung dieser Änderungen werden die zwischengespeicherten Daten für diese Kachelquelle gelöscht</string>
     <string name="vessel_height_warning_link">Schiffshöhe einstellen</string>
     <string name="vessel_height_warning">Sie können die Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
-    <string name="vessel_height_limit_description">Stellen Sie die Schiffshöhe ein, um niedrige Brücken zu vermeiden.Denken Sie daran, wenn die Brücke beweglich ist, werden wir ihre Höhe im offenen Zustand verwenden.</string>
+    <string name="vessel_height_limit_description">Schiffshöhe einstellen, um niedrige Brücken zu vermeiden. Beachten Sie: Wenn die Brücke beweglich ist, verwendet die Berechnung ihre Höhe im geöffneten Zustand.</string>
     <string name="vessel_width_limit_description">Stellen Sie die Schiffsbreite ein, um schmale Brücken zu vermeiden</string>
     <string name="quick_action_showhide_mapillary_title">Mapillary ein-/ausblenden</string>
     <string name="quick_action_mapillary_hide">Mapillary ausblenden</string>
@@ -3845,4 +3845,15 @@
     <string name="plan_route_create_new_route">Neue Route erstellen</string>
     <string name="plan_route_select_track_file_for_open">Wählen Sie eine Trackdatei zum Öffnen aus.</string>
     <string name="shared_string_done">Fertig</string>
+    <string name="overwrite_track">Track überschreiben</string>
+    <string name="threshold_distance">Schwellenwert-Distanz</string>
+    <string name="save_as_new_track">Als neuen Track speichern</string>
+    <string name="reverse_route">Route umkehren</string>
+    <string name="rourte_between_points_whole_track_button_desc">Der gesamte Track wird mit dem ausgewählten Profil neu berechnet.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Nur das nächste Segment wird mit dem ausgewählten Profil neu berechnet.</string>
+    <string name="rourte_between_points_desc">Wählen Sie, wie Punkte mit einer geraden Linie verbunden werden sollen, oder berechnen Sie eine Route zwischen ihnen mit dem ausgewählten Profil.</string>
+    <string name="whole_track">Ganzer Track</string>
+    <string name="next_segment">Nächstes Segment</string>
+    <string name="navigation_profile">Navigationsprofil</string>
+    <string name="rourte_between_points_add_track_desc">Wählen Sie eine Trackdatei, für die ein neues Segment hinzugefügt werden soll.</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -356,7 +356,7 @@
     <string name="search_position_current_location_found">Η θέση μου (βρέθηκε)</string>
     <string name="search_position_address">Διεύθυνση…</string>
     <string name="search_position_favorites">Αγαπημένα…</string>
-    <string name="search_position_undefined">Ακαθόριστο</string>
+    <string name="shared_string_undefined">Ακαθόριστο</string>
     <string name="search_position_map_view">Τρέχον κέντρο χάρτη</string>
     <string name="select_search_position">Πηγή:</string>
     <string name="context_menu_item_search">Αναζήτηση κοντινών αποστάσεων</string>
@@ -3526,4 +3526,214 @@
 \nΕπιλέξτε μια ενέργεια.</string>
     <string name="import_duplicates_title">Μερικά αντικείμενα υπάρχουν ήδη</string>
     <string name="select_data_to_import">Επιλέξτε τα δεδομένα για εισαγωγή.</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_disabled">Απενεργοποιημένο. Απαιτεί \'Διατήρηση αναμμένης οθόνης\' στο \'Λήξη χρόνου μετά την έναρξη\'.</string>
+    <string name="turn_screen_on_power_button_descr">Πατώντας το πλήκτρο ισχύος της συσκευής θα ενεργοποιήσει την οθόνη με το OsmAnd στην κορυφή της οθόνης κλειδώματος.</string>
+    <string name="turn_screen_on_power_button">Πλήκτρο ισχύος</string>
+    <string name="turn_screen_on_proximity_sensor">Ανιχνευτής εγγύτητας</string>
+    <string name="turn_screen_on_wake_time_descr">Επιλέξτε το χρονικό όριο της οθόνης μετά την έναρξη. (το \"%1$s\" δεν εφαρμόζει χρονικό όριο.)</string>
+    <string name="keep_screen_on">Διατήρηση αναμμένης οθόνης</string>
+    <string name="keep_screen_off">Διατήρηση σβηστής οθόνης</string>
+    <string name="pseudo_mercator_projection">Ψευδομερκατορική προβολή</string>
+    <string name="one_image_per_tile">Ένα αρχείο εικόνας ανά πλακίδιο</string>
+    <string name="sqlite_db_file">Αρχείο SQLiteDB</string>
+    <string name="online_map_name_helper_text">Ονομάστε τον διαδικτυακό πηγαίο χάρτη.</string>
+    <string name="online_map_url_helper_text">Εισάγετε ή επικολλήστε το URL για τη διαδικτυακή πηγή.</string>
+    <string name="edit_online_source">Επεξεργασία διαδικτυακής πηγής</string>
+    <string name="expire_time">Χρόνος λήξης</string>
+    <string name="mercator_projection">Μερκατορική προβολή</string>
+    <string name="storage_format">Μορφή αποθήκευσης</string>
+    <string name="map_source_zoom_levels">Ορίστε ελάχιστο και μέγιστο επίπεδο εστίασης για να εμφανίσετε ή να φορτώσετε τον διαδικτυακό χάρτη.</string>
+    <string name="map_source_zoom_levels_descr">Επηρεάζει την οθόνη όταν χρησιμοποιείται ως χάρτης ή επικάλυψη/υπόστρωμα.
+\n
+\n%1$s: Ο χάρτης περιορίζεται στην επιλεγμένη περιοχή επιπέδου εστίασης.
+\n
+\n%2$s είναι τα επίπεδα στα οποία τα αρχικά πλακίδια θα είναι ορατά, κλιμάκωση προς τα πάνω ή τα κάτω θα συμβεί εκτός αυτών των τιμών.</string>
+    <string name="expire_time_descr">Τα πλακίδια κρυφής μνήμης θα επαναφορτωθούν μετά τον καθορισμένο αριθμό λεπτών. Αφήστε αυτό το πεδίο κενό για να μην ανανεώνετε ποτέ πλακίδια από αυτήν την πηγή.
+\n
+\nΜία μέρα είναι 1440 λεπτά.
+\nΜία εβδομάδα είναι 10 080 λεπτά.
+\nΈνας μήνας είναι 43 829 λεπτά.</string>
+    <string name="tiles_storage_descr">Επιλέξτε πώς θα αποθηκεύσετε τα μεταφορτωνόμενα πλακίδια.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Μπορείτε να εξάγετε ή να εισάγετε γρήγορες ενέργειες με κατατομές (προφίλ) εφαρμογών.</string>
+    <string name="shared_string_delete_all_q">Να διαγραφούν όλα;</string>
+    <string name="delete_all_actions_message_q">Είσαστε σίγουροι ότι θέλετε να διαγράψετε οριστικά %d γρήγορες ενέργειες;</string>
+    <string name="screen_timeout">Χρόνος καθυστέρησης οθόνης</string>
+    <string name="uninstall_speed_cameras">Απεγκατάσταση καμερών ταχύτητας</string>
+    <string name="shared_string_legal">Νομικά</string>
+    <string name="speed_camera_pois">Κάμερα ταχύτητας Σ.Ε.</string>
+    <string name="speed_cameras_legal_descr">Σε κάποιες χώρες ή περιοχές, η χρήση εφαρμογών προειδοποίησης κάμερας ασφαλείας απαγορεύεται από τον νόμο.
+\n
+\nΧρειάζεται να κάνετε μια επιλογή ανάλογα με τον νόμο της χώρας σας.
+\n
+\nΕπιλέξτε %1$s και θα πάρετε προειδοποιήσεις για τις κάμερες ασφαλείας.
+\n
+\nΕπιλέξτε %2$s. Όλα τα δεδομένα που σχετίζονται με κάμερες ταχύτητας: προειδοποιήσεις, ανακοινώσεις, Σ.Ε. θα διαγραφούν μέχρι να επανεγκατασταθεί πλήρως το OsmAnd.</string>
+    <string name="keep_active">Διατήρηση ενεργότητας</string>
+    <string name="shared_string_uninstall">Απεγκατάσταση</string>
+    <string name="speed_cameras_alert">Οι προειδοποιήσεις καμερών ταχύτητας απαγορεύονται από τον νόμο σε κάποιες χώρες.</string>
+    <string name="screen_timeout_descr">Εάν το \"%1$s\" είναι ενεργό, ο χρόνος δραστηριότητας θα εξαρτάται από αυτό.</string>
+    <string name="default_screen_timeout">Προεπιλεγμένος χρόνος αναμονής οθόνης</string>
+    <string name="shared_string_tones">τόνοι</string>
+    <string name="shared_string_meters">Μέτρα</string>
+    <string name="details_dialog_decr">Εμφάνιση ή απόκρυψη πρόσθετων λεπτομερειών χάρτη</string>
+    <string name="shared_string_night_map">Χάρτης νύχτας</string>
+    <string name="add_online_source">Προσθήκη διαδικτυακής πηγής</string>
+    <string name="clear_tiles_warning">Η εφαρμογή αυτών των αλλαγών θα καθαρίσει τα κρυμμένα δεδομένα της πηγής πλακιδίου</string>
+    <string name="vessel_height_warning_link">Ορισμός ύψους σκάφους</string>
+    <string name="vessel_height_warning">Μπορείτε να ορίσετε ύψος σκάφους για να αποφύγετε χαμηλές γέφυρες. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της ανοικτής κατάστασης.</string>
+    <string name="vessel_height_limit_description">Ορίστε ύψος σκάφος για αποφυγή χαμηλών γεφυρών. Σημειώστε ότι εάν η γέφυρα είναι κινητή, θα χρησιμοποιηθεί το ύψος της στην ανοικτή κατάσταση.</string>
+    <string name="vessel_width_limit_description">Ορίστε πλάτος σκάφους για αποφυγή στενών γεφυρών</string>
+    <string name="quick_action_showhide_mapillary_title">Εμφάνιση/Απόκρυψη Mapillary</string>
+    <string name="quick_action_mapillary_hide">Απόκρυψη Mapillary</string>
+    <string name="quick_action_mapillary_show">Εμφάνιση Mapillary</string>
+    <string name="quick_action_showhide_mapillary_descr">Εναλλαγή εμφάνισης ή απόκρυψης της στρώσης Mapillary του χάρτη.</string>
+    <string name="routing_attr_length_description">Καθορίστε μήκος οχήματος που επιτρέπεται στους δρόμους.</string>
+    <string name="routing_attr_length_name">Όριο μήκους</string>
+    <string name="shared_string_bearing">Κατεύθυνση</string>
+    <string name="item_deleted">%1$s διαγράφτηκε</string>
+    <string name="speed_cameras_restart_descr">Απαιτείται επανεκκίνηση για την πλήρη διαγραφή δεδομένων της κάμερας ταχύτητας.</string>
+    <string name="shared_string_uninstall_and_restart">Απεγκατάσταση και επανεκκίνηση</string>
+    <string name="speed_cameras_removed_descr">Αυτή η συσκευή δεν έχει κάμερες ταχύτητας.</string>
+    <string name="app_mode_inline_skates">Πατίνια μονής γραμμής</string>
+    <string name="quick_action_remove_next_destination">Διαγραφή του επόμενου σημείου προορισμού</string>
+    <string name="use_volume_buttons_as_zoom_descr">Ενεργοποιήστε για να ελέγχετε το επίπεδο εστίασης του χάρτη με τα πλήκτρα έντασης της συσκευής.</string>
+    <string name="use_volume_buttons_as_zoom">Τα πλήκτρα έντασης ως εστίαση</string>
+    <string name="please_provide_point_name_error">Παρακαλούμε, ονομάστε το σημείο</string>
+    <string name="quick_action_remove_next_destination_descr">Το τρέχον σημείο προορισμού στη διαδρομή θα διαγραφεί. Εάν είναι ο προορισμός, θα σταματήσει η πλοήγηση.</string>
+    <string name="search_download_wikipedia_maps">Κατεβάστε τους χάρτες της βικιπαιδείας</string>
+    <string name="plugin_wikipedia_description">Πάρτε πληροφορίες για τα σημεία ενδιαφέροντος από τη βικιπαίδεια. Είναι ο οδηγός τσέπης χωρίς σύνδεση - ενεργοποιήστε απλά το πρόσθετο Wikipedia και απολαύστε άρθρα για τα αντικείμενα γύρω σας.</string>
+    <string name="add_hidden_group_info">Το σημείο που προστέθηκε δεν θα είναι ορατό στον κατάλογο, επειδή η επιλεγμένη ομάδα είναι κρυμμένη, μπορείτε να το βρείτε στο \"%s\".</string>
+    <string name="app_mode_enduro_motorcycle">Εντούρο</string>
+    <string name="app_mode_motor_scooter">Σκούτερ</string>
+    <string name="app_mode_wheelchair">Αμαξίδιο</string>
+    <string name="app_mode_wheelchair_forward">Αμαξίδιο προς τα μπροστά</string>
+    <string name="app_mode_go_cart">Καρτ</string>
+    <string name="osm_edit_closed_note">Κλεισμένη σημείωση OSM</string>
+    <string name="set_working_days_to_continue">Χρειάζεται να ορίσετε ημέρες εργασίας για να συνεχίσετε</string>
+    <string name="route_between_points">Διαδρομή μεταξύ σημείων</string>
+    <string name="plan_a_route">Σχεδιασμός διαδρομής</string>
+    <string name="add_to_a_track">Προσθήκη σε ίχνος</string>
+    <string name="track_show_start_finish_icons">Να εμφανίζονται εικονίδια αρχής τέλους</string>
+    <string name="select_track_width">Επιλέξτε πλάτος</string>
+    <string name="gpx_split_interval_descr">Επιλέξτε το διάστημα στο οποίο θα εμφανίζονται σημάδια με απόσταση ή χρόνο στο ίχνος.</string>
+    <string name="gpx_split_interval_none_descr">Επιλέξτε την επιθυμητή επιλογή διαίρεσης: κατά χρόνο ή απόσταση.</string>
+    <string name="shared_string_custom">Προσαρμοσμένο</string>
+    <string name="gpx_direction_arrows">Βέλη κατεύθυνσης</string>
+    <string name="track_coloring_solid">Συμπαγές</string>
+    <string name="plan_route_last_edited">Τελευταία επεξεργασμένο</string>
+    <string name="plan_route_import_track">Εισαγωγή ίχνους</string>
+    <string name="plan_route_open_existing_track">Ανοίξτε υφιστάμενο ίχνος</string>
+    <string name="plan_route_select_track_file_for_open">Επιλέξτε ένα αρχείο ίχνους για να ανοίξετε.</string>
+    <string name="plan_route_create_new_route">Δημιουργία νέας διαδρομής</string>
+    <string name="shared_string_done">Έτοιμο</string>
+    <string name="overwrite_track">Αντικατάσταση διαδρομής</string>
+    <string name="lang_sco">Σκωτσέζικα</string>
+    <string name="lang_scn">Σικελικά</string>
+    <string name="lang_pnb">Πουντζάμπι</string>
+    <string name="lang_ne">Νεπαλέζικα</string>
+    <string name="lang_nap">Ναπολιτάνικα</string>
+    <string name="lang_my">Βιρμανικά</string>
+    <string name="lang_mn">Μογγολικά</string>
+    <string name="lang_min">Μινανγκκαμπάου</string>
+    <string name="lang_mg">Μαλαγασικά</string>
+    <string name="lang_ky">Κυργικά</string>
+    <string name="lang_kk">Καζάκικα</string>
+    <string name="lang_jv">Ιαβανέζικα</string>
+    <string name="lang_gu">Γκουτζαρατικά</string>
+    <string name="lang_cv">Τσουβασικά</string>
+    <string name="lang_ce">Τσετσενικά</string>
+    <string name="lang_bar">Βαυαρικά</string>
+    <string name="lang_ba">Μπασκίρ</string>
+    <string name="lang_an">Αραγονέζικα</string>
+    <string name="lang_lmo">Λομβαρδικά</string>
+    <string name="custom_color">Προσαρμοσμένο χρώμα</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">Η πληρωμή θα χρεωθεί στον λογαριασμό σας Google Play με την επιβεβαίωση αγοράς.
+\n
+\n Η συνδρομή ανανεώνεται αυτόματα, εκτός και ακυρωθεί πριν την ημερομηνία ανανέωσης. Ο λογαριασμός σας θα χρεωθεί για την περίοδο ανανέωσης (μήνας/τρίμηνο/έτος) μόνο την ημερομηνία ανανέωσης.
+\n
+\n Μπορείτε να διαχειριστείτε και να ακυρώσετε τις συνδρομές σας πηγαίνοντας στις ρυθμίσεις σας στο Google Play.</string>
+    <string name="search_poi_types">Αναζήτηση τύπων ΣΕ</string>
+    <string name="search_poi_types_descr">Συνδυάστε τύπους ΣΕ από διαφορετικές κατηγορίες. Πατήστε τον διακόπτη για να τα επιλέξετε όλα, πατήστε στην αριστερή πλευρά για επιλογή κατηγορίας.</string>
+    <string name="extra_maps_menu_group">Πρόσθετοι χάρτες</string>
+    <string name="download_unsupported_action">Μη υποστηριζόμενη ενέργεια %1$s</string>
+    <string name="tracker_item">OsmAnd tracker (Ιχνηλάτης OsmAnd)</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Γρήγορη ενέργεια</string>
+    <string name="measure_distance_item">Μέτρηση απόστασης</string>
+    <string name="travel_item">Ταξίδια (Βικιταξίδια και βικιπαίδεια)</string>
+    <string name="map_markers_item">Δείκτες χάρτη</string>
+    <string name="favorites_item">Αγαπημένα</string>
+    <string name="subscription_osmandlive_item">Συνδρομή - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Αγορές OsmAnd</string>
+    <string name="legend_item_description">Ο οδηγός στα σύμβολα χάρτη.</string>
+    <string name="navigation_profiles_item">Κατατομές (προφίλ) πλοήγησης</string>
+    <string name="release_3_7">• Νέοι χάρτες κλίσεων χωρίς σύνδεση
+\n
+\n • Πλήρης προσαρμογή των αγαπημένων και σημείων διαδρομής GPX – προσαρμοσμένα χρώματα, εικονίδια, σχήματα
+\n
+\n • Προσαρμογή σειράς στοιχείων στο \"μενού περιβάλλοντος\", στον \"χάρτη διαμόρφωσης\" και στον \"σχεδιαστή\"
+\n
+\n • Η βικιπαίδεια ως ξεχωριστή στρώση στον χάρτη διαμόρφωσης, επιλέξτε μόνο τις απαιτούμενες γλώσσες
+\n
+\n • Δημιουργία του δικού σας φίλτρου ΣΕ / χαρτών με πλήρη ευελιξία
+\n
+\n • Προστέθηκαν επιλογές επαναφοράς ρυθμίσεων προσαρμοσμένων κατατομών (προφίλ)
+\n
+\n • Πλήρεις διαδρομές GPX από γραμμές κυκλοφοριακής υποστήριξης πλοήγησης και πλήρεις οδηγίες στροφών
+\n
+\n • Διόρθωση μεγεθών UI σε ταμπλέτες
+\n
+\n • Διόρθωση σφαλμάτων με RTL
+\n
+\n</string>
+    <string name="quick_action_transport_hide">Απόκρυψη δημόσιων συγκοινωνιών</string>
+    <string name="quick_action_transport_show">Εμφάνιση δημόσιων συγκοινωνιών</string>
+    <string name="quick_action_show_hide_transport">Εμφάνιση/απόκρυψη δημόσιων συγκοινωνιών</string>
+    <string name="quick_action_transport_descr">Πλήκτρο εμφάνισης ή απόκρυψης δημόσιων συγκοινωνιών στον χάρτη.</string>
+    <string name="create_edit_poi">Δημιουργία / Επεξεργασία ΣΕ</string>
+    <string name="parking_positions">Θέσεις στάθμευσης</string>
+    <string name="add_edit_favorite">Προσθήκη / Επεξεργασία αγαπημένου</string>
+    <string name="reset_deafult_order">Επαναφορά της προεπιλεγμένης σειράς στοιχείων</string>
+    <string name="back_to_editing">Πίσω στην επεξεργασία</string>
+    <string name="quick_action_switch_profile_descr">Το πλήκτρο ενέργειας εναλλάσσει μεταξύ των επιλεγμένων κατατομών (προφίλ).</string>
+    <string name="shared_string_add_profile">Προσθήκη κατατομής (προφίλ)</string>
+    <string name="change_application_profile">Αλλαγή κατατομής (προφίλ) εφαρμογής</string>
+    <string name="profiles_for_action_not_found">Αδυναμία εύρεσης τέτοιων κατατομών (προφίλ).</string>
+    <string name="index_item_world_basemap_detailed">Παγκόσμιος χάρτης προεπισκόπησης (λεπτομερής)</string>
+    <string name="unsupported_type_error">Μη υποστηριζόμενος τύπος</string>
+    <string name="width_limit_description">Δώστε το πλάτος του οχήματός σας, κάποιοι περιορισμοί μπορεί να εφαρμόζονται για πλατιά οχήματα.</string>
+    <string name="height_limit_description">Δώστε το ύψος του οχήματός σας, κάποιοι περιορισμοί διαδρομής μπορεί να εφαρμόζονται για υψηλά οχήματα.</string>
+    <string name="weight_limit_description">Δώστε το βάρος του οχήματός σας, κάποιοι περιορισμοί διαδρομής μπορεί να εφαρμόζονται για βαριά οχήματα.</string>
+    <string name="lenght_limit_description">Δώστε το μήκος του οχήματός σας, κάποιοι περιορισμοί διαδρομών μπορεί να εφαρμόζονται για μεγάλα οχήματα.</string>
+    <string name="gpx_parse_error">Το GPX OsmAnd δεν είναι σωστά σχηματισμένο, επικοινωνήστε με την ομάδα υποστήριξης για παραπέρα διερεύνηση.</string>
+    <string name="shared_string_always">Πάντοτε</string>
+    <string name="screen_control">Στοιχείο ελέγχου συστήματος</string>
+    <string name="system_screen_timeout_descr">Απενεργοποιεί την οθόνη όπως ο χρόνος αναμονής οθόνης του συστήματος.</string>
+    <string name="system_screen_timeout">Χρήση του χρόνου αναμονής οθόνης του συστήματος</string>
+    <string name="turn_screen_on_descr">Σημειώστε τις επιλογές αφύπνισης της οθόνης (εξασφαλίστε ότι το OsmAnd είναι στο προσκήνιο όταν η συσκευή κλειδώνεται):</string>
+    <string name="save_as_new_track">Αποθήκευση ως νέου ίχνους</string>
+    <string name="reverse_route">Αντιστροφή διαδρομής</string>
+    <string name="rourte_between_points_whole_track_button_desc">Ολόκληρο το ίχνος θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="rourte_between_points_next_segment_button_desc">Μόνο το επόμενο τμήμα θα επανυπολογιστεί χρησιμοποιώντας την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="rourte_between_points_desc">Επιλέξτε πώς να συνδέσετε τα σημεία, με ευθεία γραμμή, ή να υπολογίσετε μια διαδρομή μεταξύ τους με την επιλεγμένη κατατομή (προφίλ).</string>
+    <string name="rourte_between_points_warning_desc">Για να χρησιμοποιήσετε αυτήν την επιλογή το OsmAnd χρειάζεται να προσκολλήσει το ίχνος σας στους δρόμους του χάρτη.
+\n
+\nΣτο επόμενο βήμα θα χρειαστείτε να επιλέξετε κατατομή (προφίλ) πλοήγησης για να εντοπίσετε τους επιτρεπόμενους δρόμους και την απόσταση κατωφλίου για να προσεγγίσετε το ίχνος σας με τους δρόμους.</string>
+    <string name="whole_track">Ολόκληρο το ίχνος</string>
+    <string name="next_segment">Επόμενο τμήμα</string>
+    <string name="threshold_distance">Απόσταση κατωφλίου</string>
+    <string name="navigation_profile">Κατατομή (προφίλ) πλοήγησης</string>
+    <string name="rourte_between_points_add_track_desc">Επιλέξτε ένα αρχείο ίχνους στο οποίο θα προστεθεί νέο τμήμα.</string>
+    <string name="lang_tg">Τατζίκικα</string>
+    <string name="some_articles_may_not_available_in_lang">Μερικά άρθρα της Wikipedia μπορεί να μην είναι διαθέσιμα στη γλώσσα σας.</string>
+    <string name="lang_zhyue">Καντονέζικα</string>
+    <string name="lang_zhminnan">Νότια μιν</string>
+    <string name="lang_yo">Γιορούμπα</string>
+    <string name="lang_war">Ουαράι</string>
+    <string name="lang_uz">Ουζμπέκικα</string>
+    <string name="lang_ur">Ουρντού</string>
+    <string name="lang_tt">Ταταρικά</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -580,7 +580,7 @@
     <string name="traffic_warning_border_control">Landlima kontrolado</string>
     <string name="traffic_warning_payment">Vojpagejo</string>
     <string name="traffic_warning_stop">Stop\' signo</string>
-    <string name="traffic_warning_calming">Trafik-trankviligejo</string>
+    <string name="traffic_warning_calming">Trafik-trankviligilo</string>
     <string name="traffic_warning_speed_camera">Rapid-kontrolilo</string>
     <string name="traffic_warning">Trafika averto</string>
     <string name="speak_poi">Proksimaj interesejoj</string>
@@ -1376,7 +1376,7 @@
     <string name="search_position_current_location_found">Mia pozicio (determinita)</string>
     <string name="search_position_address">Adreso…</string>
     <string name="search_position_favorites">Ŝatataj…</string>
-    <string name="search_position_undefined">Nedifinita</string>
+    <string name="shared_string_undefined">Nedifinita</string>
     <string name="search_position_map_view">Nuna map-centro</string>
     <string name="select_search_position">El:</string>
     <string name="context_menu_item_search">Serĉi proksime</string>
@@ -2488,7 +2488,7 @@
     <string name="shared_string_options">Agordoj</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd kunigos punktojn al vojojn ĉe la elektita profilo.</string>
     <string name="measurement_tool_save_as_new_track_descr">Konservi punktojn kiel kurspunktojn aŭ linion.</string>
-    <string name="choose_navigation_type">Elektu profilon de navigado</string>
+    <string name="choose_navigation_type">Elektu profilon de navigo</string>
     <string name="add_route_points">Aldoni kurspunktojn</string>
     <string name="add_line">Aldoni linion</string>
     <string name="empty_state_my_tracks">Aldoni GPX-dosierojn</string>
@@ -3081,7 +3081,7 @@
     <string name="profile_alert_delete_msg">Ĉu vi certe volas forigi la profilon “%s”\?</string>
     <string name="select_base_profile_dialog_title">Elektu komencan profilon</string>
     <string name="select_base_profile_dialog_message">Via propra profilo estos bazita sur iu implicita aplikaĵa profilo, kiu difinos bazajn agordojn kiel videblon de fenestraĵoj, unuojn de rapido kaj distanco. Jen implicitaj profiloj kaj ekzemplaj profiloj por krei:</string>
-    <string name="select_nav_profile_dialog_title">Elektu navigadan profilon</string>
+    <string name="select_nav_profile_dialog_title">Elektu profilon de navigo</string>
     <string name="base_profile_descr_car">Aŭto, kamiono, motorciklo</string>
     <string name="base_profile_descr_bicycle">Biciklo, motorbiciklo, ĉevalo</string>
     <string name="base_profile_descr_pedestrian">Promenado, marŝado, kurado</string>
@@ -3838,4 +3838,18 @@
     <string name="plan_route_create_new_route">Krei novan kurson</string>
     <string name="plan_route_select_track_file_for_open">Elekti dosieron de spuro por malfermi.</string>
     <string name="shared_string_done">Farita</string>
+    <string name="overwrite_track">Superskribi kurson</string>
+    <string name="save_as_new_track">Konservi kiel novan spuron</string>
+    <string name="reverse_route">Inversigi kurson</string>
+    <string name="rourte_between_points_whole_track_button_desc">Tuta kurso estos rekalkulita uzante la elektitan profilon.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Nur sekva segmento estos rekalkulita uzante la elektitan profilon.</string>
+    <string name="rourte_between_points_desc">Elektu kiel konekti punktojn: ĉu per rekta linio, ĉu kalkuli kurson inter ilin uzante la elektitan profilon.</string>
+    <string name="whole_track">Tuta kurso</string>
+    <string name="next_segment">Sekva segmento</string>
+    <string name="rourte_between_points_warning_desc">Por uzi tiun ĉi agordon, OsmAnd postulas ĝustigi vian kurson al vojoj sur la mapo.
+\n
+\n Sekve vi devos elekti profilon de navigo (por trovi permesatajn vojojn) kaj sojlan distancon (por alproksimigi vian kurson al vojoj).</string>
+    <string name="threshold_distance">Sojla distanco</string>
+    <string name="navigation_profile">Profilo de navigo</string>
+    <string name="rourte_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
 </resources>

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

@@ -1085,7 +1085,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>
@@ -3837,4 +3837,24 @@
     <string name="shared_string_custom">Personalizado</string>
     <string name="gpx_direction_arrows">Flechas de dirección</string>
     <string name="track_coloring_solid">Sólido</string>
+    <string name="plan_route_last_edited">Última edición</string>
+    <string name="plan_route_import_track">Importar traza</string>
+    <string name="plan_route_open_existing_track">Abrir traza existente</string>
+    <string name="plan_route_create_new_route">Crear nueva ruta</string>
+    <string name="plan_route_select_track_file_for_open">Marca un archivo de traza para abrir.</string>
+    <string name="shared_string_done">Hecho</string>
+    <string name="overwrite_track">Sobrescribir traza</string>
+    <string name="save_as_new_track">Guardar como nueva traza</string>
+    <string name="reverse_route">Ruta inversa</string>
+    <string name="rourte_between_points_next_segment_button_desc">Recalcular sólo el siguiente segmento usando el perfil elegido.</string>
+    <string name="rourte_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
+    <string name="rourte_between_points_desc">Marca cómo conectar los puntos, con una línea recta o calcular una ruta entre ellos con el perfil elegido.</string>
+    <string name="whole_track">Traza completa</string>
+    <string name="next_segment">Siguiente segmento</string>
+    <string name="rourte_between_points_warning_desc">Para utilizar esta opción, OsmAnd debe ajustar su traza a los caminos del mapa.
+\n
+\n En el siguiente paso se debe elegir el perfil de navegación para detectar los caminos permitidos y el umbral de distancia para aproximar la traza a los caminos.</string>
+    <string name="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>
 </resources>

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

@@ -1085,7 +1085,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>

OsmAnd/res/values-es/strings.xml

@@ -107,7 +107,7 @@
     <string name="search_position_current_location_found">Mi ubicación (encontrada)</string>
     <string name="search_position_address">Dirección…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Vista actual del mapa</string>
     <string name="select_search_position">Origen:</string>
     <string name="context_menu_item_search">Buscar cerca</string>

OsmAnd/res/values-et/strings.xml

@@ -7,7 +7,7 @@
     <string name="shared_string_skip">Jäta vahele</string>
     <string name="poi_action_add">lisa</string>
     <string name="shared_string_message">Sõnum</string>
-    <string name="agps_data_last_downloaded">A-GPS andmed alla laetud: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS andmed on allalaetud: %1$s</string>
     <string name="welmode_download_maps">Kaartide allalaadimine</string>
     <string name="welcome_header">Tere tulemast</string>
     <string name="mark_to_delete">Märgi kustutamiseks</string>
@@ -160,15 +160,16 @@
     <string name="mapillary_menu_title_dates">Kuupäev</string>
     <string name="mapillary_menu_edit_text_hint">Sisesta kasutajatunnus</string>
     <string name="mapillary_menu_title_username">Kasutajatunnus</string>
-    <string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary rakendus sellesse asukohta kaardil ühe või enama pildi lisamiseks.</string>
+    <string name="improve_coverage_install_mapillary_desc">Paigalda Mapillary piltide lisamiseks sellesse asukohta kaardil.</string>
     <string name="no_photos_descr">Siin puuduvad fotod.</string>
     <string name="restart_search">Taaskäivita otsing</string>
     <string name="quick_action_showhide_osmbugs_title">Lülita OSM märkmed sisse või välja</string>
-    <string name="quick_action_osmbugs_show">Näita OSM Notes</string>
+    <string name="quick_action_osmbugs_show">Näita OSM märkmed</string>
     <string name="quick_action_osmbugs_hide">Peida OSM Notes</string>
     <string name="thank_you_for_feedback">Täname sind tagasiside eest</string>
     <string name="poi_cannot_be_found">Punkti või teed ei leitud.</string>
-    <string name="search_no_results_feedback">Otsingutulemused puuduvad\? Anna tagasisidet</string>
+    <string name="search_no_results_feedback">Otsingutulemused puuduvad\?
+\nJaga tagasisidet</string>
     <string name="increase_search_radius_to">Laienda otsingu raadiust kuni %1$s</string>
     <string name="send_search_query">Saada otsingu päring?</string>
     <string name="shared_string_world">Maailm</string>
@@ -291,8 +292,8 @@
     <string name="quick_action_replace_destination">Asenda sihtkoht</string>
     <string name="quick_action_add_first_intermediate">Lisa esimene vahepealne</string>
     <string name="quick_action_auto_zoom">Automaatne kaardi suurendamine sisse/välja</string>
-    <string name="quick_action_auto_zoom_on">Luba kaardi automaatne suurendamine</string>
-    <string name="quick_action_auto_zoom_off">Keela kaardi automaatne suurendamine</string>
+    <string name="quick_action_auto_zoom_on">Lülita kaardi automaatne suumimine sisse</string>
+    <string name="quick_action_auto_zoom_off">Lülita kaardi automaatne suumimine välja</string>
     <string name="type_city_town">Kirjuta linn/maakond</string>
     <string name="type_postcode">Kirjuta postiindeks</string>
     <string name="nearest_cities">Lähimad linnad</string>
@@ -326,7 +327,7 @@
     <string name="map_widget_ruler_control">Raadiuse joonlaud</string>
     <string name="quick_action_resume_pause_navigation">Peata/jätka navigeerimist</string>
     <string name="quick_action_start_stop_navigation">Käivita/lõpeta navigeerimine</string>
-    <string name="quick_action_start_stop_navigation_descr">Vajuta seda nuppu navigeerimise alustamiseks või lõpetamiseks.</string>
+    <string name="quick_action_start_stop_navigation_descr">Navigeerimise alustamise või lõpetamise nupp.</string>
     <string name="measurement_tool">Mõõda vahemaa</string>
     <string name="measurement_tool_action_bar">Sirvi kaarti ja lisa punkte</string>
     <string name="none_point_error">Palun lisa vähemalt üks punkt.</string>
@@ -349,7 +350,7 @@
     <string name="keep_showing_on_map">Jätka kaardil kuvamist</string>
     <string name="exit_without_saving">Välju ilma salvestamata\?</string>
     <string name="do_not_use_animations">Animatsioonideta</string>
-    <string name="do_not_use_animations_descr">Keelab animatsioonid rakenduses.</string>
+    <string name="do_not_use_animations_descr">Lülitab kaardianimatsioonid välja.</string>
     <string name="move_all_to_history">Teisalda kõik ajalukku</string>
     <string name="sort_by">Sorteerimisalus</string>
     <string name="map_orientation_change_in_accordance_with_speed">Kaardi orientatsiooni lävi</string>
@@ -420,7 +421,7 @@
     <string name="shared_string_two">Kaks</string>
     <string name="shared_string_one">Üks</string>
     <string name="distance_indication_descr">Vali, kuidas kuvada kaugus aktiivsete markeriteni.</string>
-    <string name="active_markers_descr">Määra suunaviitade arv:</string>
+    <string name="active_markers_descr">Määra suunaviitade arv.</string>
     <string name="favourites_group">Lemmikute kategooria</string>
     <string name="add_group">Lisa grupp</string>
     <string name="empty_state_markers_active">Loo kaardimarkereid!</string>
@@ -461,7 +462,7 @@
     <string name="will_open_tomorrow_at">Avaneb homme kell</string>
     <string name="show_closed_notes">Kuva suletud teated</string>
     <string name="switch_osm_notes_visibility_desc">Kuva/peida OSM teated kaardil.</string>
-    <string name="osc_file_desc">OSC - sobib OpenStreetMap-i viimiseks.</string>
+    <string name="osc_file_desc">OSC - sobib andmete laadimiseks OpenStreetMap\'i andmebaasi.</string>
     <string name="osc_file">OSC fail</string>
     <string name="choose_file_type">Vali faililiik</string>
     <string name="all_data">Kõik andmed</string>
@@ -604,7 +605,7 @@
     <string name="exit_at">Välju</string>
     <string name="sit_on_the_stop">Sisene peatuses</string>
     <string name="quick_action_show_hide_gpx_tracks">Kuva/peida GPX rajad</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Lüliti valitud GPX radade kaardil kuvamisekks või peitmiseks.</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Nupp valitud GPX radade kaardil kuvamiseks või peitmiseks.</string>
     <string name="quick_action_gpx_tracks_hide">Peida GPX rajad</string>
     <string name="quick_action_gpx_tracks_show">Kuva GPX rajad</string>
     <string name="add_destination_query">Palun määra esmalt sihtkoht</string>
@@ -658,7 +659,7 @@
     <string name="rendering_attr_highway_class_cycleway_name">Jalgrattatee</string>
     <string name="rendering_attr_undefined_name">Määratlemata</string>
     <string name="public_transport_warning_descr_blog">OsmAnd teekonna arvutamise kohta loe lähemalt meie blogist.</string>
-    <string name="public_transport_warning_title">Ühistranspordiga navigeerimine on praegu beeta testimisel, arvesta vigade ja ebatäpsusega.</string>
+    <string name="public_transport_warning_title">Ühistranspordiga liikumine on praegu beetatestimisel, arvesta vigade ja ebatäpsusega.</string>
     <string name="add_intermediate">Lisa vahepunkt</string>
     <string name="shared_string_walk">Kõndimine</string>
     <string name="save_poi_value_exceed_length">Lühenda \"%s\" sildi pikkust vähemale kui 255 tähemärgile.</string>
@@ -749,7 +750,7 @@
     <string name="base_profile_descr_car">Auto, veoauto, mootorratas</string>
     <string name="base_profile_descr_bicycle">Maastikuratas, mopeed, hobune</string>
     <string name="base_profile_descr_pedestrian">Kõndimine, matkamine, jooksmine</string>
-    <string name="base_profile_descr_public_transport">Kõik ühistranspordi liigid</string>
+    <string name="base_profile_descr_public_transport">Ühistranspordi liigid</string>
     <string name="base_profile_descr_boat">Laev, sõudmine, purjetamine</string>
     <string name="base_profile_descr_aircraft">Lennuk, purilend</string>
     <string name="routing_profile_geocoding">Geokoodeerimine</string>
@@ -771,7 +772,7 @@
     <string name="default_speed_setting_title">Vaikimisi kiirus</string>
     <string name="default_speed_setting_descr">Muuda vaikimisi kiiruse seadeid</string>
     <string name="minmax_speed_dialog_title">Määra vähim/suurim kiirus</string>
-    <string name="default_speed_dialog_msg">Kasutusel kohale jõudmise aja hindamiseks tundmatute teede korral ja kiiruse piiramiseks kõikidel teedel (võib muuta teekonda)</string>
+    <string name="default_speed_dialog_msg">Hindab saabumisaega tundmatute teede korral ja kiirusepiiranguid kõikidel teedel (võib muuta teekonda)</string>
     <string name="new_profile">Uus profiil</string>
     <string name="shared_string_crash">Kokkujooksmine</string>
     <string name="last_launch_crashed">OsmAnd jooksis viimati kasutades kokku. Palun aita meil veateadet jagades OsmAnd rakendust parandada.</string>
@@ -809,7 +810,7 @@
     <string name="edit_profile_screen_options_subtitle">Vali profiili ekraaniseadistused</string>
     <string name="edit_profile_nav_settings_subtitle">Vali profiili navigeerimisseadistused</string>
     <string name="routing_attr_max_num_changes_description">Määra muudatuste ülemine piir</string>
-    <string name="routing_attr_max_num_changes_name">Muudatuste arv</string>
+    <string name="routing_attr_max_num_changes_name">Ümberistumiste arv</string>
     <string name="turn_screen_on_router">Ärka pöördel</string>
     <string name="turn_screen_on_time_descr">Reguleeri kui kaua ekraan peaks olema sisse lülitatud.</string>
     <string name="turn_screen_on_sensor">Kasuta lähedusandurit</string>
@@ -879,7 +880,7 @@
     <string name="apply_to_all_profiles">Rakenda kõikidele profiilidele</string>
     <string name="start_up_message_pref">Käivitamise sõnum</string>
     <string name="analytics_pref_title">Analüütika</string>
-    <string name="turn_screen_on_info">Kuva kaart lukustuskuval navigeerimise ajal.</string>
+    <string name="turn_screen_on_info">Kuva navigeerimise ajal lukustuskuval kaarti.</string>
     <string name="route_parameters_info">Marsruutimise seaded valitud profiilis \"%1$s\".</string>
     <string name="wake_time">Ärkamisaeg</string>
     <string name="units_and_formats">Ühikud ja formaadid</string>
@@ -925,8 +926,8 @@
     <string name="paste_Osmand_data_folder_path">Kleebi OsmAnd andmekausta asukoht</string>
     <string name="change_osmand_data_folder_question">Muuta OsmAnd andmekausta\?</string>
     <string name="move_maps_to_new_destination">Liiguta uude asukohta</string>
-    <string name="internal_app_storage_description">Sisemine salvestusruum, kasutaja ja teiste rakenduste eest peidetud, ainult OsmAnd juurdepääsetav</string>
-    <string name="change_data_storage_folder">Muuda andmete salvestamise kausta</string>
+    <string name="internal_app_storage_description">Sisemine salvestusruum, kasutaja ja teiste rakenduste eest peidetud, juurdepääsetav ainult OsmAnd\'ile.</string>
+    <string name="change_data_storage_folder">Muuda salvestamise kausta</string>
     <string name="rendering_attr_piste_type_snow_park_name">Maastikupark</string>
     <string name="rendering_attr_piste_type_sleigh_name">Saan</string>
     <string name="rendering_attr_piste_type_sled_name">Kelk</string>
@@ -971,9 +972,9 @@
     <string name="routing_attr_prefer_unpaved_description">Eelista katteta teid.</string>
     <string name="update_all_maps">Uuenda kõiki kaarte</string>
     <string name="update_all_maps_q">Oled kindel, et soovid kõiki (%1$d) kaarte uuendada\?</string>
-    <string name="release_3_5">• Uuendatud rakenduse ja profiili seaded: seaded on nüüd järjestatud tüübi järgi. Igat profiili saab kohandada eraldi.
+    <string name="release_3_5">• Uuendatud rakenduse ja profiili seadeid, mis on nüüd järjestatud tüübi järgi. Igat profiili saab kohandada eraldi.
 \n
-\n • Uus kaartide alla laadimise dialoog, mis soovitab sirvimise ajal kaarte alla laadimiseks
+\n • Uus kaartide allalaadimise dialoog, mis soovitab sirvimise ajal kaarte allalaadimiseks
 \n
 \n • Öise teema parandused
 \n
@@ -991,25 +992,25 @@
     <string name="apply_preference_to_all_profiles">Võid rakendada seda muudatust kõikidele või ainult valitud profiilile.</string>
     <string name="shared_preference">Jagatud</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Eelista katteta teid</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_description">Eelista katteta teid.</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_description">Teekonna koostamisel eelista katteta teid pinnatud teedele.</string>
     <string name="layer_osm_edits">OSM muudatused</string>
-    <string name="quick_action_contour_lines_descr">Lüliti kaardil kõrgusjoonte kuvamiseks või peitmiseks.</string>
+    <string name="quick_action_contour_lines_descr">Nupp kõrgusjoonte kuvamiseks või peitmiseks kaardil.</string>
     <string name="quick_action_contour_lines_show">Kuva kõrgusjooned</string>
     <string name="quick_action_contour_lines_hide">Peida kõrgusjooned</string>
     <string name="quick_action_show_hide_contour_lines">Kuva/peida kõrgusjooned</string>
-    <string name="quick_action_hillshade_descr">Lüliti künkavarjutuste kaardil kuvamiseks või peitmiseks.</string>
+    <string name="quick_action_hillshade_descr">Nupp künkavarjutuste kuvamiseks või peitmiseks kaardil.</string>
     <string name="quick_action_hillshade_show">Kuva künkavarjutus</string>
     <string name="quick_action_hillshade_hide">Peida künkavarjutus</string>
     <string name="quick_action_show_hide_hillshade">Kuva/peida künkavarjutus</string>
-    <string name="tts_initialization_error">Kõnesünteesi mootorit ei saa käivitada</string>
+    <string name="tts_initialization_error">Kõnesünteesi mootorit ei saa käivitada.</string>
     <string name="export_profile">Ekspordi profiil</string>
     <string name="exported_osmand_profile">OsmAnd profiil: %1$s</string>
-    <string name="overwrite_profile_q">Profiil \'%1$s\' on juba olemas. Kirjutada üle\?</string>
+    <string name="overwrite_profile_q">„%1$s“ on juba olemas. Kas kirjutame üle\?</string>
     <string name="export_profile_failed">Profiili ei saanud eksportida.</string>
-    <string name="profile_import">Profiili import</string>
-    <string name="profile_import_descr">Profiili importimiseks vali selle fail seadmes ja ava see OsmAndiga.</string>
+    <string name="profile_import">Impordi profiil</string>
+    <string name="profile_import_descr">Profiili importimiseks ava profiilifail OsmAndiga.</string>
     <string name="file_import_error">%1$s importimise viga: %2$s</string>
-    <string name="file_imported_successfully">%1$s edukalt imporditud.</string>
+    <string name="file_imported_successfully">%1$s on imporditud.</string>
     <string name="rendering_value_white_name">Valge</string>
     <string name="swap_two_places">Vaheta %1$s ja %2$s</string>
     <string name="route_start_point">Lähtepunkt</string>
@@ -1020,16 +1021,16 @@
     <string name="clear_confirmation_msg">Tühjenda %1$s\?</string>
     <string name="download_map_dialog">Kaardi allalaadimise dialoog</string>
     <string name="dialogs_and_notifications_title">Dialoogid ja teated</string>
-    <string name="dialogs_and_notifications_descr">Halda OsmAnd kasutamise ajal kuvatavaid hüpikaknaid, dialooge ja teateid.</string>
+    <string name="dialogs_and_notifications_descr">Halda hüpikaknaid, dialooge ja teateid.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Sõlmede võrgud</string>
     <string name="suggested_maps">Soovitatud kaardid</string>
-    <string name="suggested_maps_descr">Need kaardid on laienduse kasutamisel nõutud</string>
+    <string name="suggested_maps_descr">Need kaardid on laienduse kasutamisel nõutud.</string>
     <string name="added_profiles">Lisatud profiilid</string>
-    <string name="added_profiles_descr">Laiendus lisab uue OsmAnd profiili</string>
+    <string name="added_profiles_descr">Laienduse poolt lisatud OsmAnd profiilid</string>
     <string name="shared_string_turn_off">Lülita välja</string>
     <string name="new_plugin_added">Uus laiendus lisatud</string>
     <string name="join_segments">Liida lõigud</string>
-    <string name="add_new_profile_q">Lisada uus profiil \'%1$s\'\?</string>
+    <string name="add_new_profile_q">Kas lisame uue profiii „%1$s“\?</string>
     <string name="save_heading">Kaasa pealkiri</string>
     <string name="save_heading_descr">Salvestamise ajal salvesta kurss igasse teekonnapunkti.</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -1037,18 +1038,18 @@
     <string name="personal_category_name">Isiklik</string>
     <string name="shared_string_downloading_formatted">Allalaadimine %s</string>
     <string name="rendering_value_thick_name">Jäme</string>
-    <string name="desert_render_descr">Kõrbete ja muude hõredalt asustatud piirkondade jaoks. Kuvab üksikasjad vaateskaalal.</string>
-    <string name="select_navigation_icon">Vali navigeerimise ikoon</string>
-    <string name="select_map_icon">Vali kaardi ikoon</string>
-    <string name="delete_profiles_descr">Peale nupu Rakenda vajutamist on kustutatud profiilid jäädavalt kadunud.</string>
+    <string name="desert_render_descr">Kõrbete ja muude hõredalt asustatud piirkondade jaoks. Üksikasjalikum.</string>
+    <string name="select_navigation_icon">Liikumisel kuvatav asukohaikoon</string>
+    <string name="select_map_icon">Peatumisel kuvatav asukohaikoon</string>
+    <string name="delete_profiles_descr">Rakenda-nupu vajutamisel on eemaldatakse kustutatud profiilid jäädavalt.</string>
     <string name="master_profile">Ülemprofiil</string>
     <string name="select_color">Vali värv</string>
     <string name="edit_profiles_descr">OsmAnd vaikimisi profiile ei saa kustutada, aga saate need eelmisel ekraanil keelata või lõppu nihutada.</string>
     <string name="edit_profiles">Muuda profiile</string>
-    <string name="select_nav_profile_dialog_message">Navigeerimise liik mõjutab teekonna arvutamise reegleid.</string>
+    <string name="select_nav_profile_dialog_message">Navigeerimise liik mõjutab teekonna arvutamise loogikat.</string>
     <string name="profile_appearance">Profiili välimus</string>
-    <string name="choose_icon_color_name">Vali ikoon, värv ja nimi</string>
-    <string name="reorder_profiles">Muuda profiilide loetelu</string>
+    <string name="choose_icon_color_name">Ikoon, värv ja nimi</string>
+    <string name="reorder_profiles">Muuda profiililoendit</string>
     <string name="selected_profile">Valitud profiil</string>
     <string name="right_side_navigation">Parempoolne liiklus</string>
     <string name="driving_region_automatic">Automaatne</string>
@@ -1216,13 +1217,13 @@
     <string name="plugin_ski_name">Suusakaardi vaade</string>
     <string name="osmand_parking_plugin_name">Parkimiskoht</string>
     <string name="osmand_distance_planning_plugin_name">Kauguse kalkulaator &amp; planeerimistöövahend</string>
-    <string name="osm_settings">OpenStreetMap muutmine</string>
+    <string name="osm_settings">OpenStreetMap\'i muutmine</string>
     <string name="rename_failed">Ümber nimetamine ebaõnnestus.</string>
     <string name="days_behind">päeva maas</string>
     <string name="watch">Vaata</string>
     <string name="rendering_attr_pisteGrooming_name">Nõlva hooldus</string>
-    <string name="world_ski_missing">Suusakaartide kuvamiseks on vajalik laadida alla spetsiaalne võrguühenduseta kaart</string>
-    <string name="nautical_maps_missing">Merekaartide kuvamiseks on vajalik laadida alla spetsiaalne võrguühenduseta kaart</string>
+    <string name="world_ski_missing">Suusakaartide kuvamiseks on vajalik laadida alla spetsiaalne võrguühenduseta kaart.</string>
+    <string name="nautical_maps_missing">Merekaartide kuvamiseks on vajalik laadida alla spetsiaalne võrguühenduseta kaart.</string>
     <string name="remove_the_tag">EEMALDA SILT</string>
     <string name="version_settings_descr">Lae alla öösiti avaldatud versioone.</string>
     <string name="version_settings">Avaldatud versioonid</string>
@@ -1957,7 +1958,8 @@
     <string name="user_password">Sinu OSM salasõna</string>
     <string name="osmand_service">Taustarežiim</string>
     <string name="osmand_service_descr">OsmAnd töötab taustal, ekraan välja lülitatud.</string>
-    <string name="download_files_question_space">Lae alla {0} fail(i)\? {1} MB (kokku {2} MB-st) võetakse kasutusse.</string>
+    <string name="download_files_question_space">Kas laeme alla {0} fail(i)\?
+\n{1} MB (kokku {2} MB-st) võetakse kasutusse.</string>
     <string name="use_transparent_map_theme">Läbipaistev teema</string>
     <string name="choose_auto_follow_route">Kaardivaade automaatselt keskele</string>
     <string name="choose_auto_follow_route_descr">Aeg kuni kaardivaade sünkroniseerub praeguse asukohaga.</string>
@@ -1985,7 +1987,7 @@
     <string name="search_position_current_location_found">Minu asukoht (leitud)</string>
     <string name="search_position_address">Aadress…</string>
     <string name="search_position_favorites">Lemmikud…</string>
-    <string name="search_position_undefined">Määramata</string>
+    <string name="shared_string_undefined">Määramata</string>
     <string name="search_position_map_view">Praegune kaardi keskkoht</string>
     <string name="select_search_position">Päritolu:</string>
     <string name="context_menu_item_search">Otsi lähedusest</string>
@@ -2175,14 +2177,14 @@
     <string name="hint_search_online">Veebiotsing: majanumber, tänav, linn</string>
     <string name="search_online_address">Veebiotsing</string>
     <string name="max_level_download_tile">Suurim veebipõhine suurendustase</string>
-    <string name="max_level_download_tile_descr">Ära sirvi veebikaartide paane suuremate suurendustasemete korral.</string>
+    <string name="max_level_download_tile_descr">Ära sirvi veebikaartide paane sellest suuremate suumitasemete korral.</string>
     <string name="router_service_descr">Veebipõhine või võrguühenduseta navigeerimisteenus.</string>
     <string name="update_existing">Asenda</string>
     <string name="loading_streets_buildings">Tänavate/hoonete laadimine…</string>
     <string name="use_online_routing">Kasuta veebipõhist navigeerimist</string>
     <string name="update_tile">Uuenda kaart</string>
     <string name="choose_building">Vali hoone</string>
-    <string name="map_tile_source_descr">Vali veebipõhiste või puhverdatud kaardipaanide allikas</string>
+    <string name="map_tile_source_descr">Vali veebipõhiste või puhverdatud kaardipaanide allikas.</string>
     <string name="incremental_search_building">Otsi hoonet kasvavalt</string>
     <string name="search_address_building">Hoone</string>
     <string name="search_address_building_option">Hoone</string>
@@ -2350,8 +2352,11 @@
     <string name="map_marker_2nd">Teine kaardimarker</string>
     <string name="shared_string_toolbar">Tööriistariba</string>
     <string name="shared_string_widgets">Vidinad</string>
-    <string name="download_files_error_not_enough_space">Pole piisavalt ruumi! {3} MB on vajalik ajutiselt, {1} MB püsivalt. (Ainult {2} MB saadaval.)</string>
-    <string name="download_files_question_space_with_temp">Laadida alla {0} fail(i)\? {3} MB kasutatakse ajutiselt, {1} MB püsivalt. (Kokku {2} MB-st.)</string>
+    <string name="download_files_error_not_enough_space">Pole piisavalt ruumi!
+\n{3} MB on vajalik ajutiselt ning {1} MB püsivalt.
+\n(Ainult {2} MB saadaval.)</string>
+    <string name="download_files_question_space_with_temp">Kas laeme alla {0} fail(i)\?
+\n{3} MB kasutatakse ajutiselt, {1} MB püsivalt. (Kokku {2} MB-st.)</string>
     <string name="upload_osm_note">Lae üles OSM märge</string>
     <string name="upload_anonymously">Lae üles anonüümselt</string>
     <string name="select_map_marker">Vali kaardimarker</string>
@@ -2378,7 +2383,9 @@
     <string name="osm_live_region_desc">Osa sinu annetusest saadetakse OSM kasutajatele, kes teevad kaardimuudatusi selles piirkonnas.</string>
     <string name="osm_live_subscription_settings">Tellimuse seaded</string>
     <string name="osm_live_ask_for_purchase">Palun osta esmalt OsmAnd Live tellimus</string>
-    <string name="osm_live_header">See liitumine võimaldab kogu maailma kaartide värskendusi iga tund. Osa sissetulekust läheb tagasi OSM kogukonnale ja makstakse välja iga OSM kaastöö eest. Kui sulle meeldib OsmAnd ja OSM ning soovite neid toetada ja olla nende poolt toetatud, ongi see suurepärane viis nii teha.</string>
+    <string name="osm_live_header">See liitumine võimaldab kogu maailma kaartide värskendusi kord tunnis. 
+\nOsa sissetulekust läheb tagasi OSM kogukonnale ja makstakse välja iga OSM kaastöö eest.
+\nKui sulle meeldib OsmAnd ja OSM ning soovite neid toetada ja olla nende poolt toetatud, ongi see suurepärane viis nii teha.</string>
     <string name="shared_string_topbar">Ülemine riba</string>
     <string name="storage_directory_readonly_desc">Lülitatud ümber sisemälule, sest valitud andmekandjal puudub kirjutusõigus. Palun vali kirjutusõigusega salvestuskaust.</string>
     <string name="storage_directory_shared">Jagatud mälu</string>
@@ -2387,7 +2394,7 @@
     <string name="shared_string_move_up">Teisalda ↑</string>
     <string name="shared_string_move_down">Teisalda</string>
     <string name="full_report">Kogu ettekanne</string>
-    <string name="open_street_map_login_and_pass">OpenStreetMap kasutajanimi ja salasõna</string>
+    <string name="open_street_map_login_and_pass">OSM\'i kasutajanimi ja salasõna</string>
     <string name="open_street_map_login_descr">Vajalik opestreetmap.org kaastööde jaoks.</string>
     <string name="storage_permission_restart_is_required">Rakendusel on nüüd lubatud kirjutada välisele andmekandjale, aga vajab selleks taaskäivitamist.</string>
     <string name="report">Kanna ette</string>
@@ -2433,9 +2440,9 @@
     <string name="osm_live_banner_desc">Hangi piiramatu kaartide alla laadimine, lisades uuendused iga nädal, päev või isegi tund.</string>
     <string name="osmand_plus_banner_desc">Piiramatud kaartide allalaadimised, uuendused ja Vikipeedia laiendus.</string>
     <string name="get_it">Hangi see</string>
-    <string name="osm_live_payment_desc">Tellimustasu võetakse igakuiselt. Saad sellest Google Play kaudu igal ajal loobuda.</string>
-    <string name="donation_to_osm">Annetus OpenStreetMap kogukonnale</string>
-    <string name="donation_to_osm_desc">Osa Sinu annetusest saadetakse OSM kasutajatele, kes teevad OpenStreetMap kaastööd. Tellimuse hind jääb samaks.</string>
+    <string name="osm_live_payment_desc">Tellimustasu võetakse valitud ajavahemiku kohaselt. Saad sellest Google Play kaudu igal ajal loobuda.</string>
+    <string name="donation_to_osm">Annetus OSM kogukonnale</string>
+    <string name="donation_to_osm_desc">Osa Sinu annetusest saadetakse OSM\'i kaastöötajatele. Tellimuse hind jääb samaks.</string>
     <string name="osm_live_subscription_desc">Tellimus võimaldab uuendused igas tunnis, päevas või nädalas ja piiramatu kogu maailma kaartide alla laadimise.</string>
     <string name="si_mi_feet">Miilid/jalad</string>
     <string name="driving_region_australia">Austraalia</string>
@@ -2576,15 +2583,15 @@
 \n</string>
     <string name="analyze_on_map">Analüüsi kaardil</string>
     <string name="subscribe_email_desc">Liitu meie meililistiga rakenduse allahindluste kohta teabe saamiseks ja saate veel 3 kaardi allalaadimist!</string>
-    <string name="quick_action_add_destination_desc">Nupp ekraani keskkoha teekonna sihtkohaks muutmiseks; igast varem valitud sihtkohast saab viimane vahesihtkoht.</string>
+    <string name="quick_action_add_destination_desc">Nupp ekraani keskkoha teekonna sihtkohaks muutmiseks; ühest varem valitud sihtkohast saab viimane vahesihtkoht.</string>
     <string name="quick_action_replace_destination_desc">Selle nupu vajutamine muudab ekraani keskkoha uueks teekonna sihtkohaks, asendades eelnevalt valitud sihtkoha (kui olemas).</string>
     <string name="quick_action_add_first_intermediate_desc">Nupp ekraani keskkoha esimeseks vahesihtkohaks muutmiseks.</string>
-    <string name="quick_action_auto_zoom_desc">Lülita automaatne kiirusetundlik kaardi suurendamine sisse või välja.</string>
+    <string name="quick_action_auto_zoom_desc">Nupp, mis lülitab automaatse kiirusetundliku suumimise sisse või välja.</string>
     <string name="shared_string_paused">Peatatud</string>
     <string name="animate_my_location_desc">Lülita sisse animeeritud oma asukohas kaardi panoraamimine navigeerimise ajal.</string>
     <string name="srtm_menu_download_descr">Lae alla \'Kõrgusjoonte\' kaart selles piirkonnas kasutamiseks.</string>
     <string name="srtm_purchase_header">Osta ja paigalda \'Kõrgusjoonte\' lisa astmestatud vertikaalsete alade kuvamiseks.</string>
-    <string name="quick_action_showhide_osmbugs_descr">Lülita OSM märkmete kaardil kuvamine sisse või välja.</string>
+    <string name="quick_action_showhide_osmbugs_descr">Nupp, mis lülitab OSM märkmete kaardil kuvamise sisse või välja.</string>
     <string name="private_access_routing_req">Sinu sihtkoht asub eramaal. Luba kasutada erateid sellel teekonnal\?</string>
     <string name="mapillary_widget_descr">Võimaldab kiireid Mapillary kaastöid.</string>
     <string name="mapillary_descr">Veebis tänavataseme fotod kõigile. Avasta kohti, tee kaastööd, jäädvusta maailma.</string>
@@ -2608,8 +2615,8 @@
     <string name="live_monitoring_max_interval_to_send_desrc">Määra võrguühenduse puudumisel säilitatavate asukohtade ajaline puhver</string>
     <string name="mappilary_no_internet_desc">Mapillary fotod on saadaval ainult internetiühenduse olemasolul.</string>
     <string name="show_direction">Vahemaa näit</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Vali allpool \'liikumise suunalt\' \'kompassi suunale\' vastavalt orientatsiooni ümber lülitamise kiirus.</string>
-    <string name="marker_show_distance_descr">Valige, kuidas näidata kaardiekraanil kaugust ja kaardimarkerite suunda:</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Vali allpool „liikumise suunalt“ „kompassi suunale“ vastavalt orientatsiooni ümberlülitamise kiirus.</string>
+    <string name="marker_show_distance_descr">Valige, kuidas esitame kaardil kaugust ja kaardimarkerite suunda:</string>
     <string name="marker_save_as_track_descr">Ekspordi oma markerid järgmisesse GPX faili:</string>
     <string name="group_will_be_removed_after_restart">Järgmisel rakenduse käivitamisel on grupp kadunud.</string>
     <string name="make_round_trip_descr">Lisa lähtepunkti koopia sihtpunktiks.</string>
@@ -2622,13 +2629,13 @@
     <string name="empty_state_markers_active_desc">Pikk või lühike \'Kohad\' vajutus, seejärel vajuta markeri lipu nuppu.</string>
     <string name="empty_state_markers_groups_desc">Impordi lemmikute grupid või teekonnapunktid markeritena.</string>
     <string name="empty_state_markers_history_desc">Läbituks märgitud markerid ilmuvad siia ekraanile.</string>
-    <string name="empty_state_osm_edits_descr">Loo või muuda huvipunkte, ava või kommenteeri OSM märkmeid ja panusta GPX failide osas.</string>
+    <string name="empty_state_osm_edits_descr">Loo või muuda huvipunkte, ava või kommenteeri OSM märkmeid ja lisa salvestatud GPX faile.</string>
     <string name="one_tap_active_descr">Puuduta markerit kaardil selle liigutamiseks aktiivsete markerite algusesse ilma kontekstimenüüd avamata.</string>
     <string name="empty_state_av_notes_desc">Lisa heli, video või fotomärge igale punktile kaardil, kasutades vidinat või kontekstimenüüd.</string>
     <string name="osm_recipient_stat">Muudatusi %1$s, kokku %2$s mBTC</string>
     <string name="lang_lo">Lao</string>
     <string name="gpx_file_desc">GPX - sobib ekspordiks JOSM või teistesse OSM redaktoritesse.</string>
-    <string name="osm_edits_export_desc">Vali ekspordi liik: OSM märkmed, huvipunktid või mõlemad.</string>
+    <string name="osm_edits_export_desc">Ekspordi kas OSM märkmetena, huvipunktidena või mõlemana.</string>
     <string name="purchase_dialog_travel_description">Võrguühenduseta reisijuhi funktsioonide saamiseks osta üks järgmistest:</string>
     <string name="welcome_to_open_beta_description">Reisijuhid põhinevad praegu Wikivoyage\'il. Testige beetaversiooni ajal kõiki funktsioone tasuta. Pärast seda on reisijuhid kättesaadavad piiranguteta OsmAnd tellijatele ja OsmAnd+ omanikele.</string>
     <string name="start_editing_card_description">Saate ja peaksite redigeerima kõiki artikleid Wikivoyage\'is. Jagage teadmisi, kogemusi, annet ja oma tähelepanu.</string>
@@ -2670,7 +2677,7 @@
     <string name="routing_attr_piste_type_sled_name">Kelk</string>
     <string name="routing_attr_piste_type_sled_description">Kelgutamisnõlvad.</string>
     <string name="routing_attr_freeride_policy_name">Hooldamata nõlv</string>
-    <string name="routing_attr_freeride_policy_description">Vabasõidu ja hooldamata nõlvad on mitteametlikud rajad ja läbipääsud. Tavaliselt ametlikult hooldamata ja õhtuti kontrollimata. Sisene omal vastutusel.</string>
+    <string name="routing_attr_freeride_policy_description">Vabasõidu ja hooldamata nõlvad on mitteametlikud rajad ja läbipääsud. Tavaliselt hooldamata ja õhtuti kontrollimata. Sisene omal vastutusel.</string>
     <string name="external_input_device">Välised sisendseadmed</string>
     <string name="external_input_device_descr">Vali väline juhtseade nagu klaviatuur või WunderLINQ.</string>
     <string name="sett_no_ext_input">Mitte ühtegi</string>
@@ -2693,7 +2700,7 @@
 \nGlobaalsed andmed (vahemikus 70 ° põhja ja 70 ° lõuna) põhinevad mõõtmistel, mille on teinud SRTM (süstiku radari topograafiamissioon) ja ASTER (täiustatud kosmose termilise kiirguse ja peegelduse radiomeeter), NASA maavaatlussatelliitide süsteemi lipulaeva Terra pardal olev pildistamisinstrument. ASTER on NASA, Jaapani majandus-, kaubandus- ja tööstusministeeriumi (METI) ja Jaapani kosmosesüsteemide (J-kosmosesüsteemid) koostöö.</string>
     <string name="plugin_touringview_descr">Selle vaate aktiveerimine muudab OsmAndi kaardistiili \'Reisivaateks\'. See on reisijatele ja kutselistele autojuhtidele mõeldud eriline kõrglahutusega vaade.
 \n
-\nSee vaade pakub igal kaardi suurendamisel maksimaalse hulga kaardiandmetes saada olevaid reisiandmeid (eriti teed, rajad, rajad ja orientatsioonimärgid).
+\nSee vaade pakub igal kaardi suurendamisel maksimaalse hulga kaardiandmetes saada olevaid reisiandmeid (eriti teed, rajad ja orientatsioonimärgid).
 \n
 \nSamuti kujutab see värvikoodide abil üheselt mõistetavalt igat tüüpi teid, mis on kasulik nt. suurte sõidukite juhtimisel.
 \n
@@ -2743,8 +2750,8 @@
     <string name="download_using_mobile_internet">WiFi ühendus puudub. Kas kasutada allalaadimiseks praegust internetiühendust\?</string>
     <string name="osmand_background_plugin_description">Kuvab taustajälgimise ja navigeerimise sisselülitamise sätteid GPS-seadet perioodiliselt äratades (välja lülitatud ekraaniga).</string>
     <string name="clear_dest_confirm">Oled kindel, et soovid sihtkoha (ja vahepealsed sihtkohad) tühjendada\?</string>
-    <string name="dropbox_plugin_description">Dropboxi lisa võimaldab sul sünkroonida lugusid ja heli- või videomärkmeid oma Dropboxi kontoga.</string>
-    <string name="srtm_paid_version_msg">Edasise arengu toetamiseks palun kaalu \'Kõrgusjooned\' lisa ostmist.</string>
+    <string name="dropbox_plugin_description">Sünkrooni salvestatud radasid ja heli- või videomärkmeid oma Dropboxi kontole.</string>
+    <string name="srtm_paid_version_msg">Edasise arendustöö toetamiseks palun kaalu Kõrgusjoonte lisa ostmist.</string>
     <string name="recording_playing">Esitatakse määratud salvestuse heli.
 \n%1$s</string>
     <string name="audionotes_location_not_defined">Puuduta \'Kasuta asukohta…\' asukohta märkuse lisamiseks.</string>
@@ -2757,7 +2764,8 @@
     <string name="auto_zoom_map_descr">Kiirusele vastav suurendustase (kuni kaart on hetkeasukohaga sünkroonitud).</string>
     <string name="osmand_short_description_80_chars">Globaalne mobiilikaartide vaatamine ja navigeerimine OSM võrguühenduseta ja veebikaartide jaoks</string>
     <string name="osmand_plus_short_description_80_chars">Globaalne mobiilikaardi vaatamine ja navigeerimine võrguühenduseta ja veebipõhistes OSM-kaartides</string>
-    <string name="native_app_allocated_memory_descr">Kogu rakendusele eraldatud mälumaht %1$s MB (Dalvik %2$s MB, muu %3$s MB). Proportsionaalne mälumaht %4$s MB (Androidi limiit %5$s MB, Dalvik %6$s MB).</string>
+    <string name="native_app_allocated_memory_descr">Kogu rakendusele eraldatud mälumaht on %1$s MB (Dalvik %2$s MB, muu %3$s MB).
+\nProportsionaalne mälumaht on %4$s MB (Androidi mahupiir %5$s MB, Dalvik %6$s MB).</string>
     <string name="osmand_parking_warning_text">Sinu kalendrisse on lisatud teavitus auto kättesaamise kohta ja seda saab seal muuta või eemaldada.</string>
     <string name="rendering_attr_noPolygons_description">Muuda kõik kaardil olevad maapealsed objektid läbipaistvaks.</string>
     <string name="rendering_attr_appMode_description">Optimeeri kaarti</string>
@@ -2925,7 +2933,7 @@
     <string name="previous_run_crashed">OsmAnd jooksis viimasel kasutamisel kokku. Logifail asub {0}. Palun teata probleemist ja edasta logifail.</string>
     <string name="saving_gpx_tracks">GPX faili salvestamine…</string>
     <string name="finished_task">Valmis</string>
-    <string name="osm_settings_descr">Määra OSM ettekanneteks vajalikud OpenStreetMap.org (OSM) sätted.</string>
+    <string name="osm_settings_descr">Määra OSM kaastööks vajalikud OpenStreetMap.org (OSM) sätted.</string>
     <string name="data_settings_descr">Määra keel, lae alla või lae andmed uuesti.</string>
     <string name="data_settings">Andmed</string>
     <string name="additional_settings">Lisaseadistused</string>
@@ -3177,8 +3185,8 @@
     <string name="quick_action_add_poi_descr">Nupp huvipunkti lisamiseks ekraani keskele.</string>
     <string name="quick_action_navigation_voice_descr">Nupp navigeerimise ajal hääljuhiste keelamiseks või lubamiseks.</string>
     <string name="quick_action_add_parking_descr">Nupp parkimiskoha lisamiseks ekraani keskele.</string>
-    <string name="quick_action_showhide_favorites_descr">Lüliti, et kuvada või peita kaardil olevad Lemmikpunktid.</string>
-    <string name="quick_action_showhide_poi_descr">Lüliti, et kuvada või peita huvipunktid kaardil.</string>
+    <string name="quick_action_showhide_favorites_descr">Nupp, et kuvada või peita kaardil olevad Lemmikpunktid.</string>
+    <string name="quick_action_showhide_poi_descr">Nupp, et kuvada või peita huvipunktid kaardil.</string>
     <string name="quick_action_bug_descr">See teade kaasatakse kommentaari väljale.</string>
     <string name="quick_action_category_descr">Salvestada lemmik kategoorias:</string>
     <string name="quick_action_gpx_category_descr">Vali valikuline kategooria.</string>
@@ -3324,7 +3332,7 @@
     <string name="test_voice_desrc">Puuduta nuppu ja kuula sellele vastavat häält, et kuulda, kas see puudub või on vigane</string>
     <string name="run_full_osmand_msg">Kasutad {0} kaarti, mida pakub OsmAnd. Kas soovid käivitada OsmAnd täisversiooni\?</string>
     <string name="run_full_osmand_header">Käivitada OsmAnd\?</string>
-    <string name="quick_action_switch_day_night_descr">Nupp OsmAnd päeva- ja öörežiimi vahetamiseks.</string>
+    <string name="quick_action_switch_day_night_descr">Nupp OsmAnd\'i päeva- ja öörežiimi vahetamiseks.</string>
     <string name="quick_action_switch_day_mode">Päevarežiim</string>
     <string name="quick_action_switch_night_mode">Öörežiim</string>
     <string name="quick_action_day_night_switch_mode">Päeva- ja öörežiimi vahetamine</string>
@@ -3346,8 +3354,8 @@
     <string name="new_route_calculated_dist_dbg">Teekond: vahemaa %s, marsruuteri aeg %s 
 \nArvutamine: %.1f sek, %d teed, %d paani)</string>
     <string name="reset_confirmation_descr">Vajutades nupul %1$s kaovad kõik muudatused.</string>
-    <string name="reset_all_profile_settings_descr">Kõik profiiliseaded lähtestatakse paigaldusjärgsesse olekusse.</string>
-    <string name="reset_all_profile_settings">Taasta kõikide profiiliseadete vaikeväärtused\?</string>
+    <string name="reset_all_profile_settings_descr">Lähtesta kõik profiiliseaded paigaldusjärgsesse olekusse.</string>
+    <string name="reset_all_profile_settings">Kas asendame kõik profiiliseaded vaikeväärtustega\?</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
     <string name="button_rate">Hinda</string>
@@ -3370,12 +3378,12 @@
     <string name="route_recalculation">Teekonna ümberarvutamine</string>
     <string name="accessibility_announce">Teata</string>
     <string name="login_and_pass">Kasutajanimi ja salasõna</string>
-    <string name="plugin_global_prefs_info">Selle lisa seaded kehtivad kogu rakenduses ja rakenduvad kõikidele profiilidele.</string>
-    <string name="osm_editing">OpenStreetMap muutmine</string>
-    <string name="osm_edits_view_descr">Kõiki üleslaadimata muudatusi või osm vigu saad vaadata menüüs %1$s. Üleslaaditud punkte OsmAnd ei kuva.</string>
+    <string name="plugin_global_prefs_info">Need seaded rakenduvad kõikidele profiilidele.</string>
+    <string name="osm_editing">OSM\'i andmete muutmine</string>
+    <string name="osm_edits_view_descr">Kõiki üleslaadimata muudatusi või OSM vigu saad vaadata menüüs %1$s. Üleslaaditud punkte OsmAnd ei kuva.</string>
     <string name="app_mode_osm">OSM</string>
-    <string name="select_nav_icon_descr">Ikooni näed ainult navigeerimise või liikumise ajal.</string>
-    <string name="select_map_icon_descr">Kaardiikoon kuvatakse ainult kaardil ja muutub navigeerimise ajal navigeerimise ikooniks.</string>
+    <string name="select_nav_icon_descr">Ikooni kuvatakse vaid navigeerimise või liikumise ajal.</string>
+    <string name="select_map_icon_descr">Peatumisel näidatav ikoon.</string>
     <string name="logcat_buffer_descr">Kontrolli ja jaga rakenduse detailseid logisid</string>
     <string name="search_offline_geo_error">Geokavatsuse väärtusest \'%s\' ei saanud aru.</string>
     <string name="permission_is_required">Selle valiku kasutamine vajab luba.</string>
@@ -3383,8 +3391,8 @@
     <string name="monitoring_min_speed_descr_side_effect">Kõrvaltoime: teie rajal puuduvad kõik lõigud, kus minimaalse kiiruse kriteerium ei olnud täidetud (nt kus lükkate oma ratta järsust mäest üles). Samuti puudub teave puhkeperioodide, näiteks puhkepauside kohta. See mõjutab iga analüüsi või järeltöötlust, näiteks kui proovite määrata reisi kogupikkust, liikumisaega või keskmist kiirust.</string>
     <string name="monitoring_min_speed_descr_recommendation">Soovitus: proovige kõigepealt kasutada liikumisandurit minimaalse nihkefiltri (B) kaudu, kuna see võib anda paremaid tulemusi ja te kaotate vähem andmeid. Kui teie rajad jäävad madalatel kiirustel lärmakaks, proovige siin nullist erinevat väärtust. Pange tähele, et mõned mõõtmised ei pruugi kiiruse väärtust üldse anda (mõned võrgupõhised meetodid), sellisel juhul ei salvestaks te midagi.</string>
     <string name="monitoring_min_speed_descr_remark">Märkus: kiirus &gt; 0 kontroll: enamik GPS-kiibikomplekte teatab kiiruse väärtuse ainult siis, kui algoritm määrab teie liikumise, ja mitte ükski, kui te pole. Seega kasutab filtri sätte &gt; 0 kasutamine teatud mõttes GPS-kiibistiku liikumistuvastust. Kuid isegi kui seda siin salvestuse ajal ei filtreerita, kasutame seda funktsiooni oma GPX analüüsis korrigeeritud vahemaa määramiseks, st sellel väljal kuvatav väärtus on liikumisel salvestatud vahemaa.</string>
-    <string name="monitoring_min_accuracy_descr">See registreerib ainult minimaalse täpsusnäiduga mõõdetud punktid (meetrites / jalgades, nagu Androidi teatas teie kiibistiku kohta). Täpsus tähendab korduvate mõõtmiste hajumist ega ole otseselt seotud täpsusega, mis määratleb, kui lähedal on teie mõõtmised teie tegelikule asukohale.</string>
-    <string name="monitoring_min_accuracy_descr_side_effect">Kõrvaltoime: täpsusega filtreerimise tulemusel võivad punktid olla nt nt. sildade all, puude all, kõrgete hoonete vahel või teatud ilmastikutingimuste korral.</string>
+    <string name="monitoring_min_accuracy_descr">See registreerib ainult minimaalse täpsusnäiduga mõõdetud punktid (meetrites / jalgades, nagu Androidi teatas teie kiibistiku kohta). Täpsus on mõõtmiste lähedus tegelikule asukohale ega ole otseselt seotud täpsusega, mis on korduvate mõõtmiste hajumine.</string>
+    <string name="monitoring_min_accuracy_descr_side_effect">Kõrvaltoime: täpsusega filtreerimise tulemusel võivad punktid olla näiteks sildade all, puude all, kõrgete hoonete vahel või teatud ilmastikutingimuste korral.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Soovitus: raske on ennustada, mida salvestatakse ja mida mitte, võib-olla oleks parem see filter välja lülitada.</string>
     <string name="monitoring_min_accuracy_descr_remark">Märkus: kui GPS oleks välja lülitatud vahetult enne salvestust, võib esimese mõõdetud punkti täpsus olla vähenenud, nii et meie koodis võiksime enne punkti salvestamist oodata umbes sekund (või salvestada 3 järjestikuse punkti parimad andmed jne.), kuid seda pole veel rakendatud.</string>
     <string name="monitoring_min_distance_descr">See filter väldib dubleerivate punktide registreerimist seal, kus tegelikku liikumist võis olla liiga vähe, muudab radade hilisema ruumilise väljanägemise, mida hiljem ei töödelda.</string>
@@ -3404,7 +3412,7 @@
     <string name="multimedia_photo_play_sound">Kaamera katiku heli</string>
     <string name="osm_authorization_success">Autoriseerimine õnnestus</string>
     <string name="open_settings">Ava seaded</string>
-    <string name="no_recalculation_setting">Keela ümberarvutus</string>
+    <string name="no_recalculation_setting">Ära kasuta ümberarvutust</string>
     <string name="please_provide_profile_name_message">Määra profiili nimi</string>
     <string name="select_data_to_import">Vali imporditavad andmed.</string>
     <string name="import_duplicates_title">Mõned kirjed on juba olemas</string>
@@ -3430,7 +3438,7 @@
     <string name="profile_type_custom_string">Kohandatud profiil</string>
     <string name="shared_string_terrain">Maastik</string>
     <string name="hillshade_description">Kõrgusreljeefi kaart tumedate varjunditega nõlvade, tippude ja tasandike kirjeldamiseks.</string>
-    <string name="slope_description">Nõlv märgib maastikku värvidega.</string>
+    <string name="slope_description">Raja nõlva kallet visualiseeritakse värvidega.</string>
     <string name="terrain_slider_description">Määra vähima ja suurima suurenduse kaardikihi kuvamisel.</string>
     <string name="hillshade_download_description">Kõrgusreljeefi kuvamiseks on vaja täiendavaid kaarte.</string>
     <string name="slope_download_description">Nõlvade kuvamiseks on vaja täiendavaid kaarte.</string>
@@ -3438,12 +3446,12 @@
     <string name="shared_string_transparency">Läbipaistvus</string>
     <string name="shared_string_zoom_levels">Suurendus</string>
     <string name="shared_string_legend">Tingmärgid</string>
-    <string name="terrain_empty_state_text">Luba kõrgusreljeefi või nõlvakaardi kuvamiseks. Nendest kaarditüüpidest saab rohkem lugeda meie kodulehel</string>
+    <string name="terrain_empty_state_text">Luba kõrgusreljeefi või nõlvakaardi kuvamiseks. Neist kaarditüüpidest saad rohkem lugeda meie veebisaidis.</string>
     <string name="shared_string_hillshade">Kõrgusreljeef</string>
-    <string name="import_complete_description">Kõik andmed %1$s-st imporditud, rakenduse vajaliku osaga töötamiseks võib kasutada nuppe allpool.</string>
+    <string name="import_complete_description">Kõik andmed %1$s-st on imporditud, rakenduse vajaliku osaga töötamiseks võid kasutada nuppe allpool.</string>
     <string name="shared_string_import_complete">Imporditud</string>
     <string name="items_added">Kirjed lisatud</string>
-    <string name="checking_for_duplicate_description">OsmAnd kontrollib %1$s rakenduses korduvate kirjete osas.
+    <string name="checking_for_duplicate_description">OsmAnd kontrollib %1$s rakenduses korduvaid kirjeid.
 \n
 \nSelleks võib kuluda aega.</string>
     <string name="shared_string_importing">Importimine</string>
@@ -3458,7 +3466,7 @@
     <string name="recalculate_route_distance_promo">Teekonna ümberarvutus, kui kaugus teekonnast praegusesse asukohta on suurem valitud väärtusest.</string>
     <string name="n_items_of_z">%1$s %2$s-st</string>
     <string name="download_slope_maps">Nõlvad</string>
-    <string name="quick_action_show_hide_terrain">Kuva/peida maastik</string>
+    <string name="quick_action_show_hide_terrain">Kuva või peida maastik</string>
     <string name="quick_action_terrain_hide">Peida maastik</string>
     <string name="quick_action_terrain_show">Kuva maastik</string>
     <string name="quick_action_terrain_descr">Nupp maastikukihi kuvamiseks või peitmiseks kaardil.</string>
@@ -3470,14 +3478,14 @@
     <string name="shared_string_octagon">Kaheksanurk</string>
     <string name="shared_string_square">Ruut</string>
     <string name="shared_string_min">Min</string>
-    <string name="replace_point_descr">Asenda sellega mõni teine punkt</string>
+    <string name="replace_point_descr">Asenda sellega mõni teine punkt.</string>
     <string name="app_mode_ski_touring">Suusasõit</string>
     <string name="app_mode_ski_snowmobile">Mootorsaan</string>
     <string name="custom_osmand_plugin">Kohandatud OsmAnd pistik</string>
-    <string name="changes_applied_to_profile">Profiil %1$s muudetud.</string>
-    <string name="settings_item_read_error">Ei saanud lugeda %1$s.</string>
-    <string name="settings_item_write_error">Ei saanud kirjutada %1$s.</string>
-    <string name="settings_item_import_error">Ei saanud importida %1$s.</string>
+    <string name="changes_applied_to_profile">Profiil %1$s on muudetud.</string>
+    <string name="settings_item_read_error">Ei saanud lugeda %1$s\'st.</string>
+    <string name="settings_item_write_error">Ei saanud kirjutada %1$s\'sse.</string>
+    <string name="settings_item_import_error">Ei saanud importida %1$s\'st.</string>
     <string name="some_articles_may_not_available_in_lang">Kõik Vikipeedia artiklid ei pruugi olla saadaval sinu valitud keeles.</string>
     <string name="lang_zhyue">Kantoni</string>
     <string name="lang_zhminnan">Lõunamini</string>
@@ -3525,4 +3533,126 @@
     <string name="shared_string_language">Keel</string>
     <string name="shared_string_all_languages">Kõik keeled</string>
     <string name="index_name_antarctica">Antarktis</string>
+    <string name="pseudo_mercator_projection">Pseudo-Mercatori projektsioon</string>
+    <string name="one_image_per_tile">Üks pildifail paani kohta</string>
+    <string name="sqlite_db_file">SQLiteDB fail</string>
+    <string name="online_map_name_helper_text">Sisesta veebikaardi allika nimi.</string>
+    <string name="online_map_url_helper_text">Sisesta või kopeeri võrguallika aadress.</string>
+    <string name="edit_online_source">Muuda võrguallikat</string>
+    <string name="expire_time">Aegumise ajavahemik</string>
+    <string name="mercator_projection">Mercatori projektsioon</string>
+    <string name="storage_format">Salvestusvorming</string>
+    <string name="map_source_zoom_levels">Määra võrgukaardi kuvamiseks või laadimiseks vähim ja suurim suumitase.</string>
+    <string name="route_recalculation_dist_title">Minimaalne kaugus marsruudi ümberarvutamiseks</string>
+    <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
+    <string name="shared_string_menu">Menüü</string>
+    <string name="turn_screen_on_proximity_sensor">Lähedusandur</string>
+    <string name="keep_screen_on">Hoia ekraan sisselülitatuna</string>
+    <string name="keep_screen_off">Hoia ekraan väljalülitatuna</string>
+    <string name="wiki_menu_download_descr">Vikipedia huvipunktide kuvamiseks on vaja täiendavaid kaarte.</string>
+    <string name="select_wikipedia_article_langs">Valige kaardil olevad Vikipeedia artiklite keeled. Artikli lugemise ajal kasuta ükskõik millist saadaolevat keelt.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Otsi huvipunktide tüüpe</string>
+    <string name="quick_action_transport_hide">Peida ühistranspordi teave</string>
+    <string name="quick_action_transport_show">Näita ühistranspordi teavet</string>
+    <string name="quick_action_show_hide_transport">Kuva või peida ühistransport</string>
+    <string name="quick_action_transport_descr">Nupp, mis kuvab või peidab ühistranspordiandmed kaardil.</string>
+    <string name="create_edit_poi">Lisa või muuda huvipunkti</string>
+    <string name="shared_string_night_map">Öine kaart</string>
+    <string name="add_online_source">Võrguallika lisamine</string>
+    <string name="clear_tiles_warning">Nende muudatuste rakendamine tühjendab selle paaniallika vahemällu talletatud andmed</string>
+    <string name="osm_edit_closed_note">Suletud OSM märkus</string>
+    <string name="vessel_height_warning_link">Määra laeva kõrgus</string>
+    <string name="vessel_height_warning">Madalate sildade vältimiseks saad kirjeldada laeva kõrguse. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
+    <string name="vessel_height_limit_description">Madalate sildade vältimiseks kirjelda laeva kõrgus. Palun arvesta, et liikuva silla puhul me kasutame seda kõrgust ka siis, kui sild on avatud.</string>
+    <string name="vessel_width_limit_description">Lühikeste sildade vältimiseks kirjelda laeva laius</string>
+    <string name="quick_action_showhide_mapillary_title">Näita või peida Mapillary andmed</string>
+    <string name="quick_action_mapillary_hide">Peida Mapillary andmed</string>
+    <string name="quick_action_mapillary_show">Näita Mapillary andmeid</string>
+    <string name="quick_action_showhide_mapillary_descr">Nupp, mis näitab või peidab kaardil Mapillary kihti.</string>
+    <string name="shared_string_uninstall_and_restart">Eemalda ja taaskäivita</string>
+    <string name="app_mode_inline_skates">Rulluisud</string>
+    <string name="quick_action_remove_next_destination">Kustuta järgmine sihtpunkt</string>
+    <string name="use_volume_buttons_as_zoom_descr">Sisselülitades saad seadme helitugevuse nuppudega kontrollida kaardi suumi taset.</string>
+    <string name="use_volume_buttons_as_zoom">Helitugevuse nupud toimivad suumina</string>
+    <string name="please_provide_point_name_error">Palun sisestage punkti nimi</string>
+    <string name="search_download_wikipedia_maps">Lae alla Vikipeedia kaardid</string>
+    <string name="plugin_wikipedia_description">Hangi huviväärsuste kohta teavet Vikipeediast. See on sinu võrguühenduseta reisiraamat - luba lihtsalt Vikipeedia lisaprogramm ja loe artikleid enda ümber asuvate objektide kohta.</string>
+    <string name="add_hidden_group_info">Kuna valitud grupp on peidetud, siis lisatud punkt ei ole kaardil nähtav. Vajadusel leiad ta „%s“ alt.</string>
+    <string name="app_mode_go_cart">Kartauto</string>
+    <string name="parking_positions">Parkimiskohad</string>
+    <string name="add_edit_favorite">Lisa lemmik või muuda seda</string>
+    <string name="app_mode_wheelchair">Ratastool</string>
+    <string name="app_mode_enduro_motorcycle">Enduro mootorratas</string>
+    <string name="app_mode_motor_scooter">Motoroller</string>
+    <string name="gpx_split_interval_descr">Vali välp, mille alusel kuvatakse rajal aja- või vahemaamärgid.</string>
+    <string name="gpx_split_interval_none_descr">Vali soovitud jagamise viis - kas aja või vahemaa alusel.</string>
+    <string name="track_coloring_solid">Ühtlane</string>
+    <string name="turn_screen_on_navigation_instructions_descr">Iga navigeerimisjuhis lülitab ekraani tööle.</string>
+    <string name="turn_screen_on_navigation_instructions">Navigeerimisjuhised</string>
+    <string name="turn_screen_on_power_button_descr">Seadme toitenupu vajutamisel lülitatakse ekraan tööle ning OsmAnd\'i näidatakse lukustuskuval.</string>
+    <string name="turn_screen_on_power_button">Toitenupp</string>
+    <string name="shared_string_uninstall">Eemalda</string>
+    <string name="extra_maps_menu_group">Täiendavad kaardid</string>
+    <string name="tiles_storage_descr">Vali kuidas sa soovid allalaetud paane salvestada.</string>
+    <string name="mapillary_item">OsmAnd ja Mapillary</string>
+    <string name="quick_action_item">Kiirtegevus</string>
+    <string name="radius_ruler_item">Raadiuse joonlaud</string>
+    <string name="routing_attr_length_description">Täpsusta marsruutidel lubatud sõiduki pikkus.</string>
+    <string name="routing_attr_length_name">Pikkuse piirang</string>
+    <string name="shared_string_bearing">Kurss</string>
+    <string name="item_deleted">%1$s on kustutatud</string>
+    <string name="speed_cameras_restart_descr">Selleks, et eemaldada kõik kiiruskaamerate andmed on vajalik seadme taaskäivitamine.</string>
+    <string name="speed_cameras_removed_descr">Siin seadmes puudub teave liikluskaamerate kohta.</string>
+    <string name="shared_string_add_profile">Lisa profiil</string>
+    <string name="change_application_profile">Muuda rakenduse profiili</string>
+    <string name="profiles_for_action_not_found">Ühtegi sellist profiili ei leidunud.</string>
+    <string name="index_item_world_basemap_detailed">Maailma detailne üldkaart</string>
+    <string name="unsupported_type_error">Faili tüüp ei ole toetatud</string>
+    <string name="width_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite laiuspiiranguid, siis palun märkige oma sõiduki laius.</string>
+    <string name="height_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kõrguspiiranguid, siis palun märkige oma sõiduki kõrgus.</string>
+    <string name="lenght_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada piiranguid pikkade sõidukite suhtes, siis palun märkige oma sõiduki pikkus.</string>
+    <string name="weight_limit_description">Kuna mõnedel marsruutidel võidakse kohaldada sõidukite kaalupiiranguid, siis palun märkige oma sõiduki kaal.</string>
+    <string name="gpx_parse_error">OsmAnd GPX faili vorming pole korrektne. Täpsemaks uurimiseks palun suhtle meie tugimeeskonnaga.</string>
+    <string name="sort_by_category">Sorteeri kategooria järgi</string>
+    <string name="shared_string_resume">Jätka</string>
+    <string name="import_profile_dialog_description">Imporditavas profiilis leidub täiendavaid andmeid. Vajutades „Impordi“ imporditakse vaid profiili andmed, täiendavate andmete jaoks pead märkima vastava valiku.</string>
+    <string name="shared_string_include_data">Kaasa täiendavad andmed</string>
+    <string name="sunrise_at">Päikesetõus kell %1$s</string>
+    <string name="sunset_at">Päikeseloojang kell %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
+    <string name="rendering_attr_streetLightingNight_name">Näita vaid öösel</string>
+    <string name="add_custom_category">Lisa oma kategooria</string>
+    <string name="shared_string_available">Saadaval</string>
+    <string name="copy_coordinates">Kopeeri koordinaadid</string>
+    <string name="clear_recorded_data">Kustuta salvestatud andmed</string>
+    <string name="routing_profile_direct_to">Otse sihtpunkti</string>
+    <string name="ui_customization">Kasutajaliidese kohendamine</string>
+    <string name="context_menu_actions">Kontekstimenüü toimingud</string>
+    <string name="divider_descr">Siit järgnevate elementide ees on eraldaja.</string>
+    <string name="shared_string_divider">Eraldaja</string>
+    <string name="shared_string_hidden">Peidetud</string>
+    <string name="reset_items_descr">Seadistuste peitmine taastab nende algsed väärtused.</string>
+    <string name="main_actions_descr">On ainult neli nuppu.</string>
+    <string name="select_track_file">Vali rajafail</string>
+    <string name="tracker_item">OsmAnd jälgija</string>
+    <string name="measure_distance_item">Mõõda vahemaad</string>
+    <string name="travel_item">Reisimine (Wikivoyage ja Wikipedia)</string>
+    <string name="map_markers_item">Kaardimarkerid</string>
+    <string name="favorites_item">Lemmikud</string>
+    <string name="subscription_osmandlive_item">OsmAnd Live tellimus</string>
+    <string name="osmand_purchases_item">Ostud OsmAnd rakenduses</string>
+    <string name="legend_item_description">Kaardisümboleid kirjeldav juhend.</string>
+    <string name="back_to_editing">Tagasi muutmise juurde</string>
+    <string name="shared_string_always">Alati</string>
+    <string name="shared_string_delete_all_q">Kas kustutame kõik\?</string>
+    <string name="uninstall_speed_cameras">Eemalda kiiruskaamerate andmed</string>
+    <string name="speed_camera_pois">Kiiruskaamerad</string>
+    <string name="keep_active">Hoia kasutuses</string>
+    <string name="speed_cameras_alert">Kiiruskaamerate hoiatused on mõnedes riikides seadusega keelatud.</string>
+    <string name="screen_timeout_descr">Kui %1$s on sisse lülitatud, siis aktiivseks loetav aeg sõltub sellest.</string>
+    <string name="default_screen_timeout">Ekraani väljalülitamise vaikimisi aeg</string>
+    <string name="shared_string_tones">toonid</string>
+    <string name="shared_string_meters">meetrit</string>
+    <string name="details_dialog_decr">Näita või peida täiendavaid andmeid kaardil</string>
 </resources>

OsmAnd/res/values-eu/strings.xml

@@ -574,7 +574,7 @@
     <string name="search_position_current_location_found">Nire kokapena (aurkitua)</string>
     <string name="search_position_address">Helbidea…</string>
     <string name="search_position_favorites">Gogokoak…</string>
-    <string name="search_position_undefined">Indefinitua</string>
+    <string name="shared_string_undefined">Indefinitua</string>
     <string name="search_position_map_view">Uneko maparen zentroa</string>
     <string name="select_search_position">Jatorria:</string>
     <string name="context_menu_item_search">Bilatu inguruan</string>
@@ -3786,4 +3786,5 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_showhide_mapillary_title">Erakutsi/ezkutatu Mapillary</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>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -342,7 +342,7 @@
     <string name="search_position_current_location_found">موقعیت من (پیدا‌شده)</string>
     <string name="search_position_address">نشانی…</string>
     <string name="search_position_favorites">علاقه‌مندی‌ها…</string>
-    <string name="search_position_undefined">نامشخص</string>
+    <string name="shared_string_undefined">نامشخص</string>
     <string name="delete_confirmation_msg">‏%1$s حذف شود؟</string>
     <string name="city_type_suburb">حومه</string>
     <string name="city_type_hamlet">دهکده</string>
@@ -2345,7 +2345,7 @@
     <string name="auto_split_recording_descr">بعد از ۶ دقیقه وقفه، بخش جدید شروع می‌شود. بعد از ۲ ساعت وقفه، رد جدید شروع می‌شود. بعد از وقفهٔ طولانی‌تر در صورتی که تاریخ تغییر کند فایل جدید ایجاد می‌شود.</string>
     <string name="upload_osm_note_description">یادداشت‌های OSM خود را به‌صورت ناشناس یا با نام کاربری‌تان در سایت OpenStreetMap.org، آپلود کنید.</string>
     <string name="route_roundabout_short">خروجی %1$d را بگیرید و بروید</string>
-    <string name="trip_rec_notification_settings_desc">در نوار اعلان دستگاه یک اعلان برای ضبط سفر نشان می‌دهد.</string>
+    <string name="trip_rec_notification_settings_desc">در نوار اعلان دستگاه یک اعلان برای شروع ضبط سفر نشان می‌دهد.</string>
     <string name="save_track_min_speed_descr">پالایه: هیچ نقطه‌ای ثبت نمی‌شود مگر به این سرعت برسد.</string>
     <string name="save_track_min_distance_descr">پالایه: کمترین مسافتی که یک نقطه باید از موقعیت قبلی داشته باشد تا ثبت شود.</string>
     <string name="save_track_precision_descr">پالایه: ضبط انجام نمی‌شود مگر با رسیدن به این میزان صحت.</string>
@@ -3846,4 +3846,21 @@
     <string name="plugin_wikipedia_description">از ویکی‌پدیا دربارهٔ نقاط توجه اطلاعات کسب کنید. یک راهنمای آفلاین جیبی. کافی است افزونهٔ ویکی‌پدیا را فعال کنید و از مقاله‌ها دربارهٔ چیزهای دوروبرتان لذت ببرید.</string>
     <string name="app_mode_wheelchair">صندلی چرخ‌دار</string>
     <string name="osm_edit_closed_note">یادداشت اُاِس‌اِمی بسته</string>
+    <string name="add_hidden_group_info">نقطهٔ اضافه‌شده روی نقشه دیده نمی‌شود، زیرا گروه انتخاب‌شده پنهان است. آن را در «%s» پیدا می‌کنید.</string>
+    <string name="set_working_days_to_continue">برای ادامه روزهای کاری را تنظیم کنید</string>
+    <string name="route_between_points">مسیر بین نقطه‌ها</string>
+    <string name="plan_a_route">طرح‌ریزی مسیر</string>
+    <string name="track_show_start_finish_icons">نمایش آیکون‌های شروع و پایان</string>
+    <string name="select_track_width">انتخاب عرض</string>
+    <string name="gpx_split_interval_descr">انتخاب کنید نشانه‌های روی رد بر اساس زمان یا مسافت با چه تناوبی نمایش یابند.</string>
+    <string name="gpx_split_interval_none_descr">گزینهٔ تقسیم‌بندی دلخواه را انتخاب کنید: بر اساس زمان یا مسافت.</string>
+    <string name="shared_string_custom">سفارشی</string>
+    <string name="gpx_direction_arrows">فلش‌های جهت‌نما</string>
+    <string name="plan_route_last_edited">آخرین ویرایش</string>
+    <string name="plan_route_import_track">درون‌برد رد</string>
+    <string name="plan_route_open_existing_track">بازکردن رد موجود</string>
+    <string name="plan_route_create_new_route">ساخت مسیر جدید</string>
+    <string name="plan_route_select_track_file_for_open">یک فایل رد انتخاب کنید تا باز شود.</string>
+    <string name="shared_string_done">تمام</string>
+    <string name="overwrite_track">بَرنویسی رد</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -191,7 +191,7 @@
     <string name="search_position_current_location_found">Sijaintini (löydetty)</string>
     <string name="search_position_address">Osoite…</string>
     <string name="search_position_favorites">Suosikit…</string>
-    <string name="search_position_undefined">Määrittelemätön</string>
+    <string name="shared_string_undefined">Määrittelemätön</string>
     <string name="select_search_position">Alkuperä:</string>
     <string name="shared_string_save">Tallenna</string>
     <string name="local_index_upload_gpx_description">Lähetä GPX tiedostot OSM yhteisölle. Niitä käytetään karttojen parantamiseen.</string>

OsmAnd/res/values-fr/phrases.xml

@@ -198,7 +198,7 @@
     <string name="poi_craft_key_cutter">Service de reproduction de clefs</string>
     <string name="poi_kindergarten">Jardin d\'enfants</string>
     <string name="poi_kiosk">Kiosque</string>
-    <string name="poi_korfbal">Korfbal</string>
+    <string name="poi_korfbal">Korfball</string>
     <string name="poi_landfill">Décharge</string>
     <string name="poi_landmark">Point de repère</string>
     <string name="poi_laundry">Laverie</string>
@@ -2069,7 +2069,7 @@
     <string name="poi_wiki_lang_mn">Wiki mongole</string>
     <string name="poi_wheelchair_accessibility">Accessibilité aux fauteuils roulants</string>
     <string name="poi_bicycle_parking_informal">Informel</string>
-    <string name="poi_water_characteristic_mud">Caractéristique de l\'eau : boueux</string>
+    <string name="poi_water_characteristic_mud">Boue</string>
     <string name="poi_scrub">Broussailles</string>
     <string name="poi_logging">Coupe de bois</string>
     <string name="poi_passing_place">Zone de croisement</string>

OsmAnd/res/values-fr/strings.xml

@@ -94,7 +94,7 @@
     <string name="search_position_current_location_found">Ma position</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favori…</string>
-    <string name="search_position_undefined">Non défini</string>
+    <string name="shared_string_undefined">Non défini</string>
     <string name="search_position_map_view">Centre de la carte</string>
     <string name="select_search_position">Autour de :</string>
     <string name="context_menu_item_search">Rechercher à proximité</string>
@@ -3820,4 +3820,18 @@
     <string name="plan_route_create_new_route">Créer un nouvel itinéraire</string>
     <string name="plan_route_select_track_file_for_open">Sélectionnez un fichier de trace à ouvrir.</string>
     <string name="shared_string_done">Terminé</string>
+    <string name="overwrite_track">Remplacer la trace</string>
+    <string name="rourte_between_points_desc">Sélectionnez comment relier les points : par une ligne droite ou en calculant un itinéraire avec le profil sélectionné.</string>
+    <string name="rourte_between_points_whole_track_button_desc">Toute la trace sera recalculée en utilisant le profil sélectionné.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Seul le prochain segment sera recalculé en utilisant le profil sélectionné.</string>
+    <string name="rourte_between_points_warning_desc">Pour utiliser cette option, OsmAnd doit aligner votre trace sur les routes de la carte.
+\n
+\n À l\'étape suivante, vous devrez sélectionner le profil de navigation pour détecter les routes autorisées et le seuil de distance pour rapprocher votre trace des routes.</string>
+    <string name="rourte_between_points_add_track_desc">Sélectionnez un fichier de trace auquel ajouter un nouveau segment.</string>
+    <string name="save_as_new_track">Enregistrer comme nouvelle trace</string>
+    <string name="reverse_route">Inverser l\'itinéraire</string>
+    <string name="whole_track">Trace entière</string>
+    <string name="next_segment">Segment suivant</string>
+    <string name="threshold_distance">Seuil de distance</string>
+    <string name="navigation_profile">Profil de navigation</string>
 </resources>

OsmAnd/res/values-gl/strings.xml

@@ -852,7 +852,7 @@
     <string name="search_position_current_location_found">A miña posición (atopada)</string>
     <string name="search_position_address">Enderezo…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Sen definir</string>
+    <string name="shared_string_undefined">Sen definir</string>
     <string name="search_position_map_view">Centro do mapa actual</string>
     <string name="select_search_position">Orixe:</string>
     <string name="context_menu_item_search">Procurar preto daquí</string>

OsmAnd/res/values-hr/strings.xml

@@ -668,7 +668,7 @@
     <string name="route_successfully_saved_at">Ruta je uspješno spremljena kao \'%1$s\'.</string>
     <string name="filename_input">Naziv datoteke: </string>
     <string name="context_menu_item_search">Traži u blizini ovog mjesta</string>
-    <string name="search_position_undefined">Nedefinirano</string>
+    <string name="shared_string_undefined">Nedefinirano</string>
     <string name="search_position_map_view">Posljednje gledano na karti</string>
     <string name="select_search_position">Traži u blizini:</string>
     <string name="search_position_current_location_search">Tražim poziciju-…</string>

OsmAnd/res/values-hu/strings.xml

@@ -157,7 +157,7 @@
     <string name="search_position_current_location_found">Pozícióm (megtalálva)</string>
     <string name="search_position_address">Cím…</string>
     <string name="search_position_favorites">Kedvencek…</string>
-    <string name="search_position_undefined">Meghatározatlan</string>
+    <string name="shared_string_undefined">Meghatározatlan</string>
     <string name="search_position_map_view">Jelenlegi térképközéppont</string>
     <string name="select_search_position">Eredet:</string>
     <string name="context_menu_item_search">Keresés a közelben</string>

OsmAnd/res/values-hy/strings.xml

@@ -1916,7 +1916,7 @@
     <string name="search_position_current_location_found">Իմ դիրքը (որոշված է)</string>
     <string name="search_position_address">Հասցե…</string>
     <string name="search_position_favorites">«Սիրված»…</string>
-    <string name="search_position_undefined">Անորոշ է</string>
+    <string name="shared_string_undefined">Անորոշ է</string>
     <string name="search_position_map_view">Ընթացիկ քարտեզի կենտրոնը</string>
     <string name="select_search_position">Սկիզբ՝</string>
     <string name="context_menu_item_search">Որոնել մոտակայքում</string>

OsmAnd/res/values-is/strings.xml

@@ -539,7 +539,7 @@
     <string name="city_type_city">Borg/Sveitarfélag</string>
     <string name="search_position_address">Heimilisfang…</string>
     <string name="search_position_favorites">Eftirlæti…</string>
-    <string name="search_position_undefined">Óskilgreint</string>
+    <string name="shared_string_undefined">Óskilgreint</string>
     <string name="search_position_map_view">Núverandi miðja korts</string>
     <string name="select_search_position">Upphaf:</string>
     <string name="context_menu_item_search">Leita í nágrenninu</string>

OsmAnd/res/values-it/strings.xml

@@ -80,7 +80,7 @@
     <string name="search_position_current_location_found">La mia posizione (trovata)</string>
     <string name="search_position_address">Indirizzo…</string>
     <string name="search_position_favorites">Preferiti…</string>
-    <string name="search_position_undefined">Non definito</string>
+    <string name="shared_string_undefined">Non definito</string>
     <string name="search_position_map_view">Attuale centro della mappa</string>
     <string name="select_search_position">Origine:</string>
     <string name="context_menu_item_search">Cerca nelle vicinanze</string>
@@ -3840,4 +3840,5 @@
     <string name="plan_route_create_new_route">Crea un nuovo percorso</string>
     <string name="plan_route_select_track_file_for_open">Scegli il file di una traccia da aprire.</string>
     <string name="shared_string_done">Fatto</string>
+    <string name="navigation_profile">Profili di navigazione</string>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -346,7 +346,7 @@
     <string name="search_position_current_location_found">המיקום שלי (נמצא)</string>
     <string name="search_position_address">כתובת…</string>
     <string name="search_position_favorites">מועדפים…</string>
-    <string name="search_position_undefined">בלתי מוגדר</string>
+    <string name="shared_string_undefined">בלתי מוגדר</string>
     <string name="search_position_map_view">מרכז המפה הנוכחי</string>
     <string name="select_search_position">מקור:</string>
     <string name="context_menu_item_search">חיפוש בסביבת מקום</string>
@@ -1515,7 +1515,7 @@
     <string name="traffic_warning_border_control">ביקורת גבולות</string>
     <string name="traffic_warning_payment">עמדת תשלום</string>
     <string name="traffic_warning_stop">סימן עצור</string>
-    <string name="traffic_warning_calming">פסי האטה</string>
+    <string name="traffic_warning_calming">צינון תנועה</string>
     <string name="traffic_warning_speed_camera">מצלמת מהירות</string>
     <string name="traffic_warning">אזהרת תנועה</string>
     <string name="speak_favorites">מועדפים בסביבה</string>
@@ -3846,4 +3846,12 @@
     <string name="plan_route_create_new_route">יצירת מסלול חדש</string>
     <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="whole_track">מסלול שלם</string>
+    <string name="next_segment">המקטע הבא</string>
+    <string name="threshold_distance">סף מרחק</string>
+    <string name="navigation_profile">פרופיל ניווט</string>
+    <string name="rourte_between_points_add_track_desc">נא לבחור קובץ מסלול שבו יתווסף המקטע החדש.</string>
 </resources>

OsmAnd/res/values-ja/strings.xml

@@ -988,7 +988,7 @@ POIの更新は利用できません</string>
     <string name="search_position_current_location_found">現在地(確定)</string>
     <string name="search_position_address">住所…</string>
     <string name="search_position_favorites">お気に入り…</string>
-    <string name="search_position_undefined">未定義</string>
+    <string name="shared_string_undefined">未定義</string>
     <string name="search_position_map_view">マップ画面中心</string>
     <string name="select_search_position">検索基点:</string>
     <string name="context_menu_item_search">近隣を検索</string>

OsmAnd/res/values-ka/strings.xml

@@ -186,7 +186,7 @@
     <string name="search_position_current_location_found">მდებარეობა (ნაპოვნია)</string>
     <string name="search_position_address">მისამართი…</string>
     <string name="search_position_favorites">რჩეულები…</string>
-    <string name="search_position_undefined">არააღწერილი</string>
+    <string name="shared_string_undefined">არააღწერილი</string>
     <string name="search_position_map_view">უკანასკნელად ნანახი რუკის ხედი</string>
     <string name="select_search_position">ძებნა ახლოს :</string>
     <string name="context_menu_item_search">ახლოს ძებნა</string>

OsmAnd/res/values-ko/strings.xml

@@ -120,7 +120,7 @@
     <string name="search_position_current_location_found">위치(발견)</string>
     <string name="search_position_address">주소…</string>
     <string name="search_position_favorites">즐겨찾기…</string>
-    <string name="search_position_undefined">정의되지 않음</string>
+    <string name="shared_string_undefined">정의되지 않음</string>
     <string name="search_position_map_view">현재 지도 센터링</string>
     <string name="select_search_position">원점 :</string>
     <string name="context_menu_item_search">가까운 주변 검색</string>

OsmAnd/res/values-lt/strings.xml

@@ -239,7 +239,7 @@ Tam prireiks {1} MB pastoviam saugojimui.
     <string name="search_position_current_location_found">Mano vieta (rasta)</string>
     <string name="search_position_address">Adresas…</string>
     <string name="search_position_favorites">Įsimintos…</string>
-    <string name="search_position_undefined">Nenurodyta</string>
+    <string name="shared_string_undefined">Nenurodyta</string>
     <string name="search_position_map_view">Esamo žemėlapio centras</string>
     <string name="select_search_position">Pradžia:</string>
     <string name="context_menu_item_search">Ieškoti aplink</string>
@@ -2792,4 +2792,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="plan_route_create_new_route">Sukurti naują maršrutą</string>
     <string name="plan_route_select_track_file_for_open">Pasirinkite trasos failą kurį norite atidaryti</string>
     <string name="shared_string_done">Padaryta</string>
+    <string name="add_hidden_group_info">Pridėtas taškas nebus matomas žemėlapyje, nes pasirinkta grupė yra paslėpta, ją galite rasti \"%s\".</string>
+    <string name="gpx_split_interval_descr">Pasirinkite intervalą nuo kurio taškas su atstumu ar laiku bus pavaizduojamas ekrane ant trasos.</string>
+    <string name="gpx_split_interval_none_descr">Pasirinkite norima dalinimo variantą: pagal laiką arba pagal atstumą.</string>
 </resources>

OsmAnd/res/values-lv/strings.xml

@@ -167,7 +167,7 @@
     <string name="search_position_current_location_found">Mana vieta (atrasta)</string>
     <string name="search_position_address">Adrese…</string>
     <string name="search_position_favorites">Izlase…</string>
-    <string name="search_position_undefined">Nedefinēts</string>
+    <string name="shared_string_undefined">Nedefinēts</string>
     <string name="search_position_map_view">Kartes centrs</string>
     <string name="select_search_position">Reģions:</string>
     <string name="context_menu_item_search">Meklēt tuvumā</string>

OsmAnd/res/values-ml/strings.xml

@@ -1291,7 +1291,7 @@
     <string name="search_position_current_location_found">എന്റെ സ്ഥാനം (കണ്ടെത്തിയത്)</string>
     <string name="search_position_address">വിലാസം…</string>
     <string name="search_position_favorites">ഇഷ്ടമുളളവ…</string>
-    <string name="search_position_undefined">നിഷ്കര്‍ഷിക്കപെടാത്തത്</string>
+    <string name="shared_string_undefined">നിഷ്കര്‍ഷിക്കപെടാത്തത്</string>
     <string name="select_search_position">മൂലസ്ഥാനം:</string>
     <string name="local_index_upload_gpx_description">ഓഎസ്എം കംമ്മ്യൂണിറ്റിക്ക് ജിപിഎക്സ് ഫയലുകള്‍ കയറ്റി അയക്കുക (അപ്ലോഡ്). അവര്‍ക്ക് ഇത് ഭൂപടങ്ങള്‍ മെച്ച്പ്പെടുത്താന്‍ ഉപകരിക്കും.</string>
     <string name="local_index_items_uploaded">%2$d യില്‍ %1$d ഇനങ്ങള്‍ വിജയകരമായ് കയറ്റിയിരിക്കുന്നു(അപ്ലോഡ്).</string>

OsmAnd/res/values-nb/strings.xml

@@ -227,7 +227,7 @@
     <string name="search_position_current_location_found">Min posisjon (funnet)</string>
     <string name="search_position_address">Adresse…</string>
     <string name="search_position_favorites">Favoritter…</string>
-    <string name="search_position_undefined">Udefinert</string>
+    <string name="shared_string_undefined">Udefinert</string>
     <string name="search_position_map_view">Gjeldende kartsenter</string>
     <string name="select_search_position">Utgangspunkt:</string>
     <string name="context_menu_item_search">Søk i nærheten</string>
@@ -3692,12 +3692,12 @@
     <string name="search_download_wikipedia_maps">Last ned Wikipedia-kart</string>
     <string name="accessibility_mode_disabled">Tilgjengelighetsmodus er slått av i Android-systemet.</string>
     <string name="listed_exist"/>
-    <string name="turn_screen_on_navigation_instructions"/>
+    <string name="turn_screen_on_navigation_instructions">Navigasjonsinstruks</string>
     <string name="speed_cameras_restart_descr"/>
     <string name="shared_string_uninstall_and_restart"/>
     <string name="quick_action_remove_next_destination_descr"/>
     <string name="app_mode_wheelchair">Rullestol</string>
-    <string name="app_mode_go_cart"/>
+    <string name="app_mode_go_cart">Gokart</string>
     <string name="plan_a_route">Planlegg en rute</string>
     <string name="additional_actions_descr">Du får tilgang til disse handlingene ved å trykke på knappen “%1$s”.</string>
     <string name="use_volume_buttons_as_zoom_descr">Slå på for å stille inn zoomnivået på kartet med enhetens volumknapper.</string>
@@ -3714,4 +3714,28 @@
     <string name="gpx_direction_arrows">Retningspiler</string>
     <string name="shared_string_tones">tonn</string>
     <string name="route_between_points">Rute mellom punkter</string>
+    <string name="app_mode_enduro_motorcycle">Enduro-motorsykkel</string>
+    <string name="screen_control">Skjermkontroll</string>
+    <string name="system_screen_timeout">Bruk systemets skjermtidsavbrudd</string>
+    <string name="keep_screen_on">Behold skjermen påslått</string>
+    <string name="plan_route_last_edited">Sist redigert</string>
+    <string name="plan_route_import_track">Importer spor</string>
+    <string name="plan_route_open_existing_track">Åpne eksisterende spor</string>
+    <string name="plan_route_select_track_file_for_open">Velg en sporfil for åpning.</string>
+    <string name="reverse_route">Snu rute</string>
+    <string name="overwrite_track">Overskriv spor</string>
+    <string name="rourte_between_points_whole_track_button_desc">Hele sporet vil bli omregnet ved bruk av valgt profil.</string>
+    <string name="rourte_between_points_desc">Velg hvordan punkter skal knyttes sammen, i rett linje, eller utregnet rute mellom dem med valgt profil.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Kun neste segment vil bli omregnet ved bruk av valgt profil.</string>
+    <string name="whole_track">Hele sporet</string>
+    <string name="next_segment">Neste segment</string>
+    <string name="rourte_between_points_warning_desc">For å bruke dette valget må OsmAnd rute sporet ditt til kartveiene.
+\n
+\n På neste steg vil du måtte velge navigasjonsprofil for oppdagelse av tillatte veier, og terskeldistanse for å anslå sporet ditt til veier.</string>
+    <string name="rourte_between_points_add_track_desc">Velg en sporfil å legge til det nye segmentet i.</string>
+    <string name="save_as_new_track">Lagre som nytt spor</string>
+    <string name="plan_route_create_new_route">Opprett ny rute</string>
+    <string name="shared_string_done">Ferdig</string>
+    <string name="threshold_distance">Terskeldistanse</string>
+    <string name="navigation_profile">Navigasjonsdistanse</string>
 </resources>

OsmAnd/res/values-nl/strings.xml

@@ -656,7 +656,7 @@
     <string name="search_position_current_location_found">Huidige Positie (gevonden)</string>
     <string name="search_position_address">Adres…</string>
     <string name="search_position_favorites">Favorieten…</string>
-    <string name="search_position_undefined">Ongedefinieerd</string>
+    <string name="shared_string_undefined">Ongedefinieerd</string>
     <string name="local_index_routing_data">Navigatiedata</string>
     <string name="navigate_point_format">Formaat</string>
     <string name="poi_search_desc">Zoek POI (interessepunt)</string>

OsmAnd/res/values-pl/strings.xml

@@ -36,7 +36,7 @@
     <string name="search_position_current_location_found">Aktualne położenie (ustalone)</string>
     <string name="search_position_address">Adres…</string>
     <string name="search_position_favorites">Ulubione…</string>
-    <string name="search_position_undefined">Niezdefiniowane</string>
+    <string name="shared_string_undefined">Niezdefiniowane</string>
     <string name="search_position_map_view">Aktualny środek mapy</string>
     <string name="select_search_position">Zasób:</string>
     <string name="context_menu_item_search">Szukaj w pobliżu</string>
@@ -1329,7 +1329,7 @@
     <string name="traffic_warning_border_control">Kontrola graniczna</string>
     <string name="traffic_warning_payment">Punkt poboru opłat</string>
     <string name="traffic_warning_stop">Znak Stop</string>
-    <string name="traffic_warning_calming">Uspokojenie ruchu</string>
+    <string name="traffic_warning_calming">Próg zwalniający</string>
     <string name="traffic_warning_speed_camera">Fotoradar</string>
     <string name="traffic_warning">Ostrzeżenia drogowe</string>
     <string name="local_index_description">Kliknij istniejący element, aby zobaczyć szczegóły, naciśnij i przytrzymaj, aby wyłączyć lub usunąć. Aktualne dane na urządzeniu (%1$s wolne):</string>
@@ -3833,9 +3833,9 @@
     <string name="gpx_split_interval_none_descr">Wybierz żądaną opcję podziału: według czasu lub odległości.</string>
     <string name="track_coloring_solid">Stałe</string>
     <string name="gpx_parse_error">OsmAnd GPX nie jest dobrze uformowany, prosimy o kontakt z zespołem wsparcia technicznego w celu dalszego zbadania sprawy.</string>
-    <string name="turn_screen_on_wake_time_descr">Wybierz limit czasu ekranu po przebudzeniu. (\"%1$s\" nie powoduje przekroczenia limitu czasu).</string>
+    <string name="turn_screen_on_wake_time_descr">Ustaw limit czasu ekranu po przebudzeniu. (\"%1$s\" nie stosuje się żadnego limitu czasu.)</string>
     <string name="track_show_start_finish_icons">Pokaż ikony rozpoczęcia i zakończenia</string>
-    <string name="gpx_split_interval_descr">Wybierz przedział czasowy, w którym będą wyświetlane znaki z dystansem lub czasem na torze.</string>
+    <string name="gpx_split_interval_descr">Wybierz przedział czasowy, w którym będą wyświetlane znaki z odległością lub czasem na torze.</string>
     <string name="shared_string_custom">Niestandardowy</string>
     <string name="gpx_direction_arrows">Strzałki kierunkowe</string>
     <string name="plan_route_last_edited">Ostatnio edytowane</string>
@@ -3844,4 +3844,13 @@
     <string name="plan_route_create_new_route">Utwórz nową trasę</string>
     <string name="plan_route_select_track_file_for_open">Wybierz plik ścieżki do otwarcia.</string>
     <string name="shared_string_done">Wykonane</string>
+    <string name="turn_screen_on_power_button_disabled">Wyłączone. Wymagane \"Trzymaj ekran włączony\" w obszarze \"Limit czasu po przebudzeniu\".</string>
+    <string name="overwrite_track">Zastępowanie ścieżki</string>
+    <string name="save_as_new_track">Zapisz jako nowa Ścieżka</string>
+    <string name="reverse_route">Odwróć trasę</string>
+    <string name="whole_track">Cała trasa</string>
+    <string name="next_segment">Nowy segment</string>
+    <string name="threshold_distance">Odległość graniczna</string>
+    <string name="navigation_profile">Profil nawigacji</string>
+    <string name="rourte_between_points_add_track_desc">Wybierz plik ścieżki do którego zostanie dodany nowy segment.</string>
 </resources>

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

@@ -63,6 +63,7 @@
     <string name="simulate_your_location">Simular rota</string>
     <string name="drawer">Lista simples</string>
     <string name="short_location_on_map">Lat %1$s
+\n
 \nLon %2$s</string>
     <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras.</string>
     <string name="routing_settings_2">Configurações de navegação</string>
@@ -102,7 +103,7 @@
     <string name="shared_string_rename">Renomear</string>
     <string name="shared_string_delete">Apagar</string>
     <string name="shared_string_delete_all">Apagar tudo</string>
-    <string name="shared_string_share">Enviar</string>
+    <string name="shared_string_share">Compartilhe</string>
     <string name="shared_string_apply">Aplicar</string>
     <string name="shared_string_control_start">Iniciar</string>
     <string name="shared_string_control_stop">Parar</string>
@@ -298,8 +299,8 @@
     <string name="traffic_warning_speed_limit">Limite de velocidade</string>
     <string name="traffic_warning_border_control">Alfândega</string>
     <string name="traffic_warning_payment">Pedágio</string>
-    <string name="traffic_warning_stop">Placa de pare</string>
-    <string name="traffic_warning_calming">Lombada</string>
+    <string name="traffic_warning_stop">Sinal de pare</string>
+    <string name="traffic_warning_calming">Moderação do trafego</string>
     <string name="traffic_warning">Aviso de tráfego</string>
     <string name="speak_poi">POIs próximos</string>
     <string name="way_alarms">Moderadores de tráfego</string>
@@ -779,7 +780,7 @@
     <string name="osmand_parking_minutes">Minutos</string>
     <string name="osmand_parking_position_description_add_time">O carro foi estacionado em</string>
     <string name="index_settings">Gerenciar mapas</string>
-    <string name="context_menu_item_search">Pesquisar entorno</string>
+    <string name="context_menu_item_search">Pesquise nas proximidades</string>
     <string name="local_index_descr_title">Gerenciar mapas.</string>
     <string name="show_point_options">Usar posição…</string>
     <string name="only_show">Exibir rota</string>
@@ -1135,7 +1136,7 @@
     <string name="search_position_current_location_found">Minha Posição (encontrada)</string>
     <string name="search_position_address">Endereço…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Indefinido</string>
+    <string name="shared_string_undefined">Indefinido</string>
     <string name="search_position_map_view">Centro atual do mapa</string>
     <string name="select_search_position">Próximo a:</string>
     <string name="route_successfully_saved_at">Rota salva como \'%1$s\'.</string>
@@ -1363,7 +1364,7 @@
     <string name="route_tsll">Vire levemente à esquerda e siga</string>
     <string name="search_poi_location">Aguardando sinal…</string>
     <string name="search_near_map">Pesquisar próximo ao centro do mapa</string>
-    <string name="search_nearby">Pesquisar entorno</string>
+    <string name="search_nearby">Pesquise nas proximidades</string>
     <string name="map_orientation_default">Mesma do aparelho</string>
     <string name="map_orientation_portrait">Vertical</string>
     <string name="map_orientation_landscape">Horizontal</string>
@@ -1834,7 +1835,7 @@
     <string name="rec_split_clip_length_desc">Limite de tempo máximo para clipes gravados.</string>
     <string name="rec_split_storage_size">Limite de armazenamento</string>
     <string name="rec_split_storage_size_desc">Quantidade de espaço que pode ser ocupado por todos os clipes gravados.</string>
-    <string name="last_map_change">Última mudança: %s</string>
+    <string name="last_map_change">Última alteração no mapa: %s</string>
     <string name="hourly">A cada hora</string>
     <string name="daily">Diariamente</string>
     <string name="weekly">Semanalmente</string>
@@ -2086,7 +2087,7 @@
     <string name="routing_attr_avoid_ice_roads_fords_name">Sem estradas de gelo ou vaus</string>
     <string name="routing_attr_avoid_ice_roads_fords_description">Evitar estradas de gelo e vaus.</string>
     <string name="map_orientation_change_in_accordance_with_speed">Limite para orientação do mapa</string>
-    <string name="quick_action_show_navigation_finish_dialog">Exibir \'Navegação finalizada\'</string>
+    <string name="quick_action_show_navigation_finish_dialog">Exibir notificação \'Navegação finalizada\'</string>
     <string name="mapillary_menu_title_tile_cache">Cache de quadrícula</string>
     <string name="map_widget_ruler_control">Régua de raio</string>
     <string name="show_from_zoom_level">Exibir a partir do nível de zoom</string>
@@ -2462,20 +2463,35 @@
 \n • Opção de gravação GPX permite-lhe gravar a sua viagem e compartilhá-la
 \n • Através de plugin adicionais, você pode ativar curvas de nível e sombreamento de relevo</string>
     <string name="osmand_extended_description_part6">Passeio, caminhada, turismo pela cidade
+\n
 \n• O mapa mostra caminhos para passeios e caminhadas
+\n
 \n• A Wikipédia no seu idioma preferido pode dizer muito durante um turismo pela cidade
+\n
 \n• Paradas de transportes públicos (ônibus, troleibus, trem) incluindo nomes de linha, ajuda a navegar em uma nova cidade
+\n
 \n• Navegação GPS em modo pedestre constrói a sua rota usando caminhos para pedestres
-\n• Fazer upload e seguir uma rota GPX ou gravar e compartilhar a sua própria rota</string>
+\n
+\n• Fazer upload e seguir uma rota GPX ou gravar e compartilhar a sua própria rota
+\n</string>
     <string name="osmand_extended_description_part7">Contribua para o OSM
+\n
 \n• Comunique falha de dados
+\n
 \n• Carregue trilhas GPX diretamente do app
-\n• Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde se off-line)</string>
+\n
+\n• Adicione POIs e carregue-os diretamente ao OSM (ou mais tarde se off-line)
+\n</string>
     <string name="osmand_plus_extended_description_part5">Recursos de segurança
+\n
 \n• Alternância de exibição dia/noite automatizada opcional
+\n
 \n• Exibição de limite de velocidade opcional, com lembrete se você ultrapassá-lo
+\n
 \n• Zoom dependente da velocidade opcional
-\n• Compartilhe sua localização para que seus amigos possam encontrar você</string>
+\n
+\n• Compartilhe sua localização para que seus amigos possam encontrar você
+\n</string>
     <string name="live_monitoring_max_interval_to_send_desrc">Especificar um buffer de tempo para manter locais para enviar sem conexão</string>
     <string name="quick_action_take_audio_note_descr">Um botão para adicionar uma nota de áudio no meio da tela.</string>
     <string name="quick_action_take_video_note_descr">Um botão para adicionar uma nota de vídeo no meio da tela.</string>
@@ -2542,11 +2558,18 @@
     <string name="import_track">Importar arquivo GPX</string>
     <string name="move_point">Mover Ponto</string>
     <string name="osm_recipients_label">Destinatários OSM</string>
-    <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre
+    <string name="osmand_plus_extended_description_part6">Recursos de Ciclismo e Pedestre
+\n
 \n• Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre
+\n
 \n• Roteamento e modos de exibição especiais para bicicleta e pedestres
+\n
 \n• Paradas de transporte público opcionais (ônibus, troleibus, trem) incluindo nomes de linhas
-\n• Gravação opcional de viagem para arquivo GPX local ou serviço on-line • Exibição opcional de velocidade e altitudes
+\n
+\n• Gravação opcional de viagem para arquivo GPX local ou serviço on-line 
+\n
+\n• Exibição opcional de velocidade e altitudes
+\n
 \n• Exibição de curvas de nível e sombreamento de relevo (via plugin adicional)</string>
     <string name="shared_string_without_name">Sem nome</string>
     <string name="osmand_plus_extended_description_part8">Cobertura de mapa e qualidade aproximada: 
@@ -2623,12 +2646,19 @@
     <string name="waypoints_removed_from_map_markers">Pontos de passagem removidos dos marcadores de mapa</string>
     <string name="shared_string_result">Resultado</string>
     <string name="osmand_plus_extended_description_part2">Navegação
+\n
 \n• Funciona on-line (rápido) ou offline (sem custo de roaming quando estiver no exterior)
+\n
 \n• Orientação por voz passo-a-passo (vozes gravadas e sintetizadas)
+\n
 \n• Orientação de faixas opcional, exibição do nome da rua e tempo estimado de chegada
+\n
 \n• Suporta pontos intermediários do seu itinerário
+\n
 \n• Correção de rota automático sempre que você sair da rota
-\n• Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas</string>
+\n
+\n• Busque lugares por endereço, pelo tipo (ex.: restaurante, hotel, posto de gasolina, museu), ou por coordenadas geográficas
+\n</string>
     <string name="osmand_plus_extended_description_part3">Visualização de mapa 
 \n• Exiba sua posição e orientação 
 \n• Opcionalmente alinhe a tela de acordo com a bússola ou a direção de seu movimento 
@@ -2638,11 +2668,18 @@
 \n• Opcionalmente exiba nomes de lugares em inglês, língua local ou fonético
 \n</string>
     <string name="osmand_plus_extended_description_part4">Use dados OSM e da Wikipédia
+\n
 \n• Informações de alta qualidade dos melhores projetos colaborativos do mundo
+\n
 \n• Dados OSM disponíveis por país ou região
+\n
 \n• POIs da Wikipédia, ótimo para visitas turísticas
+\n
 \n• Downloads grátis ilimitados, diretamente do aplicativo
+\n
 \n• Mapas vetoriais offline compactos e atualizados mensalmente
+\n
+\n
 \n• Escolha entre região completa ou apenas rede rodoviária (Exemplo: Japão inteiro tem 700 MB ou apenas 200 MB para rede rodoviária)</string>
     <string name="online_webpage_warning">Página disponível só online. Abrir num navegador web?</string>
     <string name="images_cache">Cache de imagens</string>
@@ -2780,11 +2817,17 @@
 \n 
 \nAlgumas das principais características:</string>
     <string name="osmand_plus_extended_description_part7">Contribua diretamente para o OSM
+\n
 \n• Avisar erros de dados
+\n
 \n• Fazer upload de trilhas GPX para o OSM diretamente do app
+\n
 \n• Adicionar POIs e fazer o upload diretamente para OSM (ou mais tarde se offline)
+\n
 \n• Gravação de viagem opcional também em modo background (enquanto o dispositivo está no modo sleep)
-\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com as contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades.</string>
+\n
+\nOsmAnd é um software de código aberto desenvolvido ativamente. Todos podem contribuir para o app, reportando bugs, melhorando as traduções ou programando novas funcionalidades. Além disso, o projeto conta com as contribuições financeiras para financiar o desenvolvimento e testes de novas funcionalidades.
+\n</string>
     <string name="point_deleted">Ponto %1$s foi excluído</string>
     <string name="shared_string_world">Mundo</string>
     <string name="thank_you_for_feedback">Obrigado por seus comentários</string>
@@ -3369,7 +3412,7 @@
     <string name="rendering_value_white_name">Branco</string>
     <string name="swap_two_places">Trocar %1$s e %2$s</string>
     <string name="route_start_point">Ponto de partida</string>
-    <string name="default_speed_dialog_msg">Estima a hora de chegada de tipos de estradas desconhecidos e limita a velocidade de todas as estradas (pode afetar o roteamento)</string>
+    <string name="default_speed_dialog_msg">Estima a hora de chegada de tipos de estradas desconhecidas e limita a velocidade de todas as estradas (pode afetar o roteamento)</string>
     <string name="track_saved">Trilha salva</string>
     <string name="empty_filename">O nome do arquivo está vazio</string>
     <string name="shared_string_revert">Reverter</string>
@@ -3767,7 +3810,7 @@
     <string name="clear_tiles_warning">A aplicação dessas alterações limpará os dados em cache dessa origem de bloco</string>
     <string name="vessel_height_warning_link">Definir altura da embarcação</string>
     <string name="vessel_height_warning">Você pode definir a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
-    <string name="vessel_height_limit_description">Defina a altura do vaso para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
+    <string name="vessel_height_limit_description">Defina a altura da embarcação para evitar pontes baixas. Lembre-se, se a ponte for móvel, usaremos sua altura no estado aberto.</string>
     <string name="vessel_width_limit_description">Defina a largura da embarcação para evitar pontes estreitas</string>
     <string name="quick_action_showhide_mapillary_title">Mostrar/ocultar Mapillary</string>
     <string name="quick_action_mapillary_hide">Ocultar Mapillary</string>
@@ -3826,4 +3869,18 @@
     <string name="plan_route_create_new_route">Criar nova rota</string>
     <string name="plan_route_select_track_file_for_open">Selecione um arquivo de faixa para abrir.</string>
     <string name="shared_string_done">Concluído</string>
+    <string name="overwrite_track">Substituir trilha</string>
+    <string name="save_as_new_track">Salvar como nova trilha</string>
+    <string name="reverse_route">Rota reversa</string>
+    <string name="rourte_between_points_whole_track_button_desc">A trilha inteira será recalculada usando o perfil selecionado.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Apenas o próximo segmento será recalculado usando o perfil selecionado.</string>
+    <string name="rourte_between_points_desc">Selecione como conectar pontos, com uma linha reta, ou calcular uma rota entre eles com o perfil selecionado.</string>
+    <string name="whole_track">Trilha inteira</string>
+    <string name="next_segment">Próximo segmento</string>
+    <string name="rourte_between_points_warning_desc">Para usar esta opção, OsmAnd precisa ajustar sua trilha para as estradas do mapa.
+\n
+\n Na próxima etapa, você precisará selecionar o perfil de navegação para detectar as estradas permitidas e a distância limite para aproximar o rastreamento das estradas.</string>
+    <string name="threshold_distance">Distância limite</string>
+    <string name="navigation_profile">Perfil de navegação</string>
+    <string name="rourte_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -563,7 +563,7 @@
     <string name="search_position_current_location_found">Minha posição (encontrada)</string>
     <string name="search_position_address">Endereço…</string>
     <string name="search_position_favorites">Favoritos…</string>
-    <string name="search_position_undefined">Sem definir</string>
+    <string name="shared_string_undefined">Sem definir</string>
     <string name="search_position_map_view">Centro do mapa atual</string>
     <string name="select_search_position">Pesquisar próximo a:</string>
     <string name="context_menu_item_search">Pesquisar nas proximidades</string>
@@ -1250,7 +1250,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">Acalmia de tráfego</string>
+    <string name="traffic_warning_calming">Choque de velocidade</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>
@@ -3394,7 +3394,7 @@
     <string name="quick_action_show_hide_hillshade">Mostrar/ocultar sombras de relevo</string>
     <string name="tts_initialization_error">Não é possível iniciar o mecanismo de conversão de texto em fala.</string>
     <string name="simulate_your_location_gpx_descr">Simule a sua posição usando um caminho GPX gravado.</string>
-    <string name="export_profile">Perfil de exportação</string>
+    <string name="export_profile">Exportar o perfil</string>
     <string name="exported_osmand_profile">Perfil OsmAnd: %1$s</string>
     <string name="overwrite_profile_q">O perfil \'%1$s\' já existe. Sobregravar\?</string>
     <string name="export_profile_failed">Não podia exportar o perfil.</string>
@@ -3845,4 +3845,5 @@
     <string name="plan_route_select_track_file_for_open">Selecione um ficheiro de trilho para abrir.</string>
     <string name="plan_route_create_new_route">Criar rota</string>
     <string name="shared_string_done">Pronto</string>
+    <string name="overwrite_track">Sobrescrever trilho</string>
 </resources>

OsmAnd/res/values-ro/strings.xml

@@ -342,7 +342,7 @@
     <string name="search_position_current_location_found">Poziție curentă (găsită)</string>
     <string name="search_position_address">Adresă…</string>
     <string name="search_position_favorites">Favorite…</string>
-    <string name="search_position_undefined">Necunoscută</string>
+    <string name="shared_string_undefined">Necunoscută</string>
     <string name="search_position_map_view">Ultima afișare a hărții</string>
     <string name="select_search_position">Origine:</string>
     <string name="context_menu_item_search">Căutare în împrejurimi</string>

OsmAnd/res/values-ru/strings.xml

@@ -465,7 +465,7 @@
     <string name="search_position_current_location_found">Моё местоположение (найдено)</string>
     <string name="search_position_address">Адрес…</string>
     <string name="search_position_favorites">Избранные…</string>
-    <string name="search_position_undefined">Неопределённо</string>
+    <string name="shared_string_undefined">Неопределённо</string>
     <string name="search_position_map_view">Текущий центр карты</string>
     <string name="select_search_position">Начало:</string>
     <string name="context_menu_item_search">Искать рядом</string>
@@ -2379,7 +2379,7 @@
     <string name="yesterday">Вчера</string>
     <string name="last_seven_days">За последние 7 дней</string>
     <string name="this_year">В этом году</string>
-    <string name="plan_route">План маршрута</string>
+    <string name="plan_route">Планирование маршрута</string>
     <string name="coordinate_input">Ввод координат</string>
     <string name="marker_save_as_track">Сохранить как файл GPX</string>
     <string name="move_to_history">Переместить в историю</string>
@@ -3837,4 +3837,5 @@
     <string name="plan_route_create_new_route">Создать новый маршрут</string>
     <string name="plan_route_select_track_file_for_open">Выберите файл трека для открытия.</string>
     <string name="shared_string_done">Готово</string>
+    <string name="overwrite_track">Перезаписать трек</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -843,7 +843,7 @@
     <string name="update_poi_file_not_found">Su documentu pro registrare sas modìficas de sos PDI no est istadu ne agatadu nen creadu.</string>
     <string name="map_version_changed_info">Iscàrriga sa versione noa de s\'aplicatzione pro pòdere impreare sos documentos de sa mapa noos.</string>
     <string name="shared_string_rename">Càmbia su nùmene</string>
-    <string name="search_position_undefined">Non dessinidu</string>
+    <string name="shared_string_undefined">Non dessinidu</string>
     <string name="search_position_map_view">Tzentru atuale de sa mapa</string>
     <string name="local_index_mi_upload_gpx">Imbia ad OSM</string>
     <string name="favourites_delete_multiple_succesful">Puntos preferidos iscantzellados.</string>
@@ -1329,7 +1329,7 @@
     <string name="traffic_warning_payment">Casellu</string>
     <string name="traffic_warning_stop">Cartellu de Stop</string>
     <string name="traffic_warning_border_control">Puntu de controllu</string>
-    <string name="traffic_warning_calming">Minimadore de lestresa</string>
+    <string name="traffic_warning_calming">Minimadore de tràficu</string>
     <string name="traffic_warning_speed_camera">Autovelox</string>
     <string name="traffic_warning">Avisu de tràficu</string>
     <string name="local_index_description">Incarca un\'elementu esistente pro bìdere prus minujas, incarca e mantene incarcadu pro l\'istudare o iscantzellare. Datos como in su dispositivu (%1$s lìberos):</string>
@@ -3401,7 +3401,7 @@
     <string name="shared_string_turn_off">Istuda</string>
     <string name="new_plugin_added">Estensione noa annànghida</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Ammustra sas àndalas tziclàbiles de sas retzas de nodos</string>
-    <string name="join_segments">Auni segmentos</string>
+    <string name="join_segments">Auni sos segmentos</string>
     <string name="add_new_profile_q">Annanghere su profilu nou \'%1$s\'\?</string>
     <string name="save_heading">Inclue sa diretzione</string>
     <string name="save_heading_descr">Sarva sa diretzione pro cada puntu cando ses registrende.</string>
@@ -3840,4 +3840,18 @@
     <string name="plan_route_create_new_route">Crea un\'àndala noa</string>
     <string name="plan_route_select_track_file_for_open">Ischerta unu documentu de rasta de abèrrere.</string>
     <string name="shared_string_done">Fatu</string>
+    <string name="overwrite_track">Subraiscrie sa rasta</string>
+    <string name="save_as_new_track">Sarva comente una rasta noa</string>
+    <string name="reverse_route">Fùrria s\'àndala</string>
+    <string name="rourte_between_points_whole_track_button_desc">Sa rasta intrea at a èssere torrada a calculare impreende su profilu ischertadu.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Petzi su segmentu imbeniente at a èssere torradu a calculare impreende su profilu ischertadu.</string>
+    <string name="rourte_between_points_desc">Ischerta comente connètere sos puntos: cun una lìnia reta o calculende un\'àndala intre issos cun su profilu ischertadu.</string>
+    <string name="whole_track">Rasta intrea</string>
+    <string name="next_segment">Segmentu imbeniente</string>
+    <string name="rourte_between_points_warning_desc">Pro impreare custa optzione OsmAnd tenet bisòngiu de alliniare sa rasta tua a sos caminos de sa mapa.
+\n
+\n In su passu chi benit as a dèpere ischertare su profilu de navigatzione pro rilevare sos caminos permìtidos e su lìmite de distàntzia pro aprossimare sa rasta tua cun sos caminos.</string>
+    <string name="threshold_distance">Lìmite de distàntzia</string>
+    <string name="navigation_profile">Profilu de navigatzione</string>
+    <string name="rourte_between_points_add_track_desc">Ischerta unu documentu de rasta in ue annànghere su segmentu nou.</string>
 </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -1123,7 +1123,7 @@
     <string name="poi_pump_powered">Poháňaná</string>
     <string name="poi_pump_no">Žiadna pumpa</string>
     <string name="poi_water_characteristic_mineral">Minerálna</string>
-    <string name="poi_water_characteristic_mud">Vlastnosti vody: blato</string>
+    <string name="poi_water_characteristic_mud">Blato</string>
     <string name="poi_water_characteristic_sulfuric">Sírnatá</string>
     <string name="poi_water_point">Vodný bod</string>
     <string name="poi_cuisine">Kuchyňa</string>
@@ -2110,7 +2110,7 @@
     <string name="poi_vending_sim_cards">SIM karty</string>
     <string name="poi_branch">Pobočka</string>
     <string name="poi_memorial_blue_plaque">Modrá plaketa</string>
-    <string name="poi_memorial_cross">V tvare kríža</string>
+    <string name="poi_memorial_cross">Tvar kríža</string>
     <string name="poi_memorial_vehicle">Vozidlo</string>
     <string name="poi_memorial_stolperstein">Značka na chodníku</string>
     <string name="poi_memorial_obelisk">Obelisk</string>
@@ -2210,7 +2210,7 @@
     <string name="poi_fuel_91ul">Palivo 91UL</string>
     <string name="poi_fuel_100ll">Palivo 100LL</string>
     <string name="poi_fuel_jeta1">Letecké palivo A-1</string>
-    <string name="poi_fuel_adblue">Palivo AdBlue</string>
+    <string name="poi_fuel_adblue">Naftová výfuková tekutina (AdBlue)</string>
     <string name="poi_fuel_wood">Palivo: drevo</string>
     <string name="poi_fuel_charcoal">Palivo: drevné uhlie</string>
     <string name="poi_fuel_coal">Palivo: uhlie</string>
@@ -2521,7 +2521,7 @@
     <string name="poi_historic_period_new_kingdom">Historické obdobie: nové kráľovstvo (1550 – 1069 p. n. l.)</string>
     <string name="poi_historic_period_middle_kingdom">Historické obdobie: stredné kráľovstvo (2055 – 1650 p. n. l.)</string>
     <string name="poi_historic_period_predynastic_egypt">Historické obdobie: preddynastický Egypt</string>
-    <string name="poi_historic_period_early_dynastic_period">Historické obdobie: obdobie rannej dynastie (3100 – 2686 p. n. l.)</string>
+    <string name="poi_historic_period_early_dynastic_period">Historické obdobie: ranná dynastia (3100 – 2686 p. n. l.)</string>
     <string name="poi_historic_period_old_kingdom">Historické obdobie: staré kráľovstvo (2686 – 2181 p. n. l.)</string>
     <string name="poi_historic_period_first_intermediate_period">Historické obdobie: prvé prechodné obdobie (2181 – 2055 p. n. l.)</string>
     <string name="poi_historic_period_second_intermediate_period">Historické obdobie: druhé prechodné obdobie (1650 – 1550 p. n. l.)</string>
@@ -3555,4 +3555,5 @@
     <string name="poi_video_telephone">Video</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_climbing_crag_filter">Lezecká stena</string>
+    <string name="poi_cellar_entrance">Vstup do pivnice</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -230,7 +230,7 @@
     <string name="search_position_current_location_found">Moja poloha (nájdená)</string>
     <string name="search_position_address">Adresa…</string>
     <string name="search_position_favorites">Obľúbené miesta…</string>
-    <string name="search_position_undefined">Neurčené</string>
+    <string name="shared_string_undefined">Neurčené</string>
     <string name="search_position_map_view">Stred mapy teraz</string>
     <string name="select_search_position">Východzí bod:</string>
     <string name="context_menu_item_search">Hľadať v okolí</string>
@@ -3838,4 +3838,18 @@
     <string name="plan_route_create_new_route">Vytvoriť novú trasu</string>
     <string name="plan_route_select_track_file_for_open">Zvoľte súbor so stopou na otvorenie.</string>
     <string name="shared_string_done">Hotovo</string>
+    <string name="overwrite_track">Prepísať stopu</string>
+    <string name="save_as_new_track">Uložiť ako novú stopu</string>
+    <string name="reverse_route">Otočiť trasu</string>
+    <string name="rourte_between_points_whole_track_button_desc">Celá stopa bude prepočítaná pomocou zvoleného profilu.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Len nasledujúci úsek bude prepočítaný pomocou zvoleného profilu.</string>
+    <string name="rourte_between_points_desc">Zvoľte ako spojiť body, priamou čiarou alebo vypočítať trasu medzi nimi pomocou zvoleného profilu.</string>
+    <string name="whole_track">Celá stopa</string>
+    <string name="next_segment">Ďalší úsek</string>
+    <string name="rourte_between_points_warning_desc">Pre použitie tejto možnosti musí OsmAnd prichytiť vašu stopu na cesty v mape.
+\n
+\n V ďalšom kroku budete musieť zvoliť navigačný profil pre detekciu povolených ciest a hraničnú vzdialenosť pre aproximovanie vašej stopy cestami.</string>
+    <string name="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>
 </resources>