Merge pull request #11228 from osmandapp/master

update test branch

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

@@ -6,6 +6,7 @@ import net.osmand.binary.StringBundle;
 import net.osmand.binary.StringBundleWriter;
 import net.osmand.binary.StringBundleXmlWriter;
 import net.osmand.data.QuadRect;
+import net.osmand.router.RouteColorize.ColorizationType;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -227,6 +228,9 @@ public class GPXUtilities {
 		public double hdop = Double.NaN;
 		public float heading = Float.NaN;
 		public boolean deleted = false;
+		public int speedColor = 0;
+		public int altitudeColor = 0;
+		public int slopeColor = 0;
 		public int colourARGB = 0;                    // point colour (used for altitude/speed colouring)
 		public double distance = 0.0;                // cumulative distance, if in a track
 
@@ -249,6 +253,9 @@ public class GPXUtilities {
 			this.hdop = wptPt.hdop;
 			this.heading = wptPt.heading;
 			this.deleted = wptPt.deleted;
+			this.speedColor = wptPt.speedColor;
+			this.altitudeColor = wptPt.altitudeColor;
+			this.slopeColor = wptPt.slopeColor;
 			this.colourARGB = wptPt.colourARGB;
 			this.distance = wptPt.distance;
 		}
@@ -311,6 +318,16 @@ public class GPXUtilities {
 			getExtensionsToWrite().put(ICON_NAME_EXTENSION, iconName);
 		}
 
+		public int getColor(ColorizationType type) {
+			if (type == ColorizationType.SPEED) {
+				return speedColor;
+			} else if (type == ColorizationType.ELEVATION) {
+				return altitudeColor;
+			} else {
+				return slopeColor;
+			}
+		}
+
 		public String getBackgroundType() {
 			return getExtensionsToRead().get(BACKGROUND_TYPE_EXTENSION);
 		}
@@ -1662,16 +1679,16 @@ public class GPXUtilities {
 			return new QuadRect(left, top, right, bottom);
 		}
 
-		public int getGradientScaleColor(String gradientScaleType, int defColor) {
+		public int[] getGradientScaleColor(String gradientScaleType) {
 			String clrValue = null;
 			if (extensions != null) {
 				clrValue = extensions.get(gradientScaleType);
 			}
-			return parseColor(clrValue, defColor);
+			return Algorithms.stringToGradientPalette(clrValue);
 		}
 
-		public void setGradientScaleColor(String gradientScaleType, int gradientScaleColor) {
-			getExtensionsToWrite().put(gradientScaleType, Algorithms.colorToString(gradientScaleColor));
+		public void setGradientScaleColor(String gradientScaleType, int[] gradientScalePalette) {
+			getExtensionsToWrite().put(gradientScaleType, Algorithms.gradientPaletteToString(gradientScalePalette));
 		}
 
 		public String getGradientScaleType() {

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

@@ -27,7 +27,9 @@ public class IndexConstants {
 	public static final String BINARY_ROAD_MAP_INDEX_EXT = ".road.obf"; //$NON-NLS-1$
 	public static final String BINARY_ROAD_MAP_INDEX_EXT_ZIP = ".road.obf.zip"; //$NON-NLS-1$
 	public static final String BINARY_SRTM_MAP_INDEX_EXT = ".srtm.obf"; //$NON-NLS-1$
+	public static final String BINARY_SRTM_FEET_MAP_INDEX_EXT = ".srtmf.obf"; //$NON-NLS-1$
 	public static final String BINARY_SRTM_MAP_INDEX_EXT_ZIP = ".srtm.obf.zip"; //$NON-NLS-1$
+	public static final String BINARY_SRTM_FEET_MAP_INDEX_EXT_ZIP  = ".srtmf.obf.zip"; //$NON-NLS-1$
 	public static final String EXTRA_EXT = ".extra";
 	public static final String EXTRA_ZIP_EXT = ".extra.zip";
 	

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

@@ -282,10 +282,12 @@ public class GeocodingUtilities {
 		} else {
 			Collections.sort(streetsList, DISTANCE_COMPARATOR);
 			double streetDistance = 0;
+			boolean isBuildingFound = knownMinBuildingDistance > 0;
 			for (GeocodingResult street : streetsList) {
 				if (streetDistance == 0) {
 					streetDistance = street.getDistance();
-				} else if (street.getDistance() > streetDistance + DISTANCE_STREET_FROM_CLOSEST_WITH_SAME_NAME) {
+				} else if (streetDistance > 0 && street.getDistance() > streetDistance + DISTANCE_STREET_FROM_CLOSEST_WITH_SAME_NAME && 
+						isBuildingFound) {
 					continue;
 				}
 				street.connectionPoint = road.connectionPoint;
@@ -296,6 +298,7 @@ public class GeocodingUtilities {
 					if (knownMinBuildingDistance == 0) {
 						GeocodingResult firstBld = it.next();
 						knownMinBuildingDistance = firstBld.getDistance();
+						isBuildingFound = true;  
 						res.add(firstBld);
 					}
 					while (it.hasNext()) {

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

@@ -183,8 +183,7 @@ public abstract class MapObject implements Comparable<MapObject> {
 	public String getName(String lang, boolean transliterate) {
 		if (lang != null && lang.length() > 0) {
 			if (lang.equals("en")) {
-				// ignore transliterate option here for backward compatibility
-				return getEnName(true);
+				return getEnName(transliterate);
 			} else {
 				// get name
 				if (names != null) {

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

@@ -6,6 +6,7 @@ public class QuadRect {
 	public double top;
 	public double bottom;
 
+	// left & right / top & bottom could be flipped (so it's useful for latlon bbox) 
 	public QuadRect(double left, double top, double right, double bottom) {
 		this.left = left;
 		this.right = right;
@@ -21,16 +22,18 @@ public class QuadRect {
 	}
 
 	public double width() {
-		return right - left;
+		return Math.abs(right - left);
 	}
 
 	public double height() {
-		return bottom - top;
+		return Math.abs(bottom - top);
 	}
 
 	public boolean contains(double left, double top, double right, double bottom) {
-		return this.left < this.right && this.top < this.bottom && this.left <= left && this.top <= top && this.right >= right
-				&& this.bottom >= bottom;
+		return Math.min(this.left, this.right) <= Math.min(left, right)
+				&& Math.max(this.left, this.right) >= Math.max(left, right)
+				&& Math.min(this.top, this.bottom) <= Math.min(top, bottom)
+				&& Math.max(this.top, this.bottom) >= Math.max(top, bottom);
 	}
 
 	public boolean contains(QuadRect box) {
@@ -38,11 +41,14 @@ public class QuadRect {
 	}
 
 	public static boolean intersects(QuadRect a, QuadRect b) {
-		return a.left < b.right && b.left < a.right && a.top < b.bottom && b.top < a.bottom;
+		return Math.min(a.left, a.right) <= Math.max(b.left, b.right)
+				&& Math.max(a.left, a.right) >= Math.min(b.left, b.right)
+				&& Math.min(a.bottom, a.top) <= Math.max(b.bottom, b.top)
+				&& Math.max(a.bottom, a.top) >= Math.min(b.bottom, b.top);
 	}
 	
 	 public static boolean trivialOverlap(QuadRect a, QuadRect b) {
-		return !((a.right < b.left) || (a.left > b.right) || (a.top < b.bottom) || (a.bottom > b.top));
+		 return intersects(a, b);
 	 }
 
 	public double centerX() {

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

@@ -103,18 +103,16 @@ public class QuadTree<T> {
 	void splitBox(QuadRect node_extent, QuadRect[] n) {
 		// coord2d c=node_extent.center();
 
-		double width = node_extent.width();
-		double height = node_extent.height();
 
-		double lox = node_extent.left;
-		double loy = node_extent.top;
-		double hix = node_extent.right;
-		double hiy = node_extent.bottom;
+		double lx = node_extent.left;
+		double ly = node_extent.top;
+		double hx = node_extent.right;
+		double hy = node_extent.bottom;
 
-		n[0] = new QuadRect(lox, loy, lox + width * ratio, loy + height * ratio);
-		n[1] = new QuadRect(hix - width * ratio, loy, hix, loy + height * ratio);
-		n[2] = new QuadRect(lox, hiy - height * ratio, lox + width * ratio, hiy);
-		n[3] = new QuadRect(hix - width * ratio, hiy - height * ratio, hix, hiy);
+		n[0] = new QuadRect(lx, ly, lx + (hx - lx) * ratio, ly + (hy - ly) * ratio);
+		n[1] = new QuadRect(lx + (hx - lx) * (1 - ratio), ly, hx, ly + (hy - ly) * ratio);
+		n[2] = new QuadRect(lx, ly + (hy - ly) * (1 - ratio), lx + (hx - lx) * ratio, hy);
+		n[3] = new QuadRect(lx + (hx - lx) * (1 - ratio), ly + (hy - ly) * (1 - ratio), hx, hy);
 	}
 
 }

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

@@ -658,6 +658,8 @@ public class MapPoiTypes {
 		tp.setOsmValue(parser.getAttributeValue("", "value"));
 		tp.setOsmEditTagValue(parser.getAttributeValue("", "edit_tag"),
 				parser.getAttributeValue("", "edit_value"));
+		tp.setOsmEditTagValue2(parser.getAttributeValue("", "edit_tag2"),
+				parser.getAttributeValue("", "edit_value2"));
 
 		tp.setOsmTag2(parser.getAttributeValue("", "tag2"));
 		tp.setOsmValue2(parser.getAttributeValue("", "value2"));

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

@@ -16,9 +16,10 @@ public class PoiType extends AbstractPoiType {
 	
 	private String editTag;
 	private String editValue;
+	private String editTag2;
+	private String editValue2;
 	private boolean filterOnly;
 
-	
 	private String nameTag;
 	private boolean text;
 	private boolean nameOnly;
@@ -69,26 +70,45 @@ public class PoiType extends AbstractPoiType {
 		this.editValue = editValue;
 	}
 
+	public void setOsmEditTagValue2(String osmTag, String editValue) {
+		this.editTag2 = osmTag;
+		this.editValue2 = editValue;
+	}
+
 	public String getEditOsmTag() {
-		if(isReference()) {
+		if (isReference()) {
 			return referenceType.getEditOsmTag();
 		}
-		if(editTag == null) {
+		if (editTag == null) {
 			return getOsmTag();
 		}
 		return editTag;
 	}
 	
 	public String getEditOsmValue() {
-		if(isReference()) {
+		if (isReference()) {
 			return referenceType.getEditOsmValue();
 		}
-		if(editValue == null) {
+		if (editValue == null) {
 			return getOsmValue();
 		}
 		return editValue;
 	}
 
+	public String getEditOsmTag2() {
+		if (isReference()) {
+			return referenceType.getEditOsmTag2();
+		}
+		return editTag2;
+	}
+
+	public String getEditOsmValue2() {
+		if (isReference()) {
+			return referenceType.getEditOsmValue2();
+		}
+		return editValue2;
+	}
+
 	public void setOsmTag(String osmTag) {
 		this.osmTag = osmTag;
 	}

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

@@ -5,6 +5,7 @@ import net.osmand.PlatformUtil;
 import net.osmand.osm.edit.Node;
 import net.osmand.osm.edit.OsmMapUtils;
 import net.osmand.util.MapUtils;
+
 import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
@@ -24,11 +25,12 @@ public class RouteColorize {
 
     public static final int DARK_GREY = rgbaToDecimal(92, 92, 92, 255);
     public static final int LIGHT_GREY = rgbaToDecimal(200, 200, 200, 255);
-    public static final int RED = rgbaToDecimal(255,1,1,255);
-    public static final int GREEN = rgbaToDecimal(46,185,0,191);
-    public static final int YELLOW = rgbaToDecimal(255,222,2,227);
+    public static final int GREEN = rgbaToDecimal(90, 220, 95, 255);
+    public static final int YELLOW = rgbaToDecimal(212, 239, 50, 255);
+    public static final int RED = rgbaToDecimal(243, 55, 77, 255);
+    public static final int[] colors = new int[] {GREEN, YELLOW, RED};
 
-    public enum ValueType {
+    public enum ColorizationType {
         ELEVATION,
         SPEED,
         SLOPE,
@@ -42,7 +44,7 @@ public class RouteColorize {
     private final int BLUE_COLOR_INDEX = 3;//RGB
     private final int ALPHA_COLOR_INDEX = 4;//RGBA
 
-    private ValueType valueType;
+    private ColorizationType colorizationType;
 
     public static int SLOPE_RANGE = 150;//150 meters
     private static final double MIN_DIFFERENCE_SLOPE = 0.05d;//5%
@@ -73,7 +75,7 @@ public class RouteColorize {
     /**
      * @param type ELEVATION, SPEED, SLOPE
      */
-    public RouteColorize(int zoom, GPXUtilities.GPXFile gpxFile, ValueType type) {
+    public RouteColorize(int zoom, GPXUtilities.GPXFile gpxFile, ColorizationType type) {
 
         if (!gpxFile.hasTrkPt()) {
             LOG.warn("GPX file is not consist of track points");
@@ -88,7 +90,7 @@ public class RouteColorize {
                 for (GPXUtilities.WptPt p : ts.points) {
                     latList.add(p.lat);
                     lonList.add(p.lon);
-                    if (type == ValueType.SPEED) {
+                    if (type == ColorizationType.SPEED) {
                         valList.add(p.speed);
                     } else {
                         valList.add(p.ele);
@@ -101,14 +103,14 @@ public class RouteColorize {
         latitudes = listToArray(latList);
         longitudes = listToArray(lonList);
 
-        if (type == ValueType.SLOPE) {
+        if (type == ColorizationType.SLOPE) {
             values = calculateSlopesByElevations(latitudes, longitudes, listToArray(valList), SLOPE_RANGE);
         } else {
             values = listToArray(valList);
         }
 
         calculateMinMaxValue();
-        valueType = type;
+        colorizationType = type;
         checkPalette();
         sortPalette();
     }
@@ -201,6 +203,17 @@ public class RouteColorize {
         sortPalette();
     }
 
+    public void setPalette(int[] gradientPalette) {
+        if (gradientPalette == null || gradientPalette.length != 3) {
+            return;
+        }
+        setPalette(new double[][] {
+                {minValue, gradientPalette[0]},
+                {colorizationType == ColorizationType.SLOPE ? 0 : (minValue + maxValue) / 2, gradientPalette[1]},
+                {maxValue, gradientPalette[2]}
+        });
+    }
+
     private int getDefaultColor() {
         return rgbaToDecimal(0, 0, 0, 0);
     }
@@ -282,7 +295,7 @@ public class RouteColorize {
 
             double[][] defaultPalette = {
                     {minValue, GREEN},
-                    {valueType == ValueType.SLOPE ? 0 : (minValue + maxValue) / 2, YELLOW},
+                    {colorizationType == ColorizationType.SLOPE ? 0 : (minValue + maxValue) / 2, YELLOW},
                     {maxValue, RED}
             };
             palette = defaultPalette;

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

@@ -1117,8 +1117,8 @@ public class RouteResultPreparation {
 			if (UNMATCHED_HIGHWAY_TYPE.equals(rr.getObject().getHighway())) {
 				bearingDist = RouteSegmentResult.DIST_BEARING_DETECT_UNMATCHED;
 			}
-			double mpi = MapUtils.degreesDiff(prev.getBearingEnd(prev.getEndPointIndex(), bearingDist), 
-					rr.getBearingBegin(rr.getStartPointIndex(), bearingDist));
+			double mpi = MapUtils.degreesDiff(prev.getBearingEnd(prev.getEndPointIndex(), Math.min(prev.getDistance(), bearingDist)), 
+					rr.getBearingBegin(rr.getStartPointIndex(), Math.min(rr.getDistance(), bearingDist)));
 			if (mpi >= TURN_DEGREE_MIN) {
 				if (mpi < TURN_DEGREE_MIN) {
 					// Slight turn detection here causes many false positives where drivers would expect a "normal" TL. Best use limit-angle=TURN_DEGREE_MIN, this reduces TSL to the turn-lanes cases.

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

@@ -457,7 +457,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 	}
 	
 	public float getBearingBegin() {
-		return getBearingBegin(startPointIndex, DIST_BEARING_DETECT);
+		return getBearingBegin(startPointIndex, distance > 0 && distance < DIST_BEARING_DETECT ? distance : DIST_BEARING_DETECT);
 	}
 	
 	public float getBearingBegin(int point, float dist) {
@@ -465,7 +465,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 	}
 	
 	public float getBearingEnd() {
-		return getBearingEnd(endPointIndex, DIST_BEARING_DETECT);
+		return getBearingEnd(endPointIndex, distance > 0 && distance < DIST_BEARING_DETECT ? distance : DIST_BEARING_DETECT);
 	}
 	
 	public float getBearingEnd(int point, float dist) {

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

@@ -2,6 +2,7 @@ package net.osmand.util;
 
 import net.osmand.IProgress;
 import net.osmand.PlatformUtil;
+import net.osmand.router.RouteColorize;
 import net.osmand.data.LatLon;
 
 import org.apache.commons.logging.Log;
@@ -1061,4 +1062,30 @@ public class Algorithms {
 		}
 		return false;
 	}
+
+	public static int[] stringToGradientPalette(String str) {
+		if (Algorithms.isBlank(str)) {
+			return RouteColorize.colors;
+		}
+		String[] arr = str.split(" ");
+		if (arr.length != 3) {
+			return RouteColorize.colors;
+		}
+		int[] colors = new int[3];
+		try {
+			for (int i = 0; i < 3; i++) {
+				colors[i] = Algorithms.parseColor(arr[i]);
+			}
+		} catch (IllegalArgumentException e) {
+			return RouteColorize.colors;
+		}
+		return colors;
+	}
+
+	public static String gradientPaletteToString(int[] colors) {
+		int[] src = (colors != null && colors.length == 3) ? colors : RouteColorize.colors;
+		return Algorithms.colorToString(src[0]) + " " +
+				Algorithms.colorToString(src[1]) + " " +
+				Algorithms.colorToString(src[2]);
+	}
 }

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

@@ -74,4 +74,7 @@
     <string name="shared_string_appearance">Vzhled</string>
     <string name="logcat_buffer">Zásobník logcat</string>
     <string name="logcat_buffer_descr">Zkontrolovat a sdílet podrobné záznamy aplikace</string>
+    <string name="by_name">Podle názvu</string>
+    <string name="shared_string_distance">Vzdálenost</string>
+    <string name="shared_string_later">Později</string>
 </resources>

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

@@ -39,7 +39,7 @@
     <string name="shared_string_share">Κοινοποίηση</string>
     <string name="shared_string_back">Προηγούμενο</string>
     <string name="shared_string_continue">Συνέχεια</string>
-    <string name="shared_string_cancel">Ακύρωση</string>
+    <string name="shared_string_cancel">Άκυρο</string>
     <string name="shared_string_settings">Επιλογές</string>
     <string name="shared_string_enabled">Ενεργοποιημένο</string>
     <string name="units_and_formats">Μονάδες μέτρησης &amp; φορμά</string>

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

@@ -69,7 +69,7 @@
     <string name="mile">mi</string>
     <string name="km">km</string>
     <string name="m">m</string>
-    <string name="nm">nmi</string>
+    <string name="nm">M</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -249,7 +249,7 @@
     <string name="shared_string_authorization">Autoriseerimine</string>
     <string name="shared_string_authorization_descr">Palun sisesta oma Telegrami telefoninumber rahvusvahelises formaadis</string>
     <string name="shared_string_welcome">Tere tulemast</string>
-    <string name="nm_h">nmi/h</string>
+    <string name="nm_h">sõlme</string>
     <string name="si_nm_h">Meremiili tunnis (sõlm)</string>
     <string name="shared_string_hour_short">h</string>
     <string name="shared_string_minute_short">min</string>

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

@@ -59,7 +59,7 @@
     <string name="shared_string_map">نقشه</string>
     <string name="average_altitude">میانگین ارتفاع</string>
     <string name="average_speed">میانگین سرعت</string>
-    <string name="shared_string_update">به‌روزرسانی</string>
+    <string name="shared_string_update">روزآمدسازی</string>
     <string name="shared_string_ok">خُب</string>
     <string name="shared_string_search">جست‌وجو</string>
     <string name="altitude">ارتفاع</string>
@@ -81,5 +81,5 @@
     <string name="send_report">ارسال گزارش</string>
     <string name="shared_string_export">برون‌برد</string>
     <string name="logcat_buffer">بافر لاگ‌کت</string>
-    <string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string>
+    <string name="logcat_buffer_descr">لاگ‌های باجزئیات برنامه را بررسی و هم‌رسانی کنید</string>
 </resources>

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

@@ -41,4 +41,5 @@
     <string name="shared_string_enable">Ota käyttöön</string>
     <string name="shared_string_select">Valitse</string>
     <string name="shared_string_apply">Käytä</string>
+    <string name="shared_string_sort">Lajittele</string>
 </resources>

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

@@ -213,7 +213,7 @@
     <string name="by_group">Par groupe</string>
     <string name="by_distance">Par distance</string>
     <string name="logout_from_osmand_telegram">Se déconnecter d\'OsmAnd Tracker \?</string>
-    <string name="logout_from_osmand_telegram_descr">Êtes-vous sûr·e de vouloir vous déconnecter d\'OsmAnd Tracker ; vous ne pourrez pas partager votre position ni vous la position des autres \?</string>
+    <string name="logout_from_osmand_telegram_descr">Êtes-vous certain de vouloir vous déconnecter d\'OsmAnd Tracker \? Vous ne pourrez pas partager votre position ni voir la position des autres.</string>
     <string name="live_now_description">Contacts et groupes partageant leur position avec vous.</string>
     <string name="share_location_as">Partager la position comme</string>
     <string name="add_device">Ajouter un périphérique</string>

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

@@ -258,7 +258,7 @@
     <string name="unit_of_speed_system_descr">Definieer de eenheid voor snelheid.</string>
     <string name="unit_of_speed_system">Eenheid van snelheid</string>
     <string name="send_report">Stuur rapport</string>
-    <string name="shared_string_export">Exporteer naar OSM</string>
+    <string name="shared_string_export">Exporteer</string>
     <string name="logcat_buffer">Logcat buffer</string>
     <string name="logcat_buffer_descr">Controleer en deel gedetailleerde logs van de app</string>
 </resources>

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

@@ -1,4 +1,274 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="last_update_from_telegram_date">Senaste uppdatering från Telegram: %1$s</string>
+    <string name="timeline">Tidslinje</string>
+    <string name="live_now">Direkt nu</string>
+    <string name="my_location">Min plats</string>
+    <string name="welcome_descr"><b>OsmAnd Tracker</b> låter dig dela din plats och se andras i OsmAnd. <br/> <br/>Appen använder Telegram API, så du behöver ett Telegram-konto.</string>
+    <string name="shared_string_second_short">sek</string>
+    <string name="shared_string_minute_short">min</string>
+    <string name="shared_string_hour_short">t</string>
+    <string name="si_mi_meters">Miles/meter</string>
+    <string name="si_nm">Distansminuter</string>
+    <string name="si_km_m">Kilomter/meter</string>
+    <string name="si_mi_yard">Miles/yard</string>
+    <string name="si_mi_feet">Miles/fot</string>
+    <string name="si_nm_h">Distansminuter per timme (knop)</string>
+    <string name="si_min_m">Minuter per mile</string>
+    <string name="si_min_km">Minuter per kilometer</string>
+    <string name="si_m_s">Meter per sekund</string>
+    <string name="si_mph">Miles per timme</string>
+    <string name="si_kmh">Kilometer per timme</string>
+    <string name="mile_per_hour">mph</string>
+    <string name="km_h">km/h</string>
+    <string name="m_s">m/s</string>
+    <string name="nm_h">di/h</string>
+    <string name="min_km">min/km</string>
+    <string name="min_mile">min/mi</string>
+    <string name="nm">di</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="mile">mi</string>
+    <string name="foot">ft</string>
+    <string name="yard">yd</string>
+    <string name="shared_string_welcome">Välkommen</string>
+    <string name="shared_string_authorization_descr">Ange ditt Telegram-telefonnummer i internationellt format</string>
+    <string name="shared_string_authorization">Tillstånd</string>
+    <string name="active_chats">Aktivera chattar</string>
+    <string name="show_users_on_map">Visa användare på kartan</string>
+    <string name="install_osmand">Installera OsmAnd</string>
+    <string name="install_osmand_dialog_message">Du måste installera den gratis eller betalda versionen av OsmAnd först</string>
+    <string name="osmand_logo">OsmAnd logotyp</string>
+    <string name="process_service">OsmAnd Tracker tjänst</string>
+    <string name="sharing_location">Delar plats</string>
+    <string name="share_location">Dela plats</string>
+    <string name="shared_string_distance">Avstånd</string>
+    <string name="osmand_service_descr">OsmAnd Tracker körs i bakgrunden med skärmen av.</string>
+    <string name="osmand_service">Bakgrundsläge</string>
+    <string name="location_service_no_gps_available">Välj en av platsleverantörerna för att dela din plats.</string>
+    <string name="gps_not_available">Aktivera \"Plats\" i systeminställningarna</string>
+    <string name="no_location_permission">App saknar behörighet för plats data.</string>
+    <string name="shared_string_settings">Inställningar</string>
+    <string name="shared_string_cancel">Avbryt</string>
+    <string name="shared_string_continue">Fortsätt</string>
+    <string name="not_logged_in">Du är inte inloggad</string>
+    <string name="gps_network_not_enabled">Starta \"Platsdelning\"\?</string>
+    <string name="closing">Stänger</string>
+    <string name="logging_out">Loggar ut</string>
+    <string name="initialization">Startar</string>
+    <string name="shared_string_logout">Logga ut</string>
+    <string name="shared_string_login">Logga in</string>
+    <string name="password_descr">Telegram-lösenord</string>
+    <string name="enter_password">Ange lösenord</string>
+    <string name="authentication_code_descr">Telegram har skickat en kod till dig för OmsAnd för inloggning till ditt konto.</string>
+    <string name="authentication_code">Autentiseringskod</string>
+    <string name="enter_code">Ange kod</string>
+    <string name="shared_string_password">Lösenord</string>
+    <string name="phone_number_descr">Telefonnummer i internationellt format</string>
+    <string name="phone_number_title">Telefonnummer</string>
+    <string name="app_name">OsmAnd Online GPS Tracker</string>
+    <string name="show_on_map">Visa på karta</string>
+    <string name="start_location_sharing">Platsdelning</string>
+    <string name="my_location_search_hint">Sök: Grupp och kontakt</string>
+    <string name="location_sharing_description">Välj de kontakter och grupper du vill dela din plats med.</string>
+    <string name="set_time">Ange tid</string>
+    <string name="set_time_description">Ställ in tiden att dina valda kontakter och grupper ska se din plats i realtid.</string>
+    <string name="visible_time_for_all">Synlig tid för alla</string>
+    <string name="shared_string_back">Bakåt</string>
+    <string name="shared_string_share">Dela</string>
+    <string name="shared_string_install">Installera</string>
+    <string name="hours_format">%1$d t</string>
+    <string name="minutes_format">%1$d m</string>
+    <string name="hours_and_minutes_format">%1$d t %2$d m</string>
+    <string name="set_visible_time_for_all">Ställ in synlig tid för alla</string>
+    <string name="enter_authentication_code">Ange autentiseringskod</string>
+    <string name="enter_phone_number">Skriv in telefonnummer</string>
+    <string name="do_not_have_telegram">Jag har inget Telegramkonto</string>
+    <string name="already_registered_in_telegram">Du behöver ett registrerat Telegramkonto och ett telefonnummer</string>
+    <string name="shared_string_off">Av</string>
+    <string name="shared_string_all">Alla</string>
+    <string name="get_telegram_after_creating_account">Efter det kan du använda denna app.</string>
+    <string name="get_telegram_description_continue">Installera Telegram och registrera ett konto.</string>
+    <string name="get_telegram_account_first">Du behöver ett Telegramkonto för att använda platsdelning.</string>
+    <string name="get_telegram_title">Registrering i Telegram</string>
+    <string name="shared_string_bot">Bot</string>
+    <string name="shared_string_live">Direkt</string>
+    <string name="open_osmand">Öppna OsmAnd</string>
+    <string name="turn_off_location_sharing">Stäng av platsdelning</string>
+    <string name="stop_sharing_all">Delning är påslagen (stäng av)</string>
+    <string name="expire_at">Går ut</string>
+    <string name="sharing_time">Delningstid</string>
+    <string name="gps_and_location">Plats</string>
+    <string name="send_my_location">Skicka min plats</string>
+    <string name="send_my_location_desc">Ställ in minsta intervall för platsdelning.</string>
+    <string name="stale_location">Ingen rörelse</string>
+    <string name="stale_location_desc">Senaste tid en kontakt rört sig.</string>
+    <string name="location_history">Platshistorik</string>
+    <string name="location_history_desc">Göm kontakter som inte har rört sig inom given tid.</string>
+    <string name="osmand_connect">Anslutning till OsmAnd</string>
+    <string name="osmand_connect_desc">Välj den OsmAnd-version som OsmAnd Tracker använder för att visa positioner.</string>
+    <string name="in_time">i %1$s</string>
+    <string name="shared_string_account">Konto</string>
+    <string name="connected_account">Anlutet konto</string>
+    <string name="logout_help_desc">Hur man stänger av OsmAnd Tracker från Telegram</string>
+    <string name="disconnect_from_telegram">Hur man stänger av OsmAnd Tracker från Telegram</string>
+    <string name="disconnect_from_telegram_desc">För att återkalla platsdelningsåtkomst. Öppna Telegram, gå till Inställningar → Sekretess och säkerhet → Sessioner och avsluta OsmAnd Tracker-sessionen.</string>
+    <string name="shared_string_close">Stäng</string>
+    <string name="logout_no_internet_msg">Anslut till internet för att logga ut ordentligt från Telegram.</string>
+    <string name="shared_string_group">Grupp</string>
+    <string name="last_response">Senaste svar</string>
+    <string name="time_ago">sedan</string>
+    <string name="shared_string_exit">Utgång</string>
+    <string name="turn_off_all">Stäng av allt</string>
+    <string name="disable_all_sharing">Inaktivera all delning</string>
+    <string name="disable_all_sharing_desc">Stäng av platsdelning i alla valda chatter (%1$d).</string>
+    <string name="choose_osmand">Välj OsmAnd version att använda</string>
+    <string name="choose_osmand_desc">Välj OsmAnd version där kontakter kommer att visas på kartan.</string>
+    <string name="shared_string_sort_by">Sortera efter</string>
+    <string name="shared_string_sort">Sortera</string>
+    <string name="by_group">Efter grupp</string>
+    <string name="by_name">Efter namn</string>
+    <string name="by_distance">Avstånd</string>
+    <string name="shared_string_name">Namn</string>
+    <string name="logout_from_osmand_telegram">Logga ut från OsmAnd Tracker\?</string>
+    <string name="logout_from_osmand_telegram_descr">Är du säker på att du vill logga ut från OsmAnd Tracker så att du inte kan dela plats eller se andras plats\?</string>
+    <string name="live_now_description">Kontakter och grupper delar plats med dig.</string>
+    <string name="share_location_as">Dela plats som</string>
+    <string name="add_device">Lägg till enhet</string>
+    <string name="shared_string_save">Spara</string>
+    <string name="shared_string_disable">Inaktivera</string>
+    <string name="no_internet_connection">Ingen internet-anslutning</string>
+    <string name="no_gps_connection">Ingen GPS-anslutning</string>
+    <string name="shared_string_status">Status</string>
+    <string name="shared_string_enabled">Aktiverat</string>
+    <string name="location_sharing_status">Delar: %1$s</string>
+    <string name="sharing_status">Delar status</string>
+    <string name="last_available_location">Senaste tillgängliga plats</string>
+    <string name="re_send_location">Skicka plats igen</string>
+    <string name="not_found_yet">Hittades inte än</string>
+    <string name="not_sent_yet">Inte skickat än</string>
+    <string name="shared_string_later">Senare</string>
+    <string name="go_to_settings">Gå till inställningar</string>
+    <string name="sharing_in_background">Delar i bakgrunden</string>
+    <string name="battery_optimization_description">Stäng av batterioptimering för OsmAnd Tracker så att den inte plötsligt stängs av i bakgrunden.</string>
+    <string name="background_work">Bakgrundsarbete</string>
+    <string name="background_work_description">Ändra batterioptimeringsinställningarna för att stabilisera platsdelning.</string>
+    <string name="connecting_to_the_internet">Ansluter till internet</string>
+    <string name="searching_for_gps">Positionering …</string>
+    <string name="initializing">Startar</string>
+    <string name="sending_location_messages">Skickar plats</string>
+    <string name="waiting_for_response_from_telegram">Väntar på svar från Telegram</string>
+    <string name="not_possible_to_send_to_telegram_chats">Inte möjligt att skicka till Telegram-chattar:</string>
+    <string name="successfully_sent_and_updated">Skickades och uppdaterades</string>
+    <string name="last_updated_location">Senast uppdaterad plats:</string>
+    <string name="share_location_as_description">Om du vill ansluta flera enheter till ett telegramkonto måste du använda olika enheter för att dela din plats.</string>
+    <string name="share_location_as_description_second_line">Du kan skapa och visa enhets-ID i Telegram-klienten genom att använda %1$s chatt-bot. %2$s</string>
+    <string name="shared_string_hide">Göm</string>
+    <string name="device_name">Enhetsnamn</string>
+    <string name="device_name_cannot_be_empty">Enhetsnamn kan inte vara tomt</string>
+    <string name="device_name_is_too_long">Enhetsnamn för långt</string>
+    <string name="enter_device_name_description">Namnge din nya enhet med max 200 symboler.</string>
+    <string name="error_adding_new_device">Kunde inte lägga till ny enhet</string>
+    <string name="shared_string_add">Lägg till</string>
+    <string name="device_added_successfully">%1$s tillagt.</string>
+    <string name="enter_another_device_name">Välj ett namn som du inte redan har använt</string>
+    <string name="last_update_from_telegram">Senaste uppdatering från Telegram</string>
+    <string name="map_and_text">Karta och text</string>
+    <string name="shared_string_text">Text</string>
+    <string name="shared_string_map">Karta</string>
+    <string name="send_location_as_descr">Välj hur meddelanden med din plats ska se ut.</string>
+    <string name="send_location_as">Skicka plats som</string>
+    <string name="start_date">Start datum</string>
+    <string name="end_date">Slutdatum</string>
+    <string name="open_in_osmand">Visa i OsmAnd</string>
+    <string name="average_speed">Genomsnittlig hastighet</string>
+    <string name="average_altitude">Genomsnittlig höjd</string>
+    <string name="time_on_the_move">Rörelse tid</string>
+    <string name="monitoring_is_disabled">Övervakning är inaktiverad</string>
+    <string name="monitoring_is_enabled">Övervakning är aktiverad</string>
+    <string name="shared_string_sent">Skickat</string>
+    <string name="gps_points">GPS-punkter</string>
+    <string name="shared_string_collected">Samlade</string>
+    <string name="shared_string_date">Datum</string>
+    <string name="points_size">%1$d punkter</string>
+    <string name="gps_points_in_buffer">skicka (%1$d i buffer)</string>
+    <string name="shared_string_update">Uppdatering</string>
+    <string name="please_update_osmand">var snäll uppdatera OsmAnd för att visa data på kartan</string>
+    <string name="show_gps_points_descr">Visa antal samlade och skickade GPS-punkter.</string>
+    <string name="show_gps_points">Visa GPS-punkter</string>
+    <string name="shared_string_appearance">Utseende</string>
+    <string name="received_gps_points">Fick GPX-punkter: %1$s</string>
+    <string name="how_it_works">Hur det fungerar</string>
+    <string name="osmand_privacy_policy">OsmAnd integritetspolicy</string>
+    <string name="telegram_privacy_policy">Telegram integritetspolicy</string>
+    <string name="shared_string_accept">Acceptera</string>
+    <string name="privacy_policy_agree">Genom att klicka på \"Fortsätt\" godkänner du villkoren i Telegram- och OsmAnds integritetspolicy.</string>
+    <string name="privacy_policy_telegram_client">OsmAnd tracker är en av klienterna som använder Telegram öppen plattform. Dina kontakter kan använda vilken Telegram-klient som helst.</string>
+    <string name="privacy_policy_use_telegram">Telegram (meddelandeappen) används för att ansluta och kommunicera med människor.</string>
+    <string name="shared_string_telegram">Telegram</string>
+    <string name="app_name_short">OsmAnd Tracker</string>
+    <string name="timeline_description">Aktivera övervakning för att spara alla platser i historiken.</string>
+    <string name="location_recording_enabled">Platsinspelning aktiverad</string>
+    <string name="disable_monitoring">Deaktivera övervakning</string>
+    <string name="timeline_available_for_free_now">Tidslinje är nu tillgängligt utan extra kostnad.</string>
+    <string name="shared_string_ok">OK</string>
+    <string name="shared_string_search">Sök</string>
+    <string name="type_contact_or_group_name">Skriv kontakt eller gruppnamn</string>
+    <string name="search_contacts_descr">Sök i alla dina grupper och kontakter.</string>
+    <string name="search_contacts">Sök kontakter</string>
+    <string name="bearing">Riktning</string>
+    <string name="altitude">Höjd över havet</string>
+    <string name="precision">Precision</string>
+    <string name="direction">Riktning</string>
+    <string name="privacy">Integritet</string>
+    <string name="proxy">Proxy</string>
+    <string name="proxy_settings">Proxy-inställningar</string>
+    <string name="proxy_disconnected">Frånkopplad</string>
+    <string name="proxy_connected">Ansluten</string>
+    <string name="proxy_type">Proxy-typ</string>
+    <string name="shared_string_enable">Aktivera</string>
+    <string name="shared_string_connection">Anslutning</string>
+    <string name="proxy_server">Server</string>
+    <string name="proxy_port">Port</string>
+    <string name="proxy_credentials">Referenser</string>
+    <string name="proxy_username">Användarnamn</string>
+    <string name="proxy_password">Lösenord</string>
+    <string name="proxy_key">Nyckel</string>
+    <string name="gpx_settings">GPX-inställningar</string>
+    <string name="min_logging_speed_descr">Filter: ingen loggning under valda hastigheten</string>
+    <string name="min_logging_speed">Minsta loggningshastighet</string>
+    <string name="min_logging_accuracy_descr">Filter: ingen loggning utan att nogranheten är nodd</string>
+    <string name="min_logging_accuracy">Minsta loggningsnoggrannhet</string>
+    <string name="min_logging_distance_descr">Filter: minsta avstånd för att logga en ny punkt</string>
+    <string name="min_logging_distance">Minsta loggningsavstånd</string>
+    <string name="shared_string_select">Välj</string>
+    <string name="timeline_no_data">Ingen data</string>
+    <string name="timeline_no_data_descr">Vi har inget sparad data för den valda dagen</string>
+    <string name="start_end_date">Start - Slut datum</string>
+    <string name="set_time_timeline_descr">Välj tid att visa</string>
+    <string name="shared_string_apply">Verkställ</string>
+    <string name="shared_string_start">Start</string>
+    <string name="shared_string_end">Slut</string>
+    <string name="saved_messages">Sparade meddelanden</string>
+    <string name="unit_of_speed_system">Enhet för hastighet</string>
+    <string name="unit_of_speed_system_descr">Definera enhet för hastighet.</string>
+    <string name="unit_of_length">Enhet för längd</string>
+    <string name="unit_of_length_descr">Ändra vad avstånd mäts i.</string>
+    <string name="units_and_formats">Enheter &amp; format</string>
+    <string name="time_zone">Tidszon</string>
+    <string name="time_zone_descr">Välj tidszon som ska visas i dina platsmeddelanden.</string>
+    <string name="buffer_time">Buffertens utgångstid</string>
+    <string name="buffer_time_descr">Maximal tid att lagra poäng i bufferten</string>
+    <string name="status_widget_title">OsmAnd Tracler status</string>
+    <string name="shared_string_suggested">Förslagen</string>
+    <string name="back_to_osmand">Tillbaka till OsmAnd</string>
+    <string name="duration_ago">%1$s sedan</string>
+    <string name="last_response_duration">Senaste svar: %1$s sedan</string>
+    <string name="last_update_from_telegram_duration">Senaste uppdatering från Telegram: %1$s sedan</string>
+    <string name="last_response_date">Senast response: %1$s</string>
+    <string name="shared_string_error_short">ERR</string>
+    <string name="shared_string_export">Export</string>
+    <string name="logcat_buffer">Logcat buffer</string>
+    <string name="logcat_buffer_descr">Kontrollera och dela detaljerade loggar för appen</string>
+    <string name="send_report">Skicka rapport</string>
 </resources>

OsmAnd/AndroidManifest.xml

@@ -1064,7 +1064,7 @@
 
 		<activity android:name="net.osmand.plus.activities.PrintDialogActivity" />
         <activity android:name=".liveupdates.OsmLiveActivity"
-            android:label="@string/osm_live"/>
+            android:label="@string/purchases"/>
 		<activity android:name=".wikivoyage.explore.WikivoyageExploreActivity">
 
 			<intent-filter>

OsmAnd/build.gradle

@@ -84,14 +84,14 @@ android {
 			manifest.srcFile "AndroidManifest-nightlyFree.xml"
 		}
 		amazonFree {
-			java.srcDirs = ["src-nogms", "src-google"]
+			java.srcDirs = ["src-nogms", "src-amazon"]
 			manifest.srcFile "AndroidManifest-gplayFree.xml"
 		}
 		amazonFull {
-			java.srcDirs = ["src-nogms", "src-google"]
+			java.srcDirs = ["src-nogms", "src-amazon"]
 		}
 		huawei {
-			java.srcDirs = ["src-nogms", "src-google"]
+			java.srcDirs = ["src-nogms", "src-huawei"]
 			manifest.srcFile "AndroidManifest-huawei.xml"
 		}
 

OsmAnd/res/drawable-hdpi/btn_background_active_transparent_light.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@color/switch_button_active_light" />
+	<corners android:radius="4dp" />
+</shape>

OsmAnd/res/drawable/bg_track_gradient.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<gradient
+				android:angle="0"
+				android:startColor="@color/track_gradient_start"
+				android:centerColor="@color/track_gradient_center"
+				android:endColor="@color/track_gradient_end"
+				android:type="linear" />
+		</shape>
+	</item>
+</selector>

OsmAnd/res/drawable/btn_background_active_transparent_dark.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<solid android:color="@color/switch_button_active_dark" />
+	<corners android:radius="4dp" />
+</shape>

OsmAnd/res/drawable/ic_action_at_mail.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="M12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22H17V20H12C7.66,20 4,16.34 4,12C4,7.66 7.66,4 12,4C16.34,4 20,7.66 20,12V13.43C20,14.22 19.29,15 18.5,15C17.71,15 17,14.22 17,13.43V12C17,9.24 14.76,7 12,7C9.24,7 7,9.24 7,12C7,14.76 9.24,17 12,17C13.38,17 14.64,16.44 15.54,15.53C16.19,16.42 17.31,17 18.5,17C20.47,17 22,15.4 22,13.43V12C22,6.48 17.52,2 12,2ZM12,15C10.34,15 9,13.66 9,12C9,10.34 10.34,9 12,9C13.66,9 15,10.34 15,12C15,13.66 13.66,15 12,15Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/ic_action_dialog.xml

@@ -0,0 +1,63 @@
+<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="M22,2V19C22,20.6569 20.6569,22 19,22H5C3.3431,22 2,20.6569 2,19V2H4V18H20V2H22Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,14.2C13,14.0895 13.0895,14 13.2,14H17.8C17.9105,14 18,14.0895 18,14.2V15.8C18,15.9105 17.9105,16 17.8,16H13.2C13.0895,16 13,15.9105 13,15.8V14.2Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,6H9V8H6V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M11,6H18V8H11V6Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M4,4H20V2H4V4Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M4,4H20V18H4V4Z"
+      android:strokeAlpha="0.1"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.1"/>
+  <path
+      android:pathData="M6,9H11V10H6V9Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6,11H7V12H6V11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M12,9H14V10H12V9Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M15,9H18V10H15V9Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M8,11H12V12H8V11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13,11H18V12H13V11Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M6.2,14C6.0895,14 6,14.0895 6,14.2V15.8C6,15.9105 6.0895,16 6.2,16H10.8C10.9105,16 11,15.9105 11,15.8V14.2C11,14.0895 10.9105,14 10.8,14H6.2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>

OsmAnd/res/drawable/ic_action_help_online.xml

@@ -0,0 +1,18 @@
+<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="M2,12C2,16.9406 5.5829,21.0444 10.2922,21.8547C10.1025,21.2707 10,20.6473 10,20C10,17.913 11.0655,16.0749 12.6822,15L11.0001,15L11,11.9338L12.7455,10.8865C13.2136,10.6056 13.5,10.0998 13.5,9.554L13.5,9.25C13.5,8.5597 12.9403,8 12.25,8H12C11.4477,8 11,8.4477 11,9H9C9,7.3432 10.3431,6 12,6H12.25C14.0449,6 15.5,7.4551 15.5,9.25L15.5,9.554C15.4999,10.8024 14.845,11.9592 13.7745,12.6015L13,13.0662L13.0001,14.8027C13.8826,14.2922 14.9072,14 16,14H21.8C21.9311,13.3538 22,12.6849 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,16H17V18H16C14.8954,18 14,18.8954 14,20C14,21.1046 14.8954,22 16,22H17V24H16C13.7909,24 12,22.2091 12,20C12,17.7909 13.7909,16 16,16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M20,22H19V24H20C22.2091,24 24,22.2091 24,20C24,17.7909 22.2091,16 20,16H19V18H20C21.1046,18 22,18.8954 22,20C22,21.1046 21.1046,22 20,22Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M16,20C16,19.4477 16.4477,19 17,19H19C19.5523,19 20,19.4477 20,20C20,20.5523 19.5523,21 19,21H17C16.4477,21 16,20.5523 16,20Z"
+      android:fillColor="#ffffff"/>
+</vector>

OsmAnd/res/drawable/shadow.xml

@@ -9,8 +9,8 @@
             <gradient
                 android:angle="90"
                 android:startColor="#1A000000"
-                android:centerColor="#00FFFFFF"
-                android:endColor="#00FFFFFF" />
+                android:centerColor="#00000000"
+                android:endColor="#00000000" />
 
         </shape>
     </item>
@@ -23,8 +23,8 @@
             <gradient
                 android:angle="90"
                 android:startColor="#0D000000"
-                android:centerColor="#00FFFFFF"
-                android:endColor="#00FFFFFF" />
+                android:centerColor="#00000000"
+                android:endColor="#00000000" />
 
         </shape>
     </item>

OsmAnd/res/layout-land/fragment_measurement_tool.xml

@@ -195,11 +195,13 @@
                 <include
                     android:id="@+id/add_point_button"
                     layout="@layout/bottom_sheet_dialog_button"
-                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_centerVertical="true"
                     android:layout_alignParentEnd="true"
-                    android:layout_alignParentRight="true" />
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:minWidth="@dimen/measurement_tool_button_width" />
+
             </RelativeLayout>
 
             <RelativeLayout
@@ -211,14 +213,15 @@
 
                 <include
                     android:id="@+id/apply_move_point_button"
+                    layout="@layout/bottom_sheet_dialog_button"
+                    android:layout_width="wrap_content"
                     android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_width="@dimen/measurement_tool_button_width"
-                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    layout="@layout/bottom_sheet_dialog_button" />
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                    android:minWidth="@dimen/measurement_tool_button_width" />
 
 
                 <net.osmand.plus.widgets.TextViewEx

OsmAnd/res/layout/bottom_sheet_button_with_icon.xml

@@ -3,14 +3,13 @@
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	tools:background="@drawable/btn_background_inactive_dark">
 
 	<LinearLayout
-		android:id="@+id/button_container"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:clickable="true"
-		android:focusable="true"
+		android:background="?attr/selectableItemBackground"
 		android:gravity="center_vertical"
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
 		android:orientation="horizontal"
@@ -20,7 +19,6 @@
 		android:paddingEnd="@dimen/content_padding_small"
 		android:paddingRight="@dimen/content_padding_small"
 		android:paddingBottom="@dimen/text_margin_small"
-		tools:background="@drawable/btn_background_inactive_dark"
 		tools:ignore="UselessParent">
 
 		<LinearLayout

OsmAnd/res/layout/bottom_sheet_button_with_icon_center.xml

@@ -0,0 +1,46 @@
+<?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/button"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dialog_button_height"
+	android:layout_marginStart="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_gravity="center_vertical"
+		android:gravity="center"
+		android:orientation="horizontal"
+		tools:ignore="UselessParent">
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/button_icon"
+			android:layout_width="@dimen/map_widget_icon"
+			android:layout_height="@dimen/map_widget_icon"
+			android:layout_marginEnd="@dimen/content_padding_small"
+			android:layout_marginRight="@dimen/content_padding_small"
+			android:tint="?attr/active_color_basic"
+			tools:srcCompat="@drawable/ic_action_appearance" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/context_menu_controller_height"
+			android:layout_marginRight="@dimen/context_menu_controller_height"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:textColor="?attr/active_color_basic"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			tools:text="Button" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_preference_switch.xml

@@ -13,11 +13,11 @@
 		android:layout_marginEnd="@dimen/content_padding"
 		android:layout_marginRight="@dimen/content_padding"
 		android:minHeight="@dimen/bottom_sheet_list_item_height"
+		android:paddingStart="@dimen/content_padding"
 		android:paddingLeft="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		tools:background="@drawable/rectangle_rounded_right"
 		android:paddingEnd="@dimen/content_padding"
-		android:paddingStart="@dimen/content_padding">
+		android:paddingRight="@dimen/content_padding"
+		tools:background="@drawable/rectangle_rounded_right">
 
 		<net.osmand.plus.widgets.TextViewEx
 			android:id="@+id/title"
@@ -41,7 +41,8 @@
 			android:background="@null"
 			android:clickable="false"
 			android:focusable="false"
-			android:focusableInTouchMode="false" />
+			android:focusableInTouchMode="false"
+			android:saveEnabled="false" />
 
 	</LinearLayout>
 

OsmAnd/res/layout/bottom_sheet_item_with_descr_and_switch_56dp.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground"
 	android:gravity="center_vertical"
 	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-    android:paddingLeft="@dimen/content_padding"
-    android:paddingRight="@dimen/content_padding"
 	android:paddingStart="@dimen/content_padding"
-	android:paddingEnd="@dimen/content_padding">
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
@@ -19,7 +18,7 @@
 		android:layout_gravity="center_vertical"
 		android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
 		android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
-        tools:src="@drawable/list_destination"/>
+		tools:src="@drawable/list_destination" />
 
 	<LinearLayout
 		android:layout_width="0dp"
@@ -35,7 +34,7 @@
 			android:ellipsize="end"
 			android:maxLines="1"
 			android:textAppearance="@style/TextAppearance.ListItemTitle"
-            tools:text="Some title"/>
+			tools:text="Some title" />
 
 		<TextView
 			android:id="@+id/description"
@@ -45,7 +44,7 @@
 			android:maxLines="2"
 			android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
 			android:textColor="@null"
-            tools:text="Some description"/>
+			tools:text="Some description" />
 	</LinearLayout>
 
 	<androidx.appcompat.widget.SwitchCompat
@@ -53,11 +52,12 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
 		android:layout_marginStart="@dimen/bottom_sheet_content_margin"
+		android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
 		android:background="@null"
 		android:clickable="false"
 		android:focusable="false"
-        android:focusableInTouchMode="false"/>
+		android:focusableInTouchMode="false"
+		android:saveEnabled="false" />
 
 </LinearLayout>

OsmAnd/res/layout/bottom_sheet_item_with_descr_icon_right.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:background="?attr/selectableItemBackground"
+	android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
+	android:paddingStart="@dimen/content_padding"
+	android:paddingLeft="@dimen/content_padding"
+	android:paddingEnd="@dimen/content_padding"
+	android:paddingRight="@dimen/content_padding">
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center_vertical"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_weight="1"
+		android:orientation="vertical">
+
+		<TextView
+			android:id="@+id/title"
+			style="@style/TextAppearance.ListItemTitle"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:maxLines="1"
+			tools:text="Some title" />
+
+		<TextView
+			android:id="@+id/description"
+			style="@style/TextAppearance.ContextMenuSubtitle"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:ellipsize="end"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:maxLines="1"
+			tools:text="Some description" />
+
+	</LinearLayout>
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		tools:src="@drawable/list_destination" />
+
+</LinearLayout>

OsmAnd/res/layout/bottom_sheet_with_switch_divider_and_additional_button.xml

@@ -4,48 +4,58 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:layout_marginStart="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding"
 	android:baselineAligned="false"
 	android:gravity="center_vertical"
-	android:minHeight="@dimen/bottom_sheet_selected_item_title_height">
+	android:minHeight="@dimen/bottom_sheet_list_item_height">
+
+	<androidx.cardview.widget.CardView
+		android:id="@+id/compound_container"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/content_padding_half"
+		android:layout_marginRight="@dimen/content_padding_half"
+		android:layout_weight="1"
+		android:gravity="center_vertical"
+		app:cardCornerRadius="4dp"
+		app:cardElevation="0dp"
+		tools:cardBackgroundColor="?attr/switch_button_active">
 
 		<LinearLayout
-		android:id="@+id/basic_item_body"
-		android:layout_width="0dp"
+			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-		android:layout_weight="1"
 			android:background="?attr/selectableItemBackground"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
+			android:orientation="horizontal">
 
-		<LinearLayout
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginTop="@dimen/context_menu_first_line_top_margin"
+				android:layout_marginBottom="@dimen/context_menu_first_line_top_margin"
 				android:layout_weight="1"
-			android:orientation="vertical">
-
-			<TextView
-				android:id="@+id/title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
 				android:ellipsize="end"
+				android:letterSpacing="@dimen/description_letter_spacing"
 				android:maxLines="1"
-				android:paddingTop="@dimen/content_padding_small"
-				android:paddingBottom="@dimen/content_padding"
-				android:textAppearance="@style/TextAppearance.ListItemTitle"
+				android:textColor="?attr/active_color_basic"
+				android:textSize="@dimen/default_desc_text_size"
+				app:typeface="@string/font_roboto_medium"
 				tools:text="Some title" />
 
-		</LinearLayout>
-
 			<com.google.android.material.switchmaterial.SwitchMaterial
-			android:id="@+id/switch_button"
+				android:id="@+id/compound_button"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical"
 				android:layout_marginStart="@dimen/bottom_sheet_content_margin"
 				android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
+				android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
+				android:layout_marginRight="@dimen/bottom_sheet_content_margin"
 				android:clickable="false"
 				android:focusable="false"
 				android:focusableInTouchMode="false"
@@ -53,22 +63,23 @@
 
 		</LinearLayout>
 
-	<LinearLayout
-		android:id="@+id/additional_button"
+	</androidx.cardview.widget.CardView>
+
+	<androidx.cardview.widget.CardView
+		android:id="@+id/additional_button_container"
 		android:layout_width="wrap_content"
 		android:layout_height="match_parent"
-		android:orientation="horizontal">
+		app:cardCornerRadius="4dp"
+		app:cardElevation="0dp"
+		tools:cardBackgroundColor="?attr/switch_button_active">
 
-		<View
-			android:layout_width="1dp"
+		<FrameLayout
+			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:layout_marginTop="@dimen/content_padding_half"
-			android:layout_marginBottom="@dimen/content_padding_half"
-			android:background="?attr/divider_color_basic" />
+			android:background="?android:attr/selectableItemBackground">
 
 			<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/icon_after_divider"
-			style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+				android:id="@+id/additional_button_icon"
 				android:layout_width="@dimen/favorites_icon_right_margin"
 				android:layout_height="@dimen/favorites_icon_right_margin"
 				android:layout_gravity="center"
@@ -76,8 +87,11 @@
 				android:layout_marginLeft="@dimen/content_padding"
 				android:layout_marginEnd="@dimen/content_padding"
 				android:layout_marginRight="@dimen/content_padding"
-			app:srcCompat="@drawable/ic_action_track_line_bold_color" />
+				app:srcCompat="@drawable/ic_action_track_line_bold_color"
+				tools:tint="?attr/active_color_basic" />
 
-	</LinearLayout>
+		</FrameLayout>
+
+	</androidx.cardview.widget.CardView>
 
 </LinearLayout>

OsmAnd/res/layout/fragment_live_updates.xml

@@ -1,8 +1,49 @@
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/activity_background_color"
+	android:orientation="vertical">
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/app_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical">
+
+		<androidx.appcompat.widget.Toolbar
+			android:id="@+id/toolbar"
+			android:layout_width="match_parent"
+			android:layout_height="@dimen/dashboard_map_toolbar"
+			android:background="?attr/pstsTabBackground"
+			android:minHeight="@dimen/dashboard_map_toolbar"
+			android:theme="?attr/toolbar_theme"
+			app:contentInsetEnd="0dp"
+			app:contentInsetLeft="@dimen/settings_divider_margin_start"
+			app:contentInsetRight="0dp"
+			app:contentInsetStart="@dimen/settings_divider_margin_start">
+
+			<ImageButton
+				android:id="@+id/toolbar_action"
+				android:layout_width="@dimen/standard_icon_size"
+				android:layout_height="@dimen/standard_icon_size"
+				android:layout_gravity="end"
+				android:layout_marginTop="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/content_padding"
+				android:layout_marginRight="@dimen/content_padding"
+				android:layout_marginBottom="@dimen/content_padding"
+				android:background="@null"
+				android:contentDescription="@string/shared_string_help"
+				tools:src="@drawable/ic_action_help" />
+
+		</androidx.appcompat.widget.Toolbar>
+
+		<include layout="@layout/preference_toolbar_switch" />
+
+		<include layout="@layout/list_item_import" />
+
+	</com.google.android.material.appbar.AppBarLayout>
 
 	<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 		android:id="@+id/swipe_refresh"
@@ -19,18 +60,8 @@
 			android:groupIndicator="@null"
 			android:headerDividersEnabled="false"
 			android:orientation="vertical"
-			tools:context=".liveupdates.LiveUpdatesFragment" />
+			tools:context=".liveupdates.LiveUpdatesFragmentNew" />
 
 	</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:layout_gravity="top"
-        android:indeterminate="true"
-        android:padding="0dp"
-        android:visibility="invisible"/>
-
-</FrameLayout>
+</LinearLayout>

OsmAnd/res/layout/fragment_measurement_tool.xml

@@ -233,14 +233,15 @@
 
             <include
                 android:id="@+id/apply_move_point_button"
+                layout="@layout/bottom_sheet_dialog_button"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_width="@dimen/measurement_tool_button_width"
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                layout="@layout/bottom_sheet_dialog_button" />
+                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                android:minWidth="@dimen/measurement_tool_button_width" />
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_move_point_button"

OsmAnd/res/layout/gpx_item_altitude.xml

@@ -52,7 +52,7 @@
 	</LinearLayout>
 
 	<LinearLayout
-		android:id="@+id/average_range"
+		android:id="@+id/top_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -171,7 +171,7 @@
 	</LinearLayout>
 
 	<LinearLayout
-		android:id="@+id/ascent_descent"
+		android:id="@+id/bottom_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -273,6 +273,7 @@
 	</LinearLayout>
 
 	<View
+		android:id="@+id/details_divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:background="?attr/dashboard_divider" />

OsmAnd/res/layout/gpx_item_general.xml

@@ -52,7 +52,7 @@
 	</LinearLayout>
 
 	<LinearLayout
-		android:id="@+id/distance_time_span"
+		android:id="@+id/top_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -171,7 +171,7 @@
 	</LinearLayout>
 
 	<LinearLayout
-		android:id="@+id/start_end_time"
+		android:id="@+id/bottom_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -291,6 +291,7 @@
 	</LinearLayout>
 
 	<View
+		android:id="@+id/details_divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:background="?attr/dashboard_divider" />

OsmAnd/res/layout/gpx_item_speed.xml

@@ -52,7 +52,7 @@
 	</LinearLayout>
 
 	<LinearLayout
-		android:id="@+id/average_max"
+		android:id="@+id/top_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -172,7 +172,7 @@
 
 
 	<LinearLayout
-		android:id="@+id/time_distance"
+		android:id="@+id/bottom_line_blocks"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
@@ -275,6 +275,7 @@
 	</LinearLayout>
 
 	<View
+		android:id="@+id/details_divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
 		android:background="?attr/dashboard_divider" />

OsmAnd/res/layout/gpx_list_item_tab_content.xml

@@ -4,7 +4,9 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
 
-	<include layout="@layout/list_item_divider" />
+	<include
+		android:id="@+id/list_item_divider"
+		layout="@layout/list_item_divider" />
 
 	<LinearLayout
 		android:layout_width="match_parent"

OsmAnd/res/layout/gradient_card.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="@dimen/content_padding"
+	android:paddingStart="@dimen/content_padding"
+	android:paddingEnd="@dimen/content_padding">
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/pages_item_size"
+		android:layout_marginBottom="@dimen/content_padding_half"
+		android:background="@drawable/bg_track_gradient" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/min_value"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:textColor="?attr/main_font_color_basic"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular"
+			tools:text="100 m"/>
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/max_value"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:gravity="end"
+			android:textColor="?attr/main_font_color_basic"
+			android:textSize="@dimen/default_list_text_size"
+			osmand:typeface="@string/font_roboto_regular"
+			tools:text="100 m"/>
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/list_group_title_with_right_descr.xml

@@ -0,0 +1,57 @@
+<?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="@dimen/context_menu_action_buttons_height"
+	android:clickable="false"
+	android:orientation="vertical">
+
+	<include layout="@layout/card_bottom_divider" />
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1" />
+
+	<include layout="@layout/card_top_divider" />
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/setting_list_item_small_height"
+		android:layout_gravity="center_vertical"
+		android:background="?attr/bg_color"
+		android:gravity="center_vertical|start"
+		android:orientation="horizontal"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding_small_half">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			style="@style/TextAppearance.ListItemCategoryTitle"
+			android:layout_width="0dp"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			tools:text="@string/available_maps" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/description"
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			android:paddingStart="@dimen/subHeaderMarginLeft"
+			android:paddingLeft="@dimen/subHeaderMarginLeft"
+			android:paddingEnd="0dp"
+			android:paddingRight="0dp"
+			android:textSize="@dimen/default_desc_text_size"
+			tools:text="2/6"
+			tools:textColor="@color/text_color_secondary_dark" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/layout/list_item_import.xml

@@ -13,6 +13,7 @@
 		android:layout_height="wrap_content">
 
 		<LinearLayout
+			android:id="@+id/item_import_container"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:background="?attr/selectableItemBackground"

OsmAnd/res/layout/list_item_single_line_descrition_narrow.xml

@@ -21,6 +21,7 @@
         android:layout_marginStart="@dimen/content_padding">
 
         <LinearLayout
+            android:id="@+id/text_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="@dimen/context_menu_action_buttons_height"

OsmAnd/res/layout/list_item_triple_row_icon_and_menu.xml

@@ -0,0 +1,95 @@
+<?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:background="?attr/bg_color"
+	android:gravity="center_vertical"
+	android:minHeight="@dimen/setting_list_item_large_height"
+	tools:layout_height="@dimen/list_item_triple_row_height">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/icon"
+		android:layout_width="@dimen/standard_icon_size"
+		android:layout_height="@dimen/standard_icon_size"
+		android:layout_gravity="center_vertical"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		tools:src="@drawable/ic_action_info_dark"
+		tools:tint="@color/icon_color_osmand_light" />
+
+	<LinearLayout
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_weight="1"
+		android:orientation="horizontal">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:lines="1"
+				android:textAppearance="@style/TextAppearance.ListItemTitle"
+				tools:text="Title" />
+
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/sub_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:lines="1"
+				android:textColor="?attr/active_color_basic"
+				android:textSize="@dimen/default_desc_text_size"
+				tools:text="Sub" />
+
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/description"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:lines="1"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/default_desc_text_size"
+				tools:text="Description" />
+
+		</LinearLayout>
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/secondary_icon"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_gravity="center_vertical"
+			android:layout_marginStart="@dimen/content_padding"
+			android:layout_marginLeft="@dimen/content_padding"
+			app:srcCompat="@drawable/ic_action_additional_option"
+			app:tint="?attr/default_icon_color" />
+
+	</LinearLayout>
+
+	<androidx.appcompat.widget.SwitchCompat
+		android:id="@+id/compound_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:focusable="false"
+		tools:checked="true" />
+
+</LinearLayout>

OsmAnd/res/layout/main.xml

@@ -48,6 +48,11 @@
             <include layout="@layout/map_hud_top"
                 android:id="@+id/MapHudButtonsOverlayTop"/>
 
+            <FrameLayout
+                android:id="@+id/left_side_menu"
+                android:layout_width="0dp"
+                android:layout_height="0dp"/>
+
             <include layout="@layout/map_hud_bottom"
                 android:id="@+id/MapHudButtonsOverlayBottom"/>
 

OsmAnd/res/layout/osm_live_banner_list_item.xml

@@ -1,32 +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="fill_parent"
-	android:layout_height="wrap_content"
-	android:descendantFocusability="blocksDescendants"
-	android:minHeight="@dimen/list_item_height"
-	android:paddingTop="@dimen/content_padding_half"
-	android:paddingBottom="@dimen/content_padding_half"
-	android:orientation="vertical">
-
-    <LinearLayout
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:background="?attr/list_background_color"
 	android:minHeight="@dimen/list_item_height"
-        android:paddingLeft="@dimen/list_content_padding"
-        android:paddingRight="@dimen/list_content_padding"
+	android:orientation="horizontal"
 	android:paddingStart="@dimen/list_content_padding"
-	    android:paddingEnd="@dimen/list_content_padding">
+	android:paddingLeft="@dimen/list_content_padding"
+	android:paddingTop="@dimen/content_padding"
+	android:paddingEnd="@dimen/list_content_padding"
+	android:paddingRight="@dimen/list_content_padding"
+	android:paddingBottom="@dimen/content_padding">
 
 	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/icon"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_marginEnd="@dimen/favorites_icon_right_margin"
 		android:layout_marginRight="@dimen/favorites_icon_right_margin"
-            android:paddingTop="6dp"
-            android:tint="@color/map_widget_blue"
-            osmand:srcCompat="@drawable/ic_action_osm_live"
-	        android:layout_marginEnd="@dimen/favorites_icon_right_margin" />
+		osmand:srcCompat="@drawable/ic_action_subscription_osmand_live" />
 
 	<LinearLayout
 		android:layout_width="0dp"
@@ -39,39 +33,65 @@
 			android:id="@+id/title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:text="@string/osm_live"
 			android:textColor="?android:textColorPrimary"
-                android:textSize="@dimen/default_list_text_size"
-                android:text="@string/osm_live"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+			android:textSize="@dimen/default_list_text_size" />
 
 		<TextView
 			android:id="@+id/description"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:maxLines="25"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/default_sub_text_size"
-                    android:text="@string/osm_live_banner_desc"/>
-
-            </LinearLayout>
-
-            <TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="6dp"
-                android:textColor="?attr/color_dialog_buttons"
-                android:textAllCaps="true"
-                android:textSize="@dimen/default_desc_text_size"
-                android:text="@string/get_it"/>
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:maxLines="25"
+			android:text="@string/osm_live_banner_desc"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_desc_text_size" />
+
+		<androidx.cardview.widget.CardView
+			android:id="@+id/card_view"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:layout_marginTop="@dimen/content_padding_small"
+			osmand:cardCornerRadius="3dp"
+			osmand:cardElevation="0dp"
+			tools:cardBackgroundColor="@color/active_buttons_and_links_trans_dark">
+
+			<LinearLayout
+				android:id="@+id/card_container"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/selectableItemBackground"
+				android:gravity="center_vertical"
+				android:minHeight="@dimen/dialog_button_height"
+				android:orientation="horizontal"
+				android:paddingStart="@dimen/content_padding_small"
+				android:paddingLeft="@dimen/content_padding_small"
+				android:paddingEnd="@dimen/content_padding_half"
+				android:paddingRight="@dimen/content_padding_half">
+
+				<TextView
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:letterSpacing="@dimen/description_letter_spacing"
+					android:text="@string/get_it"
+					android:textColor="?attr/colorPrimary"
+					android:textSize="@dimen/default_desc_text_size" />
+
+				<androidx.appcompat.widget.AppCompatImageView
+					android:id="@+id/additional_button_icon"
+					android:layout_width="@dimen/standard_icon_size"
+					android:layout_height="@dimen/standard_icon_size"
+					android:layout_marginStart="@dimen/content_padding_small"
+					android:layout_marginLeft="@dimen/content_padding_small"
+					android:tint="?attr/active_color_basic"
+					osmand:srcCompat="@drawable/ic_arrow_forward" />
 
 			</LinearLayout>
 
+		</androidx.cardview.widget.CardView>
+
 	</LinearLayout>
 
 </LinearLayout>

OsmAnd/res/layout/preference_button_with_icon.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView 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="wrap_content"
+	android:layout_height="wrap_content"
+	android:minWidth="@dimen/context_menu_top_right_button_min_width"
+	android:minHeight="@dimen/setting_list_item_large_height"
+	app:cardCornerRadius="4dp"
+	app:cardElevation="0dp"
+	tools:cardBackgroundColor="?attr/switch_button_active">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="?attr/selectableItemBackground"
+		android:gravity="center"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height"
+		android:orientation="vertical">
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/icon"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_marginTop="@dimen/content_padding_small"
+			android:layout_marginBottom="@dimen/content_padding_small_half"
+			tools:srcCompat="@drawable/ic_action_close"
+			tools:tint="?attr/active_color_basic" />
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="@dimen/content_padding_small_half"
+			android:layout_marginLeft="@dimen/content_padding_small_half"
+			android:layout_marginEnd="@dimen/content_padding_small_half"
+			android:layout_marginRight="@dimen/content_padding_small_half"
+			android:layout_marginBottom="@dimen/content_padding_small_half"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			app:typeface="@string/font_roboto_medium"
+			tools:text="Title"
+			tools:textColor="?attr/active_color_basic" />
+
+	</LinearLayout>
+
+</androidx.cardview.widget.CardView>

OsmAnd/res/layout/preference_button_with_icon_quadruple.xml

@@ -0,0 +1,57 @@
+<?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:layout_marginStart="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding"
+	android:baselineAligned="false"
+	android:minHeight="@dimen/setting_list_item_large_height"
+	android:orientation="horizontal">
+
+	<include
+		android:id="@+id/button_left"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+	<include
+		android:id="@+id/button_center_left"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_weight="1"
+		android:layout_marginStart="@dimen/content_padding_half"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+	<include
+		android:id="@+id/button_center_right"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/content_padding_half"
+		android:layout_weight="1"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+	<include
+		android:id="@+id/button_right"
+		android:layout_weight="1"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/content_padding_half"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+</LinearLayout>

OsmAnd/res/layout/preference_button_with_icon_triple.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_marginStart="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding"
+	android:baselineAligned="false"
+	android:minHeight="@dimen/setting_list_item_large_height"
+	android:orientation="horizontal">
+
+	<include
+		android:id="@+id/button_left"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+	<include
+		android:id="@+id/button_center"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="0dp"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/content_padding_half"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:layout_weight="1"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+	<include
+		android:id="@+id/button_right"
+		layout="@layout/preference_button_with_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_marginStart="@dimen/content_padding_half"
+		android:layout_marginLeft="@dimen/content_padding_half"
+		android:minWidth="@dimen/context_menu_top_right_button_min_width"
+		android:minHeight="@dimen/setting_list_item_large_height" />
+
+</LinearLayout>

OsmAnd/res/layout/track_coloring_card.xml

@@ -20,9 +20,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
-		android:paddingTop="@dimen/context_menu_padding_margin_tiny"
-		android:paddingBottom="@dimen/content_padding"
-		android:visibility="gone">
+		android:paddingTop="@dimen/context_menu_buttons_padding_bottom">
 
 		<androidx.recyclerview.widget.RecyclerView
 			android:id="@+id/recycler_view"
@@ -41,15 +39,4 @@
 
 	</LinearLayout>
 
-	<net.osmand.plus.widgets.FlowLayout
-		android:id="@+id/select_color"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/context_menu_padding_margin_tiny"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding_half" />
-
 </LinearLayout>

OsmAnd/res/layout/track_width_card.xml

@@ -45,7 +45,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		android:paddingBottom="@dimen/content_padding">
+		android:paddingBottom="@dimen/favorites_select_group_button_height">
 
 		<LinearLayout
 			android:layout_width="match_parent"

OsmAnd/res/layout/trip_recording_active_fragment.xml

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:gravity="center_vertical"
-		android:orientation="horizontal"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingTop="@dimen/content_padding_small"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding"
-		android:paddingBottom="@dimen/content_padding_small"
-		android:weightSum="2">
-
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/title"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:letterSpacing="@dimen/text_button_letter_spacing"
-			android:text="@string/monitoring_settings"
-			android:textSize="@dimen/default_list_text_size"
-			osmand:typeface="@string/font_roboto_medium" />
-
-		<LinearLayout
-			android:id="@+id/status_container"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:clickable="true"
-			android:focusable="true"
-			android:gravity="end|center_vertical"
-			android:orientation="horizontal">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/text_status"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:letterSpacing="@dimen/description_letter_spacing"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:text="@string/recording_default_name"
-				tools:textColor="@color/icon_color_osmand_light" />
-
-			<androidx.appcompat.widget.AppCompatImageView
-				android:id="@+id/icon_status"
-				android:layout_width="@dimen/map_widget_icon"
-				android:layout_height="@dimen/map_widget_icon"
-				android:layout_marginStart="@dimen/content_padding_small"
-				android:layout_marginLeft="@dimen/content_padding_small"
-				tools:srcCompat="@drawable/ic_action_polygom_dark"
-				tools:tint="@color/icon_color_osmand_light" />
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<androidx.recyclerview.widget.RecyclerView
-		android:id="@+id/block_statistics"
-		android:layout_width="match_parent"
-		android:layout_height="@dimen/list_header_height"
-		android:layout_marginTop="@dimen/content_padding_small_half"
-		android:clipToPadding="false"
-		android:orientation="horizontal"
-		tools:itemCount="4"
-		tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-		tools:listitem="@layout/item_gpx_stat_block" />
-
-	<include
-		android:id="@+id/show_track_on_map"
-		layout="@layout/bottom_sheet_with_switch_divider_and_additional_button"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding_half"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding" />
-
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/dashboard_divider" />
-
-	<include
-		android:id="@+id/button_clear"
-		layout="@layout/bottom_sheet_button_with_icon"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding" />
-
-	<include
-		android:id="@+id/button_online"
-		layout="@layout/bottom_sheet_button_with_icon"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding_half"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:visibility="gone" />
-
-	<include
-		android:id="@+id/button_segment"
-		layout="@layout/bottom_sheet_button_with_icon"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding_half"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding" />
-
-	<include
-		android:id="@+id/button_save"
-		layout="@layout/bottom_sheet_button_with_icon"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding_small"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding" />
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding_half"
-		android:layout_marginEnd="@dimen/content_padding"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/content_padding"
-		android:baselineAligned="false"
-		android:orientation="horizontal"
-		android:weightSum="2">
-
-		<include
-			android:id="@+id/button_pause"
-			layout="@layout/bottom_sheet_button_with_icon"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_weight="1" />
-
-		<include
-			android:id="@+id/button_stop"
-			layout="@layout/bottom_sheet_button_with_icon"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:layout_marginStart="@dimen/content_padding"
-			android:layout_marginLeft="@dimen/content_padding"
-			android:layout_weight="1" />
-
-	</LinearLayout>
-
-</LinearLayout>

OsmAnd/res/layout/trip_recording_fragment.xml

@@ -1,117 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:orientation="vertical">
+	android:orientation="vertical"
+	android:paddingBottom="@dimen/content_padding">
 
-	<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/title"
+	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:gravity="center_vertical"
+		android:orientation="horizontal"
 		android:paddingStart="@dimen/content_padding"
 		android:paddingLeft="@dimen/content_padding"
 		android:paddingTop="@dimen/content_padding_small"
 		android:paddingEnd="@dimen/content_padding"
 		android:paddingRight="@dimen/content_padding"
-		android:paddingBottom="@dimen/content_padding_small"
+		android:paddingBottom="@dimen/content_padding"
+		android:weightSum="2">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/title"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
 			android:text="@string/monitoring_settings"
 			android:textSize="@dimen/default_list_text_size"
 			osmand:typeface="@string/font_roboto_medium" />
 
-	<include
-		android:id="@+id/show_track_on_map"
-		layout="@layout/bottom_sheet_with_switch_divider_and_additional_button" />
-
-	<View
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/dashboard_divider" />
-
 		<LinearLayout
-		android:id="@+id/interval_view_container"
-		android:background="?attr/selectableItemBackground"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_gravity="center_vertical"
+			android:id="@+id/status_container"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
 			android:layout_weight="1"
-		android:orientation="horizontal"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingTop="@dimen/bottom_sheet_content_margin"
-		android:paddingBottom="@dimen/bottom_sheet_content_margin"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
+			android:clickable="true"
+			android:focusable="true"
+			android:gravity="end|center_vertical"
+			android:orientation="horizontal">
 
 			<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/interval_value"
-			android:layout_width="0dp"
+				android:id="@+id/text_status"
+				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:ellipsize="end"
-			android:maxLines="1"
-			android:textSize="@dimen/default_list_text_size"
-			tools:text="Interval value" />
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:textSize="@dimen/default_desc_text_size"
+				osmand:typeface="@string/font_roboto_medium"
+				tools:text="@string/recording_default_name"
+				tools:textColor="@color/icon_color_osmand_light" />
 
 			<androidx.appcompat.widget.AppCompatImageView
-			android:id="@+id/up_down_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:background="@null"
-			app:srcCompat="@drawable/ic_action_arrow_down" />
+				android:id="@+id/icon_status"
+				android:layout_width="@dimen/map_widget_icon"
+				android:layout_height="@dimen/map_widget_icon"
+				android:layout_marginStart="@dimen/content_padding_small"
+				android:layout_marginLeft="@dimen/content_padding_small"
+				tools:srcCompat="@drawable/ic_action_polygom_dark"
+				tools:tint="@color/icon_color_osmand_light" />
+
 		</LinearLayout>
 
+	</LinearLayout>
+
+	<include
+		android:id="@+id/show_track_on_map"
+		layout="@layout/bottom_sheet_with_switch_divider_and_additional_button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="@dimen/content_padding"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginEnd="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/context_menu_padding_margin_small" />
+
 	<LinearLayout
-		android:id="@+id/always_ask_and_range_slider_container"
+		android:id="@+id/segments_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:orientation="vertical"
-		android:paddingStart="@dimen/content_padding"
-		android:paddingLeft="@dimen/content_padding"
-		android:paddingEnd="@dimen/content_padding"
-		android:paddingRight="@dimen/content_padding">
+		android:orientation="vertical" />
 
-		<com.google.android.material.slider.RangeSlider
-			android:id="@+id/interval_slider"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:contentDescription="@string/save_track_interval_globally"
-			android:stepSize="1"
-			app:haloRadius="@dimen/content_padding_small"
-			app:labelBehavior="gone"
-			app:thumbColor="@color/profile_icon_color_blue_light"
-			app:thumbRadius="@dimen/content_padding_small_half"
-			app:trackColorActive="@color/profile_icon_color_blue_light"
-			app:trackColorInactive="#4D007EB3"
-			app:tickColorInactive="#007EB3"
-			app:trackHeight="@dimen/slider_track_height"
-			tools:visibility="visible" />
-
-		<androidx.appcompat.widget.SwitchCompat
-			android:id="@+id/confirm_every_run"
+	<androidx.recyclerview.widget.RecyclerView
+		android:id="@+id/block_statistics"
 		android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:letterSpacing="@dimen/text_button_letter_spacing"
-			android:minHeight="@dimen/context_menu_buttons_bottom_height"
-			android:paddingLeft="@dimen/content_padding_small"
-			android:paddingRight="@dimen/content_padding_small"
-			android:text="@string/confirm_every_run"
-			android:textColor="?attr/color_dialog_buttons"
-			android:textSize="@dimen/default_list_text_size"
-			osmand:typeface="@string/font_roboto_regular"
-			tools:visibility="visible" />
-	</LinearLayout>
+		android:layout_height="@dimen/list_header_height"
+		android:layout_marginTop="@dimen/content_padding_small_half"
+		android:layout_marginBottom="@dimen/dialog_content_margin"
+		android:clipToPadding="false"
+		android:orientation="horizontal"
+		tools:itemCount="4"
+		tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+		tools:listitem="@layout/item_gpx_stat_block" />
 
-	<View
-		android:id="@+id/second_divider"
-		android:layout_width="match_parent"
-		android:layout_height="1dp"
-		android:background="?attr/dashboard_divider" />
+	<include layout="@layout/preference_button_with_icon_quadruple" />
 
 </LinearLayout>
-
-
-

OsmAnd/res/layout/trip_recording_starting_fragment.xml

@@ -0,0 +1,111 @@
+<?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:paddingBottom="@dimen/content_padding">
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/title"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:letterSpacing="@dimen/text_button_letter_spacing"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding_small"
+		android:text="@string/monitoring_settings"
+		android:textSize="@dimen/default_list_text_size"
+		app:typeface="@string/font_roboto_medium" />
+
+	<include
+		android:id="@+id/show_track_on_map"
+		layout="@layout/bottom_sheet_with_switch_divider_and_additional_button" />
+
+	<View
+		android:layout_width="match_parent"
+		android:layout_height="1dp"
+		android:layout_marginTop="@dimen/content_padding"
+		android:background="?attr/dashboard_divider" />
+
+	<LinearLayout
+		android:id="@+id/interval_view_container"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="1"
+		android:background="?attr/selectableItemBackground"
+		android:orientation="horizontal"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/bottom_sheet_content_margin"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/bottom_sheet_content_margin">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/interval_value"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:ellipsize="end"
+			android:maxLines="1"
+			android:textSize="@dimen/default_list_text_size"
+			tools:text="Interval value" />
+
+		<androidx.appcompat.widget.AppCompatImageView
+			android:id="@+id/up_down_button"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:background="@null"
+			app:srcCompat="@drawable/ic_action_arrow_down" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/always_ask_and_range_slider_container"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingStart="@dimen/content_padding"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingEnd="@dimen/content_padding"
+		android:paddingRight="@dimen/content_padding">
+
+		<com.google.android.material.slider.RangeSlider
+			android:id="@+id/interval_slider"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:contentDescription="@string/save_track_interval_globally"
+			android:stepSize="1"
+			app:haloRadius="@dimen/content_padding_small"
+			app:labelBehavior="gone"
+			app:thumbColor="@color/profile_icon_color_blue_light"
+			app:thumbRadius="@dimen/content_padding_small_half"
+			app:tickColorInactive="#007EB3"
+			app:trackColorActive="@color/profile_icon_color_blue_light"
+			app:trackColorInactive="#4D007EB3"
+			app:trackHeight="@dimen/slider_track_height"
+			tools:visibility="visible" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:paddingBottom="@dimen/content_padding_small"
+			android:letterSpacing="@dimen/description_letter_spacing"
+			android:text="@string/trip_recording_logging_interval_info"
+			android:textColor="?attr/dialog_text_description_color" />
+
+	</LinearLayout>
+
+	<Space
+		android:layout_width="match_parent"
+		android:layout_height="@dimen/context_menu_first_line_top_margin" />
+
+	<include layout="@layout/preference_button_with_icon_triple" />
+
+</LinearLayout>

OsmAnd/res/values-ar/phrases.xml

@@ -824,7 +824,7 @@
     <string name="poi_craft_sculptor">نحات</string>
     <string name="poi_craft_shoemaker">إسكافي</string>
     <string name="poi_craft_tiler">مبلط</string>
-    <string name="poi_sinkhole">حفرة</string>
+    <string name="poi_sinkhole">دِحل/خفس/هبوط أرضي</string>
     <string name="poi_water">ماء</string>
     <string name="poi_wetland">أراضي رطبة</string>
     <string name="poi_wood">خشب و غابة</string>
@@ -3689,4 +3689,18 @@
     <string name="poi_denomination_united_methodist">الكنيسة الميثودية</string>
     <string name="poi_denomination_pentecostal">الخمسينية</string>
     <string name="poi_denomination_presbyterian">المشيخية</string>
+    <string name="poi_conference_centre">مركز مؤتمرات</string>
+    <string name="poi_mobile_library">موقف المكتبة المتنقلة</string>
+    <string name="poi_summit_register_no">تسجيل للوصول للقمة: لا</string>
+    <string name="poi_summit_register_yes">تسجيل للوصول للقمة: نعم</string>
+    <string name="poi_piste_status_closed">حالة الزحلقة: مغلقة</string>
+    <string name="poi_piste_status_open">حالة الزحلقة: مفتوحة</string>
+    <string name="poi_patrolled_no">محروس : لا</string>
+    <string name="poi_patrolled_yes">محروس: نعم</string>
+    <string name="poi_gladed_yes">التزلج عبر الأشجار</string>
+    <string name="poi_piste_name">اسم الزحلقة</string>
+    <string name="poi_piste_ski_jump">القفز على الجليد</string>
+    <string name="poi_geodesist">الجيوديسيا (شكل الأرض ومساحتها)</string>
+    <string name="poi_local_ref">المرجع المحلي</string>
+    <string name="poi_piste">الزحلقه</string>
 </resources>

OsmAnd/res/values-ar/strings.xml

@@ -2302,7 +2302,6 @@
     <string name="relief_smoothness_factor_descr">التضاريس المفضلة : مسطحة أو تلال.</string>
     <string name="shared_string_slope">الانحدار</string>
     <string name="shared_string_move">نقل</string>
-
     <string name="rendering_attr_depthContours_description">إظهار نقاط ومعالم العمق.</string>
     <string name="auto_split_recording_descr">بدء مقطع جديدة بعد فارق 6 دقائق، مسار جديد بعد فارق 2 ساعة، أو ملف جديد بعد فارق أطول إذا تغير التاريخ.</string>
     <string name="shared_string_paused">متوقف مؤقتاً</string>
@@ -4074,4 +4073,45 @@
     <string name="activity_type_offroad_name">الطرق الوعرة</string>
     <string name="activity_type_motorbike_name">دراجة نارية</string>
     <string name="activity_type_car_name">سيارة</string>
+    <string name="copy_poi_name">نسخ اسم POI</string>
+    <string name="select_another_colorization">الرجاء اختيار أنواع أخرى من التلوين</string>
+    <string name="snap_to_road_descr">سيتم التقاط الرمز إلى مسار التنقل الحالي</string>
+    <string name="select_segments">حدد الجزء</string>
+    <string name="select_segments_description">%1$s يحتوي على أكثر من مقطع ، تحتاج إلى تحديد الجزء المطلوب للتنقل.</string>
+    <string name="segments_count">الجزء %1$d</string>
+    <string name="temporary_conditional_routing_descr">استخدم قيود الطريق النشطة الآن على الخريطة</string>
+    <string name="routing_attr_short_way_description">الطريق الأقصر الأمثل (توفير الطاقة)</string>
+    <string name="routing_attr_driving_style_description">حدد غرض القيادة للحصول على مسار أقصر أو أسرع أو أكثر أمانًا</string>
+    <string name="map_orientation_threshold_descr">إذا كانت السرعة أقل من الحد ، لا تقم بتدويرالخريطة</string>
+    <string name="restart">إعادة التشغيل</string>
+    <string name="shared_strings_all_regions">كل المناطق</string>
+    <string name="delete_number_files_question">حذف %1$d ملفات؟</string>
+    <string name="track_recording_stop_without_saving">توقف بدون حفظ</string>
+    <string name="track_recording_save_and_stop">حفظ و إيقاف التسجيل</string>
+    <string name="track_recording_title">توقف تسجيل المسار</string>
+    <string name="track_recording_description">هل أنت متأكد أنك تريد إيقاف التسجيل؟
+\nستفقد جميع البيانات غير المحفوظة.</string>
+    <string name="on_pause">عند الإيقاف المؤقت</string>
+    <string name="app_restart_required">يلزم إعادة تشغيل التطبيق لتطبيق بعض الإعدادات.</string>
+    <string name="routing_attr_height_obstacles_description">التوجيه يمكن أن يتجنب المرتفعات القوية.</string>
+    <string name="quick_action_coordinates_widget_descr">تبديل لإظهار أو إخفاء أداة الإحداثيات على الخريطة.</string>
+    <string name="map_widget_distance_by_tap">المسافة عن طريق الضغط</string>
+    <string name="latest_openstreetmap_update">آخر تحديث خريطة الشارع المفتوح المتاحة:</string>
+    <string name="updated">تحديث: %s</string>
+    <string name="last_time_checked">آخر مرة تم التحقق منها: %s</string>
+    <string name="update_frequency">معدل التحديث</string>
+    <string name="live_update_frequency_week_variant">سيتم فحص تحديثات الخريطة كل أسبوع. المرة القادمة %1$s في %2$s.</string>
+    <string name="live_update_frequency_day_variant">سيتم التحقق من تحديثات الخرائط كل يوم. في المرة القادمة%1$s في %2$s.</string>
+    <string name="live_update_frequency_hour_variant">سيتم التحقق من تحديثات الخرائط كل ساعة. في المرة القادمة%1$s في %2$s.</string>
+    <string name="live_update_delete_updates_msg">هل أنت متأكد من أنك تريد حذف كافة %s التحديثات المباشرة؟</string>
+    <string name="delete_updates">حذف التحديثات</string>
+    <string name="purchases">المشتريات</string>
+    <string name="select_category_descr">حدد فئة أو أضف فئة جديدة</string>
+    <string name="track_recording_will_be_continued">سيستمر التسجيل.</string>
+    <string name="quick_action_show_hide_title">إظهار/ إخفاء</string>
+    <string name="shared_string_interval">الفاصل الزمني</string>
+    <string name="track_has_no_altitude">لا يحتوي المسار على بيانات الارتفاع.</string>
+    <string name="track_has_no_speed">لا يحتوي المسار على بيانات السرعة.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">إخفاء المحميات الطبيعية والمناطق المحمية وحدود المتنزهات الوطنية</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">حدود الطبيعة</string>
 </resources>

OsmAnd/res/values-be/phrases.xml

@@ -3832,7 +3832,7 @@
     <string name="poi_embassy_filter">Амбасада</string>
     <string name="poi_embassy_high_commission">Вярхоўны камісарыят</string>
     <string name="poi_embassy_delegation">Дэлегацыя</string>
-    <string name="poi_embassy_branch_embassy">Аддзяленне</string>
+    <string name="poi_embassy_branch_embassy">Філіял</string>
     <string name="poi_embassy_yes">На чале з амбасадарам</string>
     <string name="poi_diplomatic_liaison">Сувязь</string>
     <string name="poi_diplomatic_embassy">Амбасада</string>
@@ -3841,4 +3841,22 @@
     <string name="poi_parking_sheds">Навесы</string>
     <string name="poi_parking_rooftop">Дах</string>
     <string name="poi_gpx_point">Пункт GPX</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Не</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Так</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Не</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Так</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Не</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Так</string>
+    <string name="poi_liaison_subnational">Субнацыянальны</string>
+    <string name="poi_liaison_representative_office">Прадстаўніцтва</string>
+    <string name="poi_liaison_liaison_office">Офіс</string>
+    <string name="poi_consulate_honorary_consul">Ганаровы консул</string>
+    <string name="poi_consulate_consulate_general">Генеральнае консульства</string>
+    <string name="poi_consulate_consular_office">Консульскі офіс</string>
+    <string name="poi_consulate_consular_agency">Консульскае агенцтва</string>
+    <string name="poi_consulate_yes">На чале з консулам</string>
+    <string name="poi_embassy_residence">Рэзідэнцыя</string>
+    <string name="poi_embassy_nunciature">Нунцыятура</string>
+    <string name="poi_embassy_mission">Місія</string>
+    <string name="poi_embassy_interests_section">Аддзел інтарэсаў</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -514,7 +514,7 @@
     <string name="use_fluorescent_overlays">Флюарэсцэнтныя пласты</string>
     <string name="use_fluorescent_overlays_descr">Ужываць флюарэсцэнтныя колеры для слядоў і шляхоў.</string>
     <string name="offline_edition">Пазасеціўнае рэдагаванне</string>
-    <string name="offline_edition_descr">Калі выкарыстоўваецца рэдагаванне на прыладзе, то змены будуць захаваныя лакальна і загружаныя на сервер толькі па запыце, інакш яны будуць загружацца неадкладна.</string>
+    <string name="offline_edition_descr">Калі ўключана пазасеціўнае рэдагаванне, то змены будуць захоўвацца на прыладзе і адпраўляцца на сервер толькі па запыце, інакш будуць адпраўляцца неадкладна.</string>
     <string name="update_poi_does_not_change_indexes">Змены цікавых пунктаў (POI) у праграме не паўплываюць на cпампаваныя файлы мапаў, змены захоўваюцца як файлы на вашай прыладзе.</string>
     <string name="local_openstreetmap_uploading">Запампоўка…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/нататкі запампаваныя</string>
@@ -1355,7 +1355,7 @@
     <string name="no_internet_connection">Немагчыма спампаваць. Калі ласка, праверце вашае Інтэрнэт-злучэнне.</string>
     <string name="download_tab_downloads">Усе спампоўкі</string>
     <string name="download_tab_updates">Абнаўленні</string>
-    <string name="download_tab_local">Лакальныя</string>
+    <string name="download_tab_local">Мясцовыя</string>
     <string name="navigate_point_zone">Зона</string>
     <string name="navigate_point_northing">Па шыраце</string>
     <string name="navigate_point_easting">Па даўгаце</string>
@@ -1573,7 +1573,7 @@
     <string name="routing_attr_height_name">Абмежаванне па вышыні</string>
     <string name="routing_attr_height_description">Пазначыць вышыню транспартнага сродку для разліку маршруту.</string>
     <string name="use_fast_recalculation">Разумны пераразлік маршруту</string>
-    <string name="use_fast_recalculation_desc">Пераразлічваць толькі пачатак маршруту. Карысна для доўгіх паездак.</string>
+    <string name="use_fast_recalculation_desc">Пераразлічваецца толькі пачатковы адрэзак маршруту. Карысна для доўгіх паездак.</string>
     <string name="shared_string_logoff">Выйсці</string>
     <string name="rendering_value_disabled_name">Выключана</string>
     <string name="rendering_value_walkingRoutesOSMC_name">Афарбоўка па пешаходнаму сімвалу OSMC</string>
@@ -1984,7 +1984,7 @@
     <string name="map_widget_bearing">Адносны азімут</string>
     <string name="map_widget_magnetic_bearing">Магнітны азімут</string>
     <string name="use_osm_live_routing">Навігацыя OsmAnd Live</string>
-    <string name="access_no_destination">Убудова спецыяльных магчымасцей: Пункт прызначэння не зададзены</string>
+    <string name="access_no_destination">Убудова адмысловых магчымасцяў: пункт прызначэння не вызначаны</string>
     <string name="follow_us">Сачыце за намі</string>
     <string name="access_direction_audio_feedback">Гукавая напрамкі</string>
     <string name="access_direction_audio_feedback_descr">Індыцыраваць гукам кірунак на мэтавы пункт.</string>
@@ -2190,7 +2190,6 @@
     <string name="shared_string_time">Час</string>
     <string name="total_distance">Агульная даўжыня</string>
     <string name="routing_attr_height_obstacles_name">Выкарыстоўваць даныя вышыні</string>
-
     <string name="auto_split_recording_title">Аўтаматычнае дзяленне запісаў пасля перапынку</string>
     <string name="auto_split_recording_descr">Пачаць новы сегмент пасля 6-хвіліннага перапынку, новы след — пасля 2-гадзіннага перапынку, ці новы файл пасля доўгага перапынку (як змяніляся дата).</string>
     <string name="lang_ber">Берберская</string>
@@ -2314,7 +2313,7 @@
     <string name="srtm_color_scheme">Каляровая схема</string>
     <string name="routing_attr_allow_private_name">Дазволіць прыватны доступ</string>
     <string name="routing_attr_allow_private_description">Дазволіць доступ на прыватную тэрыторыю.</string>
-    <string name="hillshade_menu_download_descr">Спампуйце мапу \"Покрыва зацянення рэльефу\" для адлюстравання вертыкальнага зацянення гэтага рэгіёна.</string>
+    <string name="hillshade_menu_download_descr">Спампуйце мапу зацянення рэльефу для адлюстравання вертыкальнага зацянення гэтага рэгіёна.</string>
     <string name="hillshade_purchase_header">Усталюйце убудову \"Контурныя лініі\" для адлюстравання градыентаў вертыкальных абласцей.</string>
     <string name="hide_from_zoom_level">Схаваць ад узроўню маштабавання</string>
     <string name="srtm_menu_download_descr">Спампуйце мапу \"Контурныя лініі\" для выкарыстання ў гэтым рэгіёне.</string>
@@ -2474,7 +2473,7 @@
     <string name="average">Сярэдняя</string>
     <string name="of">%1$d з %2$d</string>
     <string name="ascent_descent">Пад\'ём/Cпуск</string>
-    <string name="moving_time">Час у руху</string>
+    <string name="moving_time">Час руху</string>
     <string name="max_min">Макс/Мін</string>
     <string name="min_max">Мін/Макс</string>
     <string name="rendering_value_translucent_pink_name">Паўпразрысты ружовы</string>
@@ -3149,7 +3148,7 @@
     <string name="quick_action_need_to_add_item_to_list">Дадаць прынамсі адзін элемент у спіс \"Хуткае дзеянне\" у наладах</string>
     <string name="routing_attr_piste_type_downhill_name">Альпійскія і горныя лыжы</string>
     <string name="routing_attr_piste_type_downhill_description">Схілы для горных лыжаў і доступ да пад\'ёмнікаў.</string>
-    <string name="routing_attr_piste_type_nordic_name">Бегавыя і скандынаўскія лыжы</string>
+    <string name="routing_attr_piste_type_nordic_name">Лыжныя гонкі і скандынаўскія тыпы</string>
     <string name="routing_attr_piste_type_nordic_description">Трасы для лыжных гонак і іх паўночных тыпаў.</string>
     <string name="routing_attr_allow_intermediate_name">Дазволіць прамежкавыя маршруты</string>
     <string name="routing_attr_allow_intermediate_description">Больш складаныя трасы са стромкімі ўчасткамі. Пэўныя перашкоды, якіх варта пазбягаць.</string>
@@ -3411,7 +3410,7 @@
     <string name="osmand_purchases_item">Пакупкі OsmAnd</string>
     <string name="legend_item_description">Даведка па знаках мапы.</string>
     <string name="navigation_profiles_item">Профілі навігацыі</string>
-    <string name="create_edit_poi">Стварыць ці Рэдагаваць POI</string>
+    <string name="create_edit_poi">Стварыць ці змяніць POI</string>
     <string name="parking_positions">Месца паркоўкі</string>
     <string name="add_edit_favorite">Дадаць ці рэдагаваць улюбёнае</string>
     <string name="reset_deafult_order">Аднавіць прадвызначаны парадак элементаў</string>
@@ -3522,8 +3521,8 @@
     <string name="open_saved_track">Адкрыць захаваны след</string>
     <string name="shared_string_is_saved">захавана</string>
     <string name="save_track_to_gpx">Аўтаматычна запісваць след падчас навігацыі</string>
-    <string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX, падчас прымусовага спынення (праз апошнія прыкладанні). (Апавяшчэнне ў вобласці падказак Android пра фонавы рэжым OsmAnd знікне.)</string>
-    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу трэка (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
+    <string name="disable_recording_once_app_killed_descrp">Спыненне запісу GPX падчас прымусовага спынення (праз нядаўнія праграмы). (Значок на прасторы апавяшчэнняў Android пра фонавы рэжым OsmAnd знікне.)</string>
+    <string name="save_global_track_interval_descr">Вызначце інтэрвал запісу следу (уключаецца праз віджэт \"Запіс паездкі\" на мапе).</string>
     <string name="monitoring_control_start">ЗАПІС</string>
     <string name="shared_string_done">Завершана</string>
     <string name="shared_string_save_as_gpx">Захаваць як новы файл следу</string>
@@ -3628,7 +3627,7 @@
     <string name="previous_segment">Папярэдні сегмент</string>
     <string name="all_previous_segments">Усе папярэднія сегменты</string>
     <string name="only_selected_segment_recalc">Толькі абраны сегмент пералічыцца з выкарыстаннем абранага профілю.</string>
-    <string name="osm_edits_view_descr">Прагледзець усе вашы яшчэ не загружаныя паўкі OSM або памылкі ў %1$s. Ужо загружаныя змены больш не будуць паказвацца.</string>
+    <string name="osm_edits_view_descr">Тут паказваюцца ўсе вашыя неадпраўленыя праўкі і хібы OSM, яшчэ не адпраўленыя ў %1$s. Адпраўленыя змены не паказваюцца.</string>
     <string name="live_monitoring_adress_descr">Пазначце сеціўны адрас з наступнымі параметрамі: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
     <string name="monitoring_min_distance_descr_recommendation">Рэкамендацыя: наладка ў 5 метраў можа вас задаволіць, калі вам не патрэбна фіксаваць больш кароткія перамяшчэнні, і вы не хочаце відавочна збіраць даныя ў стане спакою.</string>
     <string name="monitoring_min_distance_descr_side_effect">Пабочныя эфекты: перыяды ў стане спакою не запісваюцца наогул альбо па адным пункце кожны. Невялікія (у рэальным свеце) перамяшчэнні (напрыклад, убок, што адзначаюць магчымы паварот у вашай паездцы) могуць быць адфільтраваныя. Файл змяшчае менш інфармацыі для наступнай апрацоўкі і мае горшую статыстыку, адфільтроўваючы відавочна лішнія пункты падчас запісу. Пры гэтым патэнцыйна захоўваюцца артэфакты, выкліканыя дрэнным прыёмам альбо эфектамі модуля GPS.</string>
@@ -3853,7 +3852,7 @@
     <string name="what_is_new">Што новага</string>
     <string name="contour_lines_thanks">Дзякуй за набыццё ўбудовы «Контурныя лініі»</string>
     <string name="osm_live_payment_desc_hw">Плата за падпіску спаганяецца за абраны перыяд. Скасаваць яе на AppGallery можна у любы момант.</string>
-    <string name="osm_live_payment_subscription_management_hw">Пры пацвярджэнні пакупкі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery.
+    <string name="osm_live_payment_subscription_management_hw">Пры пацвярджэнні куплі аплата будзе спаганяцца з рахунка, звязанага з вашым акаўнтам AppGallery.
 \n
 \nПадпіска аўтаматычна працягваецца, калі вы не скасуеце яе да даты працягу. З вашага рахунка будзе адзін раз спаганяцца аплата за перыяд працягу (месяц/тры месяцы/год).
 \n
@@ -3868,7 +3867,7 @@
     <string name="use_native_pt_desc">Перайсці на разлік маршруту грамадскага транспарту з дапамогай Java (бяспечны)</string>
     <string name="file_already_imported">Файл ужо імпартаваны ў OsmAnd</string>
     <string name="start_finish_icons">Значкі старту і фінішу</string>
-    <string name="perform_oauth_authorization_description">Выканайце ўваход з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
+    <string name="perform_oauth_authorization_description">Увайдзіце з дапамогай OAuth, каб выкарыстоўваць функцыі osmedit</string>
     <string name="clear_osm_token">Ачысціць токен OpenStreetMap OAuth</string>
     <string name="osm_edit_logout_success">Вы выйшлі</string>
     <string name="use_live_public_transport">Даныя OsmAnd Live</string>
@@ -3880,72 +3879,72 @@
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd выкарыстоўвае MGRS, які падобны да фармату UTM NATO.</string>
     <string name="shared_string_graph">Графік</string>
-    <string name="message_need_calculate_route_before_show_graph">Даныя %1$s даступныя толькі для дарог, разлічылі маршрут, выкарыстоўваючы \"Маршрут паміж кропкамі\", каб убачыць графікі.</string>
-    <string name="message_graph_will_be_available_after_recalculation">Калі ласка пачакайце.
+    <string name="message_need_calculate_route_before_show_graph">Даныя %1$s даступныя толькі для дарог. Разлічыце маршрут, з дапамогай \"Маршрут паміж пунктамі\", каб убачыць графікі.</string>
+    <string name="message_graph_will_be_available_after_recalculation">Калі ласка, пачакайце.
 \nГрафік будзе даступны пасля пераразліку маршруту.</string>
     <string name="shared_string_local_maps">Лакальныя мапы</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="app_mode_gap">Разрыў</string>
-    <string name="icon_group_amenity">Выгады</string>
-    <string name="icon_group_special">Спецыяльныя</string>
+    <string name="icon_group_amenity">Выгоды</string>
+    <string name="icon_group_special">Адмысловыя</string>
     <string name="icon_group_transport">Транспарт</string>
     <string name="icon_group_service">Паслугі</string>
     <string name="icon_group_symbols">Сімвалы</string>
     <string name="icon_group_sport">Спорт</string>
-    <string name="icon_group_emergency">Экстраныя службы</string>
+    <string name="icon_group_emergency">Экстранныя службы</string>
     <string name="icon_group_travel">Вандроўка</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Дадайце прынамсі два пункты</string>
     <string name="login_open_street_map">Увайсці ў OpenStreetMap</string>
     <string name="login_open_street_map_org">Увайсці ў OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">Увайсці з дапамогай OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Вам неабходна ўвайсці ў сістэму, каб загрузіць новыя або адрэдагаваныя змены.
+    <string name="sign_in_with_open_street_map">Увайсці праз OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Вам неабходна ўвайсці ў сістэму, каб адправіць змены.
 \n
-\nВы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth, або з дапамогай сваіх імя карыстальніка і пароля.</string>
-    <string name="use_login_password">Выкарыстоўваць імя карыстальніка і пароль</string>
-    <string name="login_account">Уліковы запіс</string>
-    <string name="user_login">Аўтарызавацца</string>
+\nВы можаце ўвайсці з дапамогай OAuth або лагіна і пароля.</string>
+    <string name="use_login_password">Выкарыстоўваць лагін і пароль</string>
+    <string name="login_account">Акаўнт</string>
+    <string name="user_login">Увайсці</string>
     <string name="manage_subscription">Кіраванне падпіскай</string>
     <string name="subscription_payment_issue_title">Націсніце кнопку, каб перайсці ў налады падпіскі Google Play і выправіць спосаб аплаты.</string>
-    <string name="subscription_expired_title">Мінуў тэрмін дзеяння падпіскі OsmAnd Live</string>
-    <string name="subscription_paused_title">Падпіска OsmAnd Live была прыпынена</string>
-    <string name="subscription_on_hold_title">Падпіска OsmAnd Live прыпынена</string>
-    <string name="markers_history">Гісторыя маркераў</string>
+    <string name="subscription_expired_title">Тэрмін дзеяння падпіскі OsmAnd Live сышоў</string>
+    <string name="subscription_paused_title">Падпіска OsmAnd Live была прыпыненая</string>
+    <string name="subscription_on_hold_title">Падпіска OsmAnd Live прыпыненая</string>
+    <string name="markers_history">Гісторыя адзнак</string>
     <string name="send_files_to_openstreetmap">Адправіць файл GPX на OpenStreetMap</string>
-    <string name="enter_text_separated">Увадзіце тэгі праз коску.</string>
-    <string name="gpx_upload_public_visibility_descr">\"Агульнадаступны\" азначае, што трасіроўка публічна адлюстроўваецца ў вашых GPS-трасіроўках і ў агульнадаступных спісах GPS-трасіровак, а таксама ў агульнадаступным спісе трасіровак з пазнакамі часу ў неапрацаваным выглядзе. Даныя, прадстаўленыя праз API, не спасылаюцца на вашу старонку трасіроўкі. Меткі часу трасіроўкі недаступныя праз агульнадаступны API GPS і не размяшчаюцца ў храналагічным парадку.</string>
-    <string name="gpx_upload_private_visibility_descr">\"Прыватны\" азначае, што след не з\'явіцца ў любым агульнадаступным спісе, але кантрольныя пункты з яго даступныя ў адвольным парадку праз агульнадаступны GPS API без пазнак часу.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">\"Ідэнтыфікаваны\" азначае, што трасіроўка будзе публічна адлюстроўвацца ў вашай GPS-трасіроўкі і ў агульнадаступных спісах GPS-трасіровак, гэта значыць, што іншыя карыстальнікі змогуць загрузіць неапрацаваны след і звязаць яго з вашым імем карыстальніка. Агульнадаступныя даныя трасіроўкі з GPS API, якія абслугоўваюцца з дапамогай API пунктаў адсочвання, спасылаюцца на пачатковую старонку трасіроўкі.</string>
-    <string name="gpx_upload_trackable_visibility_descr">\"Адсочванне\" азначае, што трэк не з\'явіцца ў любым агульнадаступным спісе, але апрацоўка маршрутных пунктаў з яго (якія не могуць быць непасрэдна звязаны з вамі) ажыццяўляецца з выкарыстаннем загрузак з агульнадаступнага API GPS.</string>
+    <string name="enter_text_separated">Увадзіце пазнакі праз коску.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Публічны\" азначае, што след публічна адлюстроўваецца ў вашых слядах і ў агульнадаступных спісах слядоў, а таксама ў агульнадаступным спісе слядоў з пазнакамі часу ў неапрацаваным выглядзе. Даныя з API, не спасылаюцца на вашу старонку слядоў. Пазнакі часу недаступныя праз агульнадаступны API GPS і не размяшчаюцца ў храналагічным парадку.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Прыватны\" азначае, што след не з\'явіцца ў любым агульнадаступным спісе, але пункты следу з яго даступныя ў адвольным парадку праз агульнадаступны GPS API без пазнак часу.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Можна ідэнтыфікаваць\" азначае, што след будзе публічна адлюстроўвацца ў вашых слядах і ў агульнадаступных спісах слядоў. Гэта азначае, што іншыя карыстальнікі змогуць спампаваць неапрацаваны след і звязаць яго з вашым імем карыстальніка. Агульнадаступныя даныя следу з GPS API, якія абслугоўваюцца з дапамогай API пунктаў следу, будуць спасылацца на пачатковую старонку следу.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Можна адсачыць\" азначае, што след не з\'явіцца ў любым агульнадаступным спісе, але яго пункты (якія не могуць быць непасрэдна звязаныя з вамі) адпраўляюцца праз агульнадаступны API GPS.</string>
     <string name="osm_edit_close_note">Закрыць нататку OSM</string>
     <string name="osm_edit_comment_note">Каментаваць нататку OSM</string>
-    <string name="osm_login_descr">Вы можаце ўвайсці, выкарыстоўваючы бяспечны метад OAuth або з дапамогай сваіх імя карыстальніка і пароля.</string>
+    <string name="osm_login_descr">Вы можаце ўвайсці з дапамогай OAuth або лагіна і пароля.</string>
     <string name="shared_string_add_photo">Дадаць фотаздымак</string>
     <string name="register_on_openplacereviews">Зарэгістравацца на
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Фотаздымкі прадастаўлены праектам з адкрытымі данымі OpenPlaceReviews.org. Каб загрузіць фатаграфіі, зарэгіструйцеся на іх сайце.</string>
-    <string name="register_opr_create_new_account">Стварыць уліковы запіс</string>
-    <string name="register_opr_have_account">У мяне ўжо ёсць уліковы запіс</string>
+    <string name="register_on_openplacereviews_desc">Фотаздымкі падаюцца праектам з адкрытымі данымі OpenPlaceReviews.org. Каб запампаваць фотаздымкі, зарэгіструйцеся на іх сайце.</string>
+    <string name="register_opr_create_new_account">Стварыць акаўнт</string>
+    <string name="register_opr_have_account">У мяне ўжо ёсць акаўнт</string>
     <string name="shared_string_search_history">Гісторыя пошуку</string>
     <string name="app_mode_kayak">Каяк</string>
     <string name="app_mode_motorboat">Маторная лодка</string>
-    <string name="cannot_upload_image">Немагчыма загрузіць выяву, паўтарыце спробу пазней</string>
-    <string name="select_picture">Выберыце выявы</string>
+    <string name="cannot_upload_image">Немагчыма адправіць выяву, паўтарыце спробу пазней</string>
+    <string name="select_picture">Абярыце выявы</string>
     <string name="shared_string_resources">Рэсурсы</string>
     <string name="approximate_file_size">Прыблізны памер файла</string>
-    <string name="select_data_to_export">Выберыце даныя, якія вы хочаце экспартаваць у файл.</string>
+    <string name="select_data_to_export">Абярыце даныя, якія вы хочаце экспартаваць у файл.</string>
     <string name="file_size_needed_for_import">Неабходна для імпартавання</string>
-    <string name="export_not_enough_space_descr">На вашай прыладзе свабодна толькі %1$s. Вызваліце месца альбо зніміце пазнаку з некаторых элементаў для экспартавання.</string>
-    <string name="export_not_enough_space">Недастаткова месца</string>
-    <string name="select_groups_for_import">Выберыце групы, якія трэба імпартаваць.</string>
-    <string name="select_items_for_import">Выберыце элементы, якія трэба імпартаваць.</string>
+    <string name="export_not_enough_space_descr">На вашай прыладзе свабодна толькі %1$s. Вызваліце месца альбо прыбярыце пазнаку з некаторых элементаў.</string>
+    <string name="export_not_enough_space">Не стае вольнага месца</string>
+    <string name="select_groups_for_import">Абярыце групы, якія трэба імпартаваць.</string>
+    <string name="select_items_for_import">Абярыце элементы, якія трэба імпартаваць.</string>
     <string name="add_to_mapillary">Дадаць да Mapillary</string>
     <string name="add_to_opr">Дадаць да OpenPlaceReviews</string>
-    <string name="use_dev_url_descr">Пераключыцца на выкарыстанне dev.openstreetmap.org замест openstreetmap.org для тэсціравання адпраўкі нататак OSM / POI / GPX.</string>
+    <string name="use_dev_url_descr">Пераключыцца на выкарыстанне dev.openstreetmap.org замест openstreetmap.org для тэставання адпраўлення нататак OSM / POI / GPX.</string>
     <string name="use_dev_url">Выкарыстоўваць dev.openstreetmap.org</string>
     <string name="add_photos_descr">OsmAnd паказвае фотаздымкі з некалькіх крыніц;
 \nOpenPlaceReviews - фотаздымкі POI;
 \nMapillary - выявы вуліц;
-\nWeb / Wikimedia - фотаздымкі POI паводле дадзеных з OpenStreetMap.</string>
+\nWeb / Wikimedia - фотаздымкі POI паводле даных з OpenStreetMap.</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
     <string name="elevation_data">Вы можаце выкарыстоўваць даныя пра вышыні, каб улічыць ўздымы/спускі падчас вашай паездкі</string>
     <string name="app_mode_light_aircraft">Лёгкі самалёт</string>
@@ -3964,16 +3963,16 @@
 \n
 \n</string>
     <string name="reverse_all_points">Вярнуць назад усе пункты</string>
-    <string name="profile_by_default_description">Выберыце профіль, які будзе выкарыстоўвацца падчас запуску прыкладання.</string>
+    <string name="profile_by_default_description">Абярыце профіль, які будзе выкарыстоўвацца падчас запуску праграмы.</string>
     <string name="shared_string_last_used">Апошні раз выкарыстоўвалася</string>
     <string name="routing_attr_prefer_hiking_routes_description">Аддаваць перавагу пешаходным маршрутам</string>
     <string name="routing_attr_prefer_hiking_routes_name">Аддаваць перавагу пешаходным маршрутам</string>
-    <string name="routing_attr_allow_streams_description">Дазвольце ручаі і меліярацыйныя каналы</string>
-    <string name="routing_attr_allow_streams_name">Дазвольце ручаі і меліярацыйныя каналы</string>
-    <string name="routing_attr_allow_intermittent_description">Дазволіць перарывістыя водныя маршруты</string>
-    <string name="routing_attr_allow_intermittent_name">Дазволіць перарывістыя водныя маршруты</string>
-    <string name="add_online_routing_engine">Дадаць анлайн-маршрутызатар</string>
-    <string name="edit_online_routing_engine">Рэдагаваць анлайн-маршрутызатар</string>
+    <string name="routing_attr_allow_streams_description">Дазволіць ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_streams_name">Дазволіць ручаі і меліярацыйныя каналы</string>
+    <string name="routing_attr_allow_intermittent_description">Дазволіць перапынныя водныя маршруты</string>
+    <string name="routing_attr_allow_intermittent_name">Дазволіць перапынныя водныя маршруты</string>
+    <string name="add_online_routing_engine">Дадаць сеціўную сістэму маршрутызацыі</string>
+    <string name="edit_online_routing_engine">Рэдагаваць сеціўную сістэму маршрутызацыі</string>
     <string name="shared_string_subtype">Падтып</string>
     <string name="shared_string_vehicle">Транспартны сродак</string>
     <string name="shared_string_api_key">Ключ API</string>
@@ -3981,17 +3980,17 @@
     <string name="shared_string_enter_param">Увядзіце параметр</string>
     <string name="keep_it_empty_if_not">Пакінуць пустым, калі не</string>
     <string name="online_routing_example_hint">URL-адрас з усімі параметрамі будзе выглядаць так:</string>
-    <string name="test_route_calculation">Тэст разліку маршруту</string>
-    <string name="routing_engine_vehicle_type_driving">Ваджэнне</string>
+    <string name="test_route_calculation">Тэставы разлік маршруту</string>
+    <string name="routing_engine_vehicle_type_driving">Кіраванне</string>
     <string name="routing_engine_vehicle_type_foot">Пешшу</string>
     <string name="routing_engine_vehicle_type_bike">Ровар</string>
     <string name="routing_engine_vehicle_type_car">Аўтамабіль</string>
-    <string name="copy_address">Капіраваць адрас</string>
-    <string name="online_routing_engine">Анлайн-маршрутызатар</string>
-    <string name="online_routing_engines">Анлайн-маршрутызатары</string>
-    <string name="shared_string_folders">Папкі</string>
-    <string name="select_folder">Выберыце папку</string>
-    <string name="select_folder_descr">Выберыце папку або стварыце новую</string>
+    <string name="copy_address">Скапіяваць адрас</string>
+    <string name="online_routing_engine">Сеціўная сістэма маршрутызацыі</string>
+    <string name="online_routing_engines">Сеціўныя сістэмы маршрутызацыі</string>
+    <string name="shared_string_folders">Каталогі</string>
+    <string name="select_folder">Абраць каталог</string>
+    <string name="select_folder_descr">Абярыце каталог або стварыце новы</string>
     <string name="shared_string_empty">Пуста</string>
     <string name="analyze_by_intervals">Аналіз паводле інтэрвалаў</string>
     <string name="upload_to_openstreetmap">Адправіць на OpenStreetMap</string>
@@ -4060,4 +4059,8 @@
     <string name="activity_type_offroad_name">Пазадарожнік</string>
     <string name="activity_type_motorbike_name">Матацыкл</string>
     <string name="activity_type_car_name">Аўтамабіль</string>
+    <string name="routing_attr_short_way_description">Аптымальны карацейшы маршрут</string>
+    <string name="snap_to_road_descr">Значок бягучага месцазнаходжання будзе прыаязвацца да бягучага маршруту навігацыі</string>
+    <string name="routing_attr_height_obstacles_description">Разлік маршруту дапаможа пазбегнуць вялікіх схілаў.</string>
+    <string name="purchases">Куплі</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -174,7 +174,7 @@
     <string name="general_settings">Paràmetres generals</string>
     <string name="general_settings_descr">Configureu els paràmetres generals i de visualització de l\'aplicació.</string>
     <string name="user_name">El vostre nom d\'usuari d\'OSM</string>
-    <string name="user_password">La vostra contrasenya a OSM</string>
+    <string name="user_password">Contrasenya</string>
     <string name="download_files_not_enough_space">No hi ha prou espai lliure per baixar %1$s MB (lliure: %2$s).</string>
     <string name="download_files_question_space">Voleu baixar {0} fitxer(s)\? 
 \nS\'ocuparà {1} MB (de {2} MB).</string>
@@ -1532,7 +1532,7 @@
     <string name="routing_attr_height_name">Límit d\'alçada</string>
     <string name="routing_attr_height_description">Indiqueu l\'alçada del vehicle que les rutes han d\'admetre.</string>
     <string name="use_fast_recalculation">Recàlcul intel·ligent de la ruta</string>
-    <string name="use_fast_recalculation_desc">Actualitza només la part inicial de la ruta. Pot ser usat per a viatges llargs.</string>
+    <string name="use_fast_recalculation_desc">Actualitza només la part inicial de la ruta. Útil per a viatges llargs.</string>
     <string name="shared_string_logoff">Surt</string>
     <string name="rendering_value_disabled_name">Desactivat</string>
     <string name="rendering_value_walkingRoutesScopeOSMC_name">Acoloreix segons el tipus de xarxa</string>
@@ -2158,7 +2158,6 @@
     <string name="rendering_attr_depthContours_description">Mostra isòbates i fondàries puntuals.</string>
     <string name="rendering_attr_depthContours_name">Isòbates</string>
     <string name="routing_attr_height_obstacles_name">Utilitza les cotes d\'elevació</string>
-
     <string name="route_altitude">Alçat de la ruta</string>
     <string name="altitude_descent">Descens</string>
     <string name="altitude_ascent">Ascens</string>
@@ -3324,9 +3323,9 @@
     <string name="route_recalculation">Recàlcul de la ruta</string>
     <string name="accessibility_announce">Anunci</string>
     <string name="login_and_pass">Nom d\'usuari i contrasenya</string>
-    <string name="plugin_global_prefs_info">Aquest paràmetre de connectors és global i afecta tots els perfils</string>
+    <string name="plugin_global_prefs_info">Aquests paràmetres de connectors són global i afecten tots els perfils</string>
     <string name="osm_editing">Edició OSM</string>
-    <string name="osm_edits_view_descr">Consulteu les vostres edicions o errors OSM encara no pujats a %1$s. Els punts enviats ja no es veuran més.</string>
+    <string name="osm_edits_view_descr">Consulteu totes les vostres edicions o errors OSM que encara no s\'han pujat a %1$s. Els canvis ja enviats no es veuran més.</string>
     <string name="select_nav_icon_descr">La icona es mostra mentre navegueu o us mogueu.</string>
     <string name="select_map_icon_descr">La icona es mostra en repòs.</string>
     <string name="logcat_buffer_descr">Valida i comparteix enregistraments detallats de l\'aplicació</string>
@@ -3753,7 +3752,7 @@
     <string name="lenght_limit_description">Proporcioneu la llargada del vostre vehicle, pot haver-hi rutes restringides als vehicles llargs.</string>
     <string name="gpx_parse_error">No s\'ha generat correctament l\'arxiu GPX. Indiqueu-ho a l\'equip de suport per continuar investigant.</string>
     <string name="save_track_to_gpx">Enregistra automàticament la traça durant la navegació</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Cal afegir almenys dos punts</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Afegiu almenys dos punts</string>
     <string name="use_dev_url_descr">Canvieu per utilitzar dev.openstreetmap.org en lloc d\'openstreetmap.org en provar la pujada de nota OSM / PDI / GPX.</string>
     <string name="osm_edit_close_note">Tanca la nota d\'OSM</string>
     <string name="osm_edit_comment_note">Comentari de la nota d\'OSM</string>
@@ -3815,4 +3814,15 @@
     <string name="routing_attr_allow_streams_name">Permet rierols i torrents</string>
     <string name="routing_attr_allow_intermittent_description">Permet les vies navegables no permanents</string>
     <string name="routing_attr_allow_intermittent_name">Permet les vies navegables no permanents</string>
+    <string name="purchases">Compres</string>
+    <string name="select_category_descr">Seleccioneu una categoria o afegiu-ne una de nova</string>
+    <string name="track_recording_will_be_continued">L\'enregistrament continuarà.</string>
+    <string name="copy_poi_name">Copia el nom del PDI</string>
+    <string name="quick_action_show_hide_title">Mostra/amaga</string>
+    <string name="shared_string_interval">Interval</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Amaga reserves naturals, àrees protegides i delimitacions de parcs nacionals</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Fronteres naturals</string>
+    <string name="track_has_no_altitude">La traça no conté dades d\'altitud.</string>
+    <string name="track_has_no_speed">La traça no conté dades de velocitat.</string>
+    <string name="select_another_colorization">Seleccioneu un altre tipus de coloració.</string>
 </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -3881,4 +3881,17 @@
     <string name="poi_embassy_delegation">Delegace</string>
     <string name="poi_embassy_branch_embassy">Pobočka</string>
     <string name="poi_embassy_yes">Vedená velvyslancem</string>
+    <string name="poi_mobile_library">Místo zastavení mobilní knihovny</string>
+    <string name="poi_summit_register_no">Vrcholová kniha: ne</string>
+    <string name="poi_summit_register_yes">Vrcholová kniha: ano</string>
+    <string name="poi_piste_status_closed">Stav sjezdovky: zavřená</string>
+    <string name="poi_piste_status_open">Stav sjezdovky: otevřená</string>
+    <string name="poi_patrolled_no">Hlídané: ne</string>
+    <string name="poi_patrolled_yes">Hlídané: ano</string>
+    <string name="poi_piste_name">Název sjezdovky</string>
+    <string name="poi_piste_ski_jump">Skoky na lyžích</string>
+    <string name="poi_local_ref">Místní reference</string>
+    <string name="poi_geodesist">Geodet</string>
+    <string name="poi_conference_centre">Konferenční centrum</string>
+    <string name="poi_gladed_yes">Ve volném terénu: ano</string>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -367,7 +367,7 @@
     <string name="poi_context_menu_delete">Smazat POI</string>
     <string name="rotate_map_compass_opt">Směr kompasu</string>
     <string name="rotate_map_bearing_opt">Směr pohybu</string>
-    <string name="rotate_map_none_opt">Neotáčet (sever vždy nahoru)</string>
+    <string name="rotate_map_none_opt">Neotáčet (sever vždy nahoře)</string>
     <string name="rotate_map_to_bearing_descr">Směr natočení mapy:</string>
     <string name="rotate_map_to_bearing">Natočení mapy</string>
     <string name="show_route">Ukázat cestu</string>
@@ -1401,7 +1401,7 @@
     <string name="settings_privacy">Soukromí</string>
     <string name="shared_string_gpx_points">Body</string>
     <string name="shared_string_my_location">Moje poloha</string>
-    <string name="navigation_over_track">Spustit navigaci po trase?</string>
+    <string name="navigation_over_track">Spustit navigaci podle stopy\?</string>
     <string name="avoid_roads_msg">Vynutit náhradní trasu označením cest, kterým je nutné se vyhnout</string>
     <string name="save_track_to_gpx_globally_headline">Záznam tras na vyžádání</string>
     <string name="enable_proxy_title">Povolit HTTP proxy</string>
@@ -2170,7 +2170,6 @@
     <string name="shared_string_time">Čas</string>
     <string name="total_distance">Celková vzdálenost</string>
     <string name="routing_attr_height_obstacles_name">Použít údaje o nadmořské výšce</string>
-
     <string name="routing_attr_driving_style_name">Styl jízdy</string>
     <string name="select_gpx_folder">Vyberte složku pro soubor GPX</string>
     <string name="file_can_not_be_moved">Soubor se nepodařilo přesunout.</string>
@@ -3992,4 +3991,58 @@
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Použít test.openplacereviews.org</string>
     <string name="login_open_place_reviews">Přihlásit se do OpenPlaceReviews</string>
+    <string name="select_segments">Vybrat úseky</string>
+    <string name="select_segments_description">%1$s obsahuje více než jeden úsek, musíte vybrat potřebnou část pro navigaci.</string>
+    <string name="segments_count">Úsek %1$d</string>
+    <string name="activity_type_water_name">Voda</string>
+    <string name="activity_type_winter_name">Zima</string>
+    <string name="activity_type_snowmobile_name">Sněžný skútr</string>
+    <string name="activity_type_riding_name">Jízda na koni</string>
+    <string name="activity_type_racing_name">Závody</string>
+    <string name="activity_type_mountainbike_name">Horské kolo</string>
+    <string name="activity_type_cycling_name">Jízda na kole</string>
+    <string name="activity_type_hiking_name">Turistika</string>
+    <string name="activity_type_running_name">Běh</string>
+    <string name="activity_type_walking_name">Chůze</string>
+    <string name="activity_type_offroad_name">Terénní jízda</string>
+    <string name="activity_type_motorbike_name">Motocykl</string>
+    <string name="activity_type_car_name">Automobil</string>
+    <string name="temporary_conditional_routing_descr">Použít omezení, která jsou nyní aktivní na mapě</string>
+    <string name="routing_attr_short_way_description">Optimalizovaná kratší trasa (úspora energie)</string>
+    <string name="routing_attr_driving_style_description">Vyberte účel řízení pro získání kratší, rychlejší nebo bezpečnější trasy</string>
+    <string name="snap_to_road_descr">Ikona aktuální polohy bude zachycena na aktuální navigační trasu.</string>
+    <string name="map_orientation_threshold_descr">Neotáčet mapu, pokud rychlost je nižší než určitá mez</string>
+    <string name="restart">Restartovat</string>
+    <string name="shared_strings_all_regions">Všechny oblasti</string>
+    <string name="delete_number_files_question">Smazat %1$d souborů\?</string>
+    <string name="track_recording_stop_without_saving">Zastavit bez uložení</string>
+    <string name="track_recording_save_and_stop">Uložit a zastavit záznam</string>
+    <string name="track_recording_title">Záznam stopy zastaven</string>
+    <string name="track_recording_description">Opravdu chcete ukončit záznam\?
+\nVeškerá neuložená data budou ztracena.</string>
+    <string name="on_pause">Při pozastavení</string>
+    <string name="app_restart_required">Některá nastavení vyžadují restart aplikace.</string>
+    <string name="routing_attr_height_obstacles_description">Algoritmus výpočtu trasy se může vyhnout strmým svahům.</string>
+    <string name="quick_action_coordinates_widget_descr">Přepínač pro zobrazení nebo skrytí nástroje Souřadnice na mapě.</string>
+    <string name="map_widget_distance_by_tap">Vzdálenost klepnutím</string>
+    <string name="latest_openstreetmap_update">Dostupná nejnovější aktualizace OpenStreetMap:</string>
+    <string name="updated">Aktualizováno: %s</string>
+    <string name="last_time_checked">Poslední kontrola: %s</string>
+    <string name="update_frequency">Frekvence aktualizací</string>
+    <string name="live_update_frequency_week_variant">Aktualizace mapy budou kontrolovány každý týden. Příští kontrola %1$s v %2$s.</string>
+    <string name="live_update_frequency_day_variant">Aktualizace mapy budou kontrolovány každý den. Příští kontrola %1$s v %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Aktualizace mapy budou kontrolovány každou hodinu. Příští kontrola %1$s v %2$s.</string>
+    <string name="delete_updates">Smazat aktualizace</string>
+    <string name="live_update_delete_updates_msg">Opravdu chcete smazat všechny živé aktualizace (%s)\?</string>
+    <string name="purchases">Nákupy</string>
+    <string name="select_category_descr">Vyberte kategorii nebo přidejte novou</string>
+    <string name="track_recording_will_be_continued">Záznam bude pokračovat.</string>
+    <string name="copy_poi_name">Kopírovat název bodu zájmu</string>
+    <string name="quick_action_show_hide_title">Zobrazit/skrýt</string>
+    <string name="shared_string_interval">Interval</string>
+    <string name="track_has_no_altitude">Stopa neobsahuje údaje o nadmořské výšce.</string>
+    <string name="track_has_no_speed">Stopa neobsahuje údaje o rychlosti.</string>
+    <string name="select_another_colorization">Vyberte prosím jiný typ obarvení.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Skrýt hranice přírodních rezervací, chráněných území a národních parků</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Hranice přírody</string>
 </resources>

OsmAnd/res/values-da/phrases.xml

@@ -3604,7 +3604,7 @@
     <string name="poi_vehicle_military">Adgang for køretøjer: militær</string>
     <string name="poi_vehicle_delivery">Adgang for køretøjer: levering</string>
     <string name="poi_vehicle_forestry">Adgang for køretøjer: skovbrug</string>
-    <string name="poi_motorcar_yes">Adgang for biler:</string>
+    <string name="poi_motorcar_yes">Adgang for biler: ja</string>
     <string name="poi_motorcar_private">Adgang for biler: privat</string>
     <string name="poi_motorcar_no">Adgang for biler: nej</string>
     <string name="poi_motorcar_destination">Adgang for biler: destination</string>
@@ -3861,4 +3861,23 @@
     <string name="poi_water_source_water_tank">Vandtank</string>
     <string name="poi_vaccination_covid19">Vaccination: COVID19</string>
     <string name="poi_health_specialty_vaccination_yes">Vaccination</string>
+    <string name="poi_local_ref">Lokal reference</string>
+    <string name="poi_conference_centre">Konferencecenter</string>
+    <string name="poi_piste_status_closed">Pistestatus: lukket</string>
+    <string name="poi_piste_status_open">Pistestatus: åben</string>
+    <string name="poi_patrolled_no">Patruljeret: nej</string>
+    <string name="poi_patrolled_yes">Patruljeret: ja</string>
+    <string name="poi_piste_name">Pistenavn</string>
+    <string name="poi_piste_ski_jump">Skihop</string>
+    <string name="poi_wildlife_crossing_bat_tunnel">Flagermustunnel</string>
+    <string name="poi_wildlife_crossing_bat_bridge">Flagermusbro</string>
+    <string name="poi_swimming_area">Svømmeområde</string>
+    <string name="poi_weightbridge">Vægtbro</string>
+    <string name="poi_ranger_station">Rangerstation</string>
+    <string name="poi_water_source_well">Brønd</string>
+    <string name="poi_water_source_powered_pump">Motordrevet pumpe</string>
+    <string name="poi_water_source_tap">Vandhane</string>
+    <string name="poi_water_source_water_works">Vandværk</string>
+    <string name="poi_water_source_tube_well">Rørformet brønd</string>
+    <string name="poi_lifeguard_base">Livredderbase</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -447,6 +447,7 @@
 \n
 \nOsmAnd er et open source-navigationsprogram med adgang til en lang række af globale OpenStreetMap (OSM)-data. Alle kortdata (vektorkort eller kortbrikker) kan gemmes på enhedens hukommelseskort til offline-brug. OsmAnd tilbyder også offline- og online-rutefunktionalitet inklusive sving-for-sving tale vejledning.
 \n
+\n
 \nNogle af hovedfunktionerne:
 \n - Komplet offlinefunktionalitet (gemme hentede vektorkort eller kortbrikker i enhedens lager)
 \n - Kompakte offlinevektorkort for hele verden er tilgængelige
@@ -460,7 +461,7 @@
 \n - valgfri automatisk kortrotation efter kompas eller bevægelsesretning
 \n - valgfri vognbaneassistent
 \n - visning af hastighedsgrænse
-\n - optagede stemmer og tale syntese stemmer (tekst-til-tale)
+\n - optagede stemmer og talesyntese stemmer (tekst-til-tale)
 \n
 \n Begrænsninger i den gratis version af OsmAnd:
 \n - Antallet af kort der kan hentes er begrænset
@@ -937,7 +938,7 @@
     <string name="local_openstreetmap_act_title">OSM-modifikationer</string>
     <string name="download_using_mobile_internet">Ikke forbundet til Wi-Fi. Brug den aktuelle forbindelse til internettet for at hente?</string>
     <string name="cancel_navigation">Stop navigation</string>
-    <string name="cancel_route">Annuller rute</string>
+    <string name="cancel_route">Annuller rute\?</string>
     <string name="clear_destination">Slet destinationen</string>
     <string name="install_paid">Fuldversion</string>
     <string name="other_location">Andre</string>
@@ -2168,7 +2169,6 @@
     <string name="rendering_attr_depthContours_description">Vis dybdekonturer og -punkter.</string>
     <string name="rendering_attr_depthContours_name">Havdybdekonturer</string>
     <string name="routing_attr_height_obstacles_name">Brug højdedata</string>
-
     <string name="route_altitude">Rutehøjde</string>
     <string name="altitude_descent">Fald</string>
     <string name="altitude_ascent">Stigning</string>
@@ -3787,4 +3787,54 @@
     <string name="activity_type_walking_name">Gå</string>
     <string name="activity_type_motorbike_name">Motorcykel</string>
     <string name="activity_type_car_name">Bil</string>
+    <string name="announcement_time_title">Meddelelsestid</string>
+    <string name="show_track_on_map">Vis spor på kort</string>
+    <string name="routing_engine_vehicle_type_hiking">Vandring</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Landevejscykling</string>
+    <string name="routing_engine_vehicle_type_scooter">Scooter</string>
+    <string name="routing_engine_vehicle_type_mtb">MTB</string>
+    <string name="message_name_is_already_exists">Navnet findes allerede</string>
+    <string name="delete_online_routing_engine">Slet online routing-motor\?</string>
+    <string name="delete_waypoints">Slet rutepunkt</string>
+    <string name="copy_to_map_markers">Kopier til kortmarkører</string>
+    <string name="copy_to_map_favorites">Kopier til favoritter</string>
+    <string name="select_segments">Vælg segmenter</string>
+    <string name="select_segments_description">%1$s indeholder mere end et segment, vælg den nødvendige del til navigationen.</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="toast_select_edits_for_upload">Vælg redigeringer til overførsel</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="login_open_place_reviews">Log på OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Vand</string>
+    <string name="activity_type_snowmobile_name">Snescooter</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_hiking_name">Vandring</string>
+    <string name="activity_type_offroad_name">Off-road</string>
+    <string name="routing_attr_short_way_description">Optimeret kortere rute (energibesparelser)</string>
+    <string name="routing_attr_driving_style_description">Vælg kørselsformål for at få en kortere, hurtigere eller mere sikker rute</string>
+    <string name="snap_to_road_descr">Det aktuelle placeringsikon fastgøres til den aktuelle navigationsrute</string>
+    <string name="restart">Genstart</string>
+    <string name="shared_strings_all_regions">Alle regioner</string>
+    <string name="delete_number_files_question">Slet %1$d filer\?</string>
+    <string name="track_recording_stop_without_saving">Stop uden at gemme</string>
+    <string name="track_recording_save_and_stop">Gem og stop optagelse</string>
+    <string name="track_recording_title">Optagelse af spor stoppet</string>
+    <string name="app_restart_required">Programgenstart kræves for at anvende nogle indstillinger.</string>
+    <string name="quick_action_coordinates_widget_descr">En til/fra-knap for at vise eller skjule Koordinat modul på kortet.</string>
+    <string name="latest_openstreetmap_update">Seneste OpenStreetMap opdatering tilgængelig:</string>
+    <string name="updated">Opdateret: %s</string>
+    <string name="last_time_checked">Sidst kontrolleret: %s</string>
+    <string name="update_frequency">Opdateringsfrekvens</string>
+    <string name="live_update_frequency_week_variant">Kortopdateringer kontrolleres hver uge. Næste gang %1$s i %2$s.</string>
+    <string name="live_update_frequency_day_variant">Kortopdateringer kontrolleres hver dag. Næste gang %1$s i %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Kortopdateringer kontrolleres hver time. Næste gang %1$s i %2$s.</string>
+    <string name="delete_updates">Slet opdateringer</string>
+    <string name="purchases">Køb</string>
+    <string name="select_category_descr">Vælg kategori, eller tilføj en ny</string>
+    <string name="track_recording_will_be_continued">Optagelsen fortsættes.</string>
+    <string name="copy_poi_name">Kopier IP-navn</string>
+    <string name="quick_action_show_hide_title">Vis/skjul</string>
+    <string name="shared_string_interval">Interval</string>
+    <string name="track_has_no_altitude">Sporet indeholder ikke højdedata.</string>
+    <string name="track_has_no_speed">Sporet indeholder ikke hastighedsdata.</string>
+    <string name="select_another_colorization">Vælg en anden type farvelægning.</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -209,7 +209,7 @@
     <string name="poi_food_court">Markthalle</string>
     <string name="poi_ford">Furt</string>
     <string name="poi_fort">Festung</string>
-    <string name="poi_fountain">Brunnen</string>
+    <string name="poi_fountain">Zierbrunnen</string>
     <string name="poi_frame">Bilderrahmengeschäft</string>
     <string name="poi_fuel">Tankstelle;Tankanlage;Tankstation</string>
     <string name="poi_funeral_directors">Bestatter</string>
@@ -1232,7 +1232,7 @@
     <string name="poi_material_metal">Material: Metall</string>
     <string name="poi_material_steel">Material: Stahl</string>
     <string name="poi_material_stone">Material: Stein</string>
-    <string name="poi_material_plastic">Martial: Plastik</string>
+    <string name="poi_material_plastic">Material: Plastik</string>
     <string name="poi_material_sandstone">Material: Sandstein</string>
     <string name="poi_material_granite_stone">Material: Granit</string>
     <string name="poi_material_metal_wood">Material: Metall, Holz</string>
@@ -1479,7 +1479,7 @@
     <string name="poi_material_reinforced_concrete">Material: Stahlbeton</string>
     <string name="poi_material_concrete">Material: Beton</string>
     <string name="poi_material_masonry">Material: Mauerwerk</string>
-    <string name="poi_material_brick">Martial: Ziegel</string>
+    <string name="poi_material_brick">Material: Ziegel</string>
     <string name="poi_material_composite">Material: Verbundstoff</string>
     <string name="poi_material_limestone">Material: Kalkstein</string>
     <string name="poi_material_marble">Material: Marmor</string>
@@ -3213,7 +3213,7 @@
     <string name="poi_water_purification_chlorine">Chlor</string>
     <string name="poi_water_purification_reverse_osmosis">Umkehrosmose</string>
     <string name="poi_water_purification_aquatabs">Aquatabs</string>
-    <string name="poi_water_supply_water_well">Brunnen</string>
+    <string name="poi_water_supply_water_well">Ziehbrunnen</string>
     <string name="poi_water_supply_pipeline">Rohrleitung</string>
     <string name="poi_water_supply_running_water">Fließendes Wasser</string>
     <string name="poi_water_supply_pump">Pumpe</string>
@@ -3891,4 +3891,7 @@
     <string name="poi_gladed_yes">Geglättet: ja</string>
     <string name="poi_piste_name">Pistenname</string>
     <string name="poi_piste_ski_jump">Skispringen</string>
+    <string name="poi_local_ref">Lokale Referenz</string>
+    <string name="poi_geodesist">Geodät</string>
+    <string name="poi_conference_centre">Konferenzzentrum</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -675,8 +675,8 @@
     <string name="uploading_data">Daten hochladen …</string>
     <string name="uploading">Hochladen …</string>
     <string name="search_nothing_found">Kein Treffer</string>
-    <string name="searching">Suchen …</string>
-    <string name="searching_address">Adresse suchen …</string>
+    <string name="searching">Suche…</string>
+    <string name="searching_address">Suche Adresse…</string>
     <string name="search_osm_nominatim">Online-Suche mit OSM Nominatim</string>
     <string name="hint_search_online">Online-Suche: Hausnummer, Straße, Ort</string>
     <string name="search_offline_address">Offline-Suche</string>
@@ -2167,7 +2167,6 @@
     <string name="navigate_point_olc">Offener Standortcode (OLC)</string>
     <string name="quick_action_page_list_descr">Eine Schaltfläche, um durch die Liste unten zu blättern.</string>
     <string name="routing_attr_height_obstacles_name">Höhendaten berücksichtigen</string>
-
     <string name="rendering_attr_depthContours_name">Nautische Tiefenlinien</string>
     <string name="rendering_attr_depthContours_description">Tiefenlinien und -punkte einblenden.</string>
     <string name="route_altitude">Routenhöhenprofil</string>
@@ -3164,7 +3163,7 @@
     <string name="manage_profiles_descr">Profile erstellen, importieren, bearbeiten</string>
     <string name="manage_profiles">App-Profile verwalten …</string>
     <string name="osmand_settings_descr">Die gesamte App betreffend</string>
-    <string name="osmand_settings">OsmAnd-Einstellungen</string>
+    <string name="osmand_settings">OsmAnd Einstellungen</string>
     <string name="copy_from_other_profile">Aus anderem Profil kopieren</string>
     <string name="turn_screen_on">Bildschirm einschalten</string>
     <string name="map_during_navigation_info">Karte während Navigation</string>
@@ -4010,4 +4009,45 @@
     <string name="shared_string_sec">sek</string>
     <string name="activity_type_racing_name">Rennsport</string>
     <string name="announcement_time_prepare_long">Erste Ankündigung (größere Distanz)</string>
+    <string name="restart">Neustart</string>
+    <string name="shared_strings_all_regions">Alle Regionen</string>
+    <string name="delete_number_files_question">%1$d Dateien löschen\?</string>
+    <string name="track_recording_stop_without_saving">Stoppen ohne zu speichern</string>
+    <string name="track_recording_save_and_stop">Speichern und Beenden der Aufzeichnung</string>
+    <string name="track_recording_title">Track-Aufnahme gestoppt</string>
+    <string name="updated">Aktualisiert: %s</string>
+    <string name="delete_updates">Updates löschen</string>
+    <string name="purchases">Käufe</string>
+    <string name="track_recording_will_be_continued">Die Aufzeichnung wird fortgesetzt.</string>
+    <string name="copy_poi_name">POI-Namen kopieren</string>
+    <string name="quick_action_show_hide_title">Ein-/Ausblenden</string>
+    <string name="shared_string_interval">Intervall</string>
+    <string name="track_has_no_altitude">Der Track enthält keine Höhendaten.</string>
+    <string name="track_has_no_speed">Der Track enthält keine Geschwindigkeitsdaten.</string>
+    <string name="select_another_colorization">Bitte wähle eine andere Art der Einfärbung aus.</string>
+    <string name="map_widget_distance_by_tap">Entfernung durch Antippen</string>
+    <string name="select_segments">Segmente auswählen</string>
+    <string name="select_segments_description">%1$s enthält mehr als ein Segment, Sie müssen den benötigten Teil für die Navigation auswählen.</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="temporary_conditional_routing_descr">Verwenden Sie Straßeneinschränkungen, die jetzt in der Karte aktiv sind</string>
+    <string name="routing_attr_short_way_description">Optimierte kürzere Route (energiesparend)</string>
+    <string name="routing_attr_driving_style_description">Wählen Sie den Fahrzweck, um eine kürzere, schnellere oder sicherere Route zu erhalten</string>
+    <string name="snap_to_road_descr">Das Symbol für den aktuellen Standort wird an die aktuelle Navigationsroute angehängt</string>
+    <string name="map_orientation_threshold_descr">Kartenansicht nicht drehen, wenn die Geschwindigkeit kleiner als ein Schwellenwert ist</string>
+    <string name="track_recording_description">Sind Sie sicher, dass Sie die Aufnahme beenden wollen\?
+\nAlle nicht gespeicherten Daten gehen verloren.</string>
+    <string name="on_pause">Pausiert</string>
+    <string name="app_restart_required">Neustart der Anwendung erforderlich, um einige Einstellungen zu übernehmen.</string>
+    <string name="routing_attr_height_obstacles_description">Die Streckenführung könnte starke Steigungen vermeiden.</string>
+    <string name="quick_action_coordinates_widget_descr">Ein Umschalter zum Ein- und Ausblenden des Koordinaten-Widgets auf der Karte.</string>
+    <string name="latest_openstreetmap_update">Aktuelles OpenStreetMap Update verfügbar:</string>
+    <string name="last_time_checked">Zuletzt geprüft: %s</string>
+    <string name="update_frequency">Aktualisierungsintervall</string>
+    <string name="live_update_frequency_week_variant">Die Kartenaktualisierung wird wöchentlich überprüft. Das nächste Mal %1$s in %2$s.</string>
+    <string name="live_update_frequency_day_variant">Die Kartenaktualisierung wird täglich überprüft. Das nächste Mal %1$s in %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Die Kartenaktualisierung wird stündlich überprüft. Das nächste Mal %1$s in %2$s.</string>
+    <string name="live_update_delete_updates_msg">Sind Sie sicher, dass Sie alle %s Live-Updates löschen möchten\?</string>
+    <string name="select_category_descr">Kategorie auswählen oder neue hinzufügen</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Grenzen von Naturschutzgebieten, Schutzgebieten und Nationalparks ausblenden</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Grenzen von Schutzgebieten</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -1873,7 +1873,6 @@
     <string name="total_distance">Συνολική απόσταση</string>
     <string name="routing_attr_relief_smoothness_factor_name">Επιλέξτε διακύμανση ανύψωσης</string>
     <string name="routing_attr_height_obstacles_name">Χρήση υψομετρικών δεδομένων</string>
-
     <string name="rendering_attr_depthContours_description">Εμφάνιση ισοβαθών καμπυλών και σημείων.</string>
     <string name="rendering_attr_depthContours_name">Ναυτικές ισοβαθείς καμπύλες</string>
     <string name="auto_split_recording_title">Αυτόματος διαχωρισμός καταγραφών μετά από κενό</string>
@@ -2516,7 +2515,7 @@
     <string name="commit_poi">Υποβολή ΣΕ</string>
     <string name="tab_title_basic">Βασικό</string>
     <string name="tab_title_advanced">Προχωρημένο</string>
-    <string name="building_number">Αριθμός κτιρίου</string>
+    <string name="building_number">Αριθμός κτηρίου</string>
     <string name="next_proceed">Επόμενο</string>
     <string name="opening_at">Άνοιγμα στις</string>
     <string name="closing_at">Κλείσιμο στις</string>

OsmAnd/res/values-eo/phrases.xml

@@ -3891,4 +3891,7 @@
     <string name="poi_mobile_library">Movebla biblioteko (haltloko)</string>
     <string name="poi_summit_register_no">Pint‑taglibro: ne</string>
     <string name="poi_summit_register_yes">Pint‑taglibro: jes</string>
+    <string name="poi_local_ref">Loka referenco</string>
+    <string name="poi_geodesist">Oficejo de geodeziisto</string>
+    <string name="poi_conference_centre">Konferenca centro</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -3,7 +3,7 @@
     <string name="shared_string_topbar">Supra breto</string>
     <string name="recalculate_route">Rekalkuli kurson</string>
     <string name="donations">Donacoj</string>
-    <string name="number_of_recipients">Nombro da ricevontoj</string>
+    <string name="number_of_recipients">Nombro de ricevontoj</string>
     <string name="osm_user_stat">Redaktoj: %1$s, rango: %2$s, ĉiuj redaktoj: %3$s</string>
     <string name="osm_editors_ranking">Ranglisto de OSM-redaktantoj</string>
     <string name="osm_live_subscription">Abono al OsmAnd-Live</string>
@@ -458,7 +458,7 @@
     <string name="shared_string_io_error">En/eliga eraro okazis</string>
     <string name="shared_string_unexpected_error">Neatendita eraro okazis</string>
     <string name="shared_string_action_template">Agado {0}</string>
-    <string name="shared_string_show_on_map">Montri en mapo</string>
+    <string name="shared_string_show_on_map">Montri sur mapo</string>
     <string name="shared_string_collapse">Maletendi</string>
     <string name="shared_string_add_to_favorites">Aldoni al “ŝatataj”</string>
     <string name="shared_string_my_location">Mia pozicio</string>
@@ -1876,14 +1876,14 @@
     <string name="contact_info">Kontaktaj informoj</string>
     <string name="add_opening_hours">Aldoni horojn de malfermo</string>
     <string name="poi_dialog_poi_type">Speco de interesejo</string>
-    <string name="number_of_rows_in_dash">Nombro da linioj sur ĉefekrano %1$s</string>
+    <string name="number_of_rows_in_dash">Nombro de linioj sur ĉefekrano %1$s</string>
     <string name="please_specify_poi_type">Bonvolu precizigi specon de interesejo.</string>
     <string name="working_days">Labortagoj</string>
     <string name="recent_places">Lastaj ejoj</string>
     <string name="favourites">Ŝatataj ejoj</string>
     <string name="saved_at_time">Konservita je: %1$s</string>
     <string name="poi_deleted_localy">Interesejo estos forigita kiam vi alŝutos viajn ŝanĝojn</string>
-    <string name="count_of_lines">Nombro da linioj</string>
+    <string name="count_of_lines">Nombro de linioj</string>
     <string name="are_you_sure">Ĉu vi certas?</string>
     <string name="unsaved_changes_will_be_lost">Ĉiuj nekonservitaj ŝanĝoj estos forigitaj. Ĉu pluigi?</string>
     <string name="downloads_left_template">ankoraŭ %1$s elŝutoj</string>
@@ -1901,7 +1901,7 @@
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Ĝisdatigi ĉiujn (%1$s MB)</string>
     <string name="free_downloads_used">Senpagaj elŝutoj uzitaj</string>
-    <string name="free_downloads_used_description">Montras nombron da pluaj senpagaj elŝutoj.</string>
+    <string name="free_downloads_used_description">Montras nombron de pluaj senpagaj elŝutoj.</string>
     <string name="application_dir_description">Bonvolu elekti kie vi volas konservi mapoj kaj aliaj datum-dosieroj.</string>
     <string name="enter_country_name">Enigu nomon de lando</string>
     <string name="new_version">Nova versio</string>
@@ -1941,8 +1941,8 @@
     <string name="morning">Matene</string>
     <string name="night">Nokte</string>
     <string name="select_month_and_country">Monato kaj lando:</string>
-    <string name="number_of_contributors">Nombro da kontribuintoj</string>
-    <string name="number_of_edits">Nombro da redaktoj</string>
+    <string name="number_of_contributors">Nombro de kontribuintoj</string>
+    <string name="number_of_edits">Nombro de redaktoj</string>
     <string name="reports_for">Raportoj por</string>
     <string name="file_name_containes_illegal_char">Malpermesata signo en dosiernomo</string>
     <string name="items_were_selected">{0} elemento(j) elektita(j)</string>
@@ -2162,7 +2162,6 @@
     <string name="rendering_attr_depthContours_description">Montri punktojn kaj kurbojn de profundo.</string>
     <string name="rendering_attr_depthContours_name">Maraj profundec-kurboj</string>
     <string name="routing_attr_height_obstacles_name">Uzi datumojn pri altitudo</string>
-
     <string name="route_altitude">Kursa altitudo</string>
     <string name="altitude_descent">Malsupreniro</string>
     <string name="altitude_ascent">Supreniro</string>
@@ -2537,7 +2536,7 @@
     <string name="tap_on_map_to_hide_interface">Plenekrana reĝimo</string>
     <string name="mark_passed">Marki kiel pasigitan</string>
     <string name="rename_marker">Alinomi markon</string>
-    <string name="digits_quantity">Nombro da dekumaj pozicioj</string>
+    <string name="digits_quantity">Nombro de dekumaj pozicioj</string>
     <string name="shared_string_right">Dekstre</string>
     <string name="shared_string_left">Maldekstre</string>
     <string name="show_number_pad">Montri nombran klavaron</string>
@@ -2560,7 +2559,7 @@
     <string name="show_guide_line_descr">Vidigi direktantan linion el via pozicio al pozicioj de aktivaj map-markoj.</string>
     <string name="show_arrows_descr">Vidigi unu aŭ du sagetojn indikantajn direkton al map-markoj.</string>
     <string name="distance_indication_descr">Elekti kiel vidigi distancon al aktivaj map-markoj.</string>
-    <string name="active_markers_descr">Nombro da indikiloj de direkto por vidigi.</string>
+    <string name="active_markers_descr">Nombro de indikiloj de direkto por vidigi.</string>
     <string name="looking_for_tracks_with_waypoints">Serĉado de kursoj kun navigadpunktoj</string>
     <string name="shared_string_more_without_dots">Pli</string>
     <string name="empty_state_osm_edits">Krei aŭ redakti OSM-objektojn</string>
@@ -3060,8 +3059,8 @@
     <string name="edit_profile_setup_map_subtitle">Elekti agordojn pri mapo por la profilo</string>
     <string name="edit_profile_screen_options_subtitle">Elekti agordojn pri ekrano por la profilo</string>
     <string name="edit_profile_nav_settings_subtitle">Elekti agordojn pri navigado por la profilo</string>
-    <string name="routing_attr_max_num_changes_description">Difini maksimuman nombron da ŝanĝoj de transportiloj</string>
-    <string name="routing_attr_max_num_changes_name">Nombro da transveturiliĝoj</string>
+    <string name="routing_attr_max_num_changes_description">Difini maksimuman nombron de ŝanĝoj de transportiloj</string>
+    <string name="routing_attr_max_num_changes_name">Nombro de transveturiliĝoj</string>
     <string name="turn_screen_on_router">Teni ekranon ŝaltita</string>
     <string name="turn_screen_on_time_descr">Agordi por kiom longe la ekrano estos ŝaltita.</string>
     <string name="turn_screen_on_sensor">Uzi proksimec‑sentilon</string>
@@ -4005,4 +4004,45 @@
     <string name="activity_type_offroad_name">Ekstervoje</string>
     <string name="activity_type_motorbike_name">Motorciklo</string>
     <string name="activity_type_car_name">Aŭto</string>
+    <string name="select_segments_description">%1$s enhavas almenaŭ unu segmenton, vi devas elekti la necesan parton por navigi.</string>
+    <string name="temporary_conditional_routing_descr">Uzi vojajn limigojn, kiuj estas nun aktivaj sur la mapo</string>
+    <string name="routing_attr_driving_style_description">Elekti inter pli mallonga, pli rapida aŭ pli sekura kursoj</string>
+    <string name="snap_to_road_descr">Proksimigas emblemon de via pozicio al la nune navigata vojo</string>
+    <string name="map_orientation_threshold_descr">Aŭtomate turni la mapon nur kiam rapido estas pli alta ol la sojlo</string>
+    <string name="track_recording_stop_without_saving">Ĉesigi sen konservi</string>
+    <string name="track_recording_save_and_stop">Konservi kaj ĉesigi registri</string>
+    <string name="track_recording_title">Registrado de spuro ĉesigita</string>
+    <string name="track_recording_description">Ĉu vi certe volas ĉesigi registradon\?
+\nĈiuj nekonservitaj datumoj perdiĝos.</string>
+    <string name="on_pause">Paŭzigita</string>
+    <string name="app_restart_required">Restarto de aplikaĵo estas necesa por apliki kelkajn agordojn.</string>
+    <string name="routing_attr_height_obstacles_description">Eviti krutajn deklivojn dum navigi.</string>
+    <string name="quick_action_coordinates_widget_descr">Ŝaltilo por montri aŭ kaŝi la fenestraĵon de koordinatoj sur la mapo.</string>
+    <string name="map_widget_distance_by_tap">Distanco je frapeto</string>
+    <string name="live_update_frequency_week_variant">Kontrolos pri map‑ĝisdatigoj ĉiusemajne. Sekva ĝisdatigo okazos %1$s je %2$s.</string>
+    <string name="live_update_frequency_day_variant">Kontrolos pri map‑ĝisdatigoj ĉiutage. Sekva ĝisdatigo okazos %1$s je %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Kontrolos pri map‑ĝisdatigoj ĉiuhore. Sekva ĝisdatigo okazos %1$s je %2$s.</string>
+    <string name="live_update_delete_updates_msg">Ĉu vi certe volas forigi ĉiujn %s ĝisdatigojn OsmAnd Live\?</string>
+    <string name="track_recording_will_be_continued">La registrado pluos.</string>
+    <string name="track_has_no_altitude">La spuro ne enhavas datumojn pri altitudo.</string>
+    <string name="track_has_no_speed">La spuro ne enhavas datumojn pri rapido.</string>
+    <string name="select_another_colorization">Elektu alian specon de kolorigo.</string>
+    <string name="routing_attr_short_way_description">Optimumigita pli mallonga kurso (energiŝpara)</string>
+    <string name="latest_openstreetmap_update">Lasta disponebla ĝisdatigo de OpenStreetMap:</string>
+    <string name="last_time_checked">Lastfoje kontrolita: %s</string>
+    <string name="segments_count">Segmento %1$d</string>
+    <string name="select_segments">Elektu segmentojn</string>
+    <string name="delete_number_files_question">Ĉu forigi %1$d dosierojn\?</string>
+    <string name="select_category_descr">Elektu kategorion aŭ aldonu novan</string>
+    <string name="copy_poi_name">Kopii nomon de interesejo</string>
+    <string name="update_frequency">Ofteco de ĝisdatigoj</string>
+    <string name="updated">Ĝisdatigita: %s</string>
+    <string name="delete_updates">Forigi ĝisdatigojn</string>
+    <string name="restart">Restartigi</string>
+    <string name="shared_strings_all_regions">Ĉiuj regionoj</string>
+    <string name="purchases">Aĉetoj</string>
+    <string name="quick_action_show_hide_title">Montri/kaŝi</string>
+    <string name="shared_string_interval">Intertempo</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Kaŝi limojn de naturaj rezervejoj, protektataj areoj kaj naciaj parkoj</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Limoj de rezervejoj</string>
 </resources>

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

@@ -3813,7 +3813,7 @@
     <string name="poi_borough">Municipio</string>
     <string name="poi_traffic_signals_arrow_no">Flecha: no</string>
     <string name="poi_elevator">Ascensor</string>
-    <string name="poi_departures_board_timetable">A horario</string>
+    <string name="poi_departures_board_timetable">Tabla de horarios</string>
     <string name="poi_departures_board_realtime">En tiempo real</string>
     <string name="poi_departures_board_delay">Con retraso</string>
     <string name="poi_departures_board_yes">Sí</string>
@@ -3891,4 +3891,7 @@
     <string name="poi_gladed_yes">Arboleda: sí</string>
     <string name="poi_piste_name">Nombre de la pista</string>
     <string name="poi_piste_ski_jump">Salto con esquís</string>
+    <string name="poi_local_ref">Referencia local</string>
+    <string name="poi_geodesist">Geodésico</string>
+    <string name="poi_conference_centre">Centro de conferencias</string>
 </resources>

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

@@ -2056,11 +2056,11 @@
     <string name="shared_string_record">Grabar</string>
     <string name="gpx_logging_no_data">Sin datos</string>
     <string name="trip_rec_notification_settings">Activar la grabación rápida</string>
-    <string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación del viaje.</string>
+    <string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación de viaje.</string>
     <string name="shared_string_notifications">Notificaciones</string>
     <string name="gpx_no_tracks_title">Sin archivos de trazas aún</string>
     <string name="gpx_no_tracks_title_folder">También puedes añadir archivos de trazas a la carpeta</string>
-    <string name="gpx_add_track">Añadir más…</string>
+    <string name="gpx_add_track">Añadir</string>
     <string name="shared_string_appearance">Aspecto</string>
     <string name="rendering_value_fine_name">Muy fino</string>
     <string name="route_calculation">Cálculo de la ruta</string>
@@ -2171,7 +2171,6 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-
     <string name="routing_attr_driving_style_name">Estilo de conducción</string>
     <string name="select_gpx_folder">Marcar la carpeta del archivo GPX</string>
     <string name="file_can_not_be_moved">No se pudo mover el archivo.</string>
@@ -2305,11 +2304,11 @@
 \n • (Opcional) Muestra la velocidad y altitud
 \n • Activa la visualización de las curvas de nivel y el sombreado de colinas (mediante un complemento adicional)</string>
     <string name="osmand_plus_extended_description_part7">Contribuye directamente con OSM
-\n • Informa sobre problemas de datos en el mapa
-\n • Sube trazas GPX a OSM directamente desde la aplicación
-\n • Añade PDI y súbelos directamente a OSM (o más tarde, si no estás conectado)
-\n • (Opcional) Grabación del viaje en modo reposo (mientras el dispositivo está bloqueado)
-\n OsmAnd es un software de código abierto, activamente desarrollado. Cualquiera puede contribuir con la aplicación informando sobre errores, mejorando las traducciones o desarrollando nuevas funciones. Además, el proyecto también depende de contribuciones financieras para desarrollar y probar nuevas funcionalidades.
+\n• Informa sobre problemas de datos en el mapa
+\n• Sube trazas GPX a OSM directamente desde la aplicación
+\n• Añade PDI y súbelos directamente a OSM (o más tarde, si no estás conectado)
+\n• (Opcional) Grabación de viaje en modo reposo (mientras el dispositivo está bloqueado)
+\nOsmAnd es un software de código abierto, activamente desarrollado. Cualquiera puede contribuir con la aplicación informando sobre errores, mejorando las traducciones o desarrollando nuevas funciones. Además, el proyecto también depende de contribuciones financieras para desarrollar y probar nuevas funcionalidades.
 \n</string>
     <string name="osmand_plus_extended_description_part8">Cobertura y calidad aproximada del mapa:
 \n • Europa Occidental: ****
@@ -3323,7 +3322,7 @@
     <string name="multimedia_notes_prefs_descr">Tamaño de imagen, calidad de audio y video</string>
     <string name="osm_editing_prefs_descr">Inicio de sesión, contraseña, edición sin conexión</string>
     <string name="accessibility_prefs_descr">Elegir icono, color y nombre</string>
-    <string name="live_monitoring_descr">Permite compartir la ubicación actual utilizando la grabación del viaje.</string>
+    <string name="live_monitoring_descr">Permite compartir la ubicación actual utilizando la grabación de viaje.</string>
     <string name="live_monitoring">Seguimiento en línea</string>
     <string name="save_track_logging_accuracy">Precisión de registro</string>
     <string name="tracks_view_descr">Puedes encontrar todas tus trazas grabadas en «%1$s» o en la carpeta OsmAnd usando el administrador de archivos.</string>
@@ -3742,7 +3741,7 @@
     <string name="empty_state_my_tracks">Añadir archivos de traza</string>
     <string name="context_menu_item_add_waypoint">Añadir punto de referencia de la traza</string>
     <string name="quick_action_add_gpx">Añadir punto de referencia de la traza</string>
-    <string name="map_widget_monitoring">Grabación del viaje</string>
+    <string name="map_widget_monitoring">Grabación de viaje</string>
     <string name="marker_save_as_track">Guardar como archivo de traza</string>
     <string name="follow_track">Seguir traza</string>
     <string name="follow_track_descr">Elige el archivo de la traza a seguir</string>
@@ -3765,8 +3764,8 @@
     <string name="monitoring_control_start">Grabar</string>
     <string name="disable_recording_once_app_killed_descrp">La grabación de la traza se pausará al cerrar la aplicación (mediante aplicaciones recientes). (La indicación de fondo de OsmAnd, desaparecerá de la barra de notificaciones de Android.)</string>
     <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activado desde el widget «Grabación de viaje» en el mapa).</string>
-    <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>
-    <string name="gpx_monitoring_start">Reanudar grabación del viaje</string>
+    <string name="gpx_monitoring_stop">Pausar grabación de viaje</string>
+    <string name="gpx_monitoring_start">Reanudar grabación de viaje</string>
     <string name="system_default_theme">Predefinido del sistema</string>
     <string name="all_next_segments">Todos los segmentos posteriores</string>
     <string name="previous_segment">Segmento anterior</string>
@@ -3777,7 +3776,7 @@
     <string name="open_saved_track">Abrir traza guardada</string>
     <string name="shared_string_is_saved">está guardado</string>
     <string name="simplified_track_description">Sólo se guardará la línea de la ruta, los puntos de referencia serán borrados.</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivo(s) de trazas marcado(s)</string>
+    <string name="number_of_gpx_files_selected_pattern">Se muestran %s trazas</string>
     <string name="one_point_error">Añade al menos dos puntos.</string>
     <string name="shared_string_redo">Rehacer</string>
     <string name="release_3_8">• Se ha actualizado la función «Planificar ruta»: permite utilizar diferentes tipos de navegación por segmento y la inclusión de trazas
@@ -4007,4 +4006,45 @@
     <string name="activity_type_offroad_name">Todo terreno</string>
     <string name="activity_type_motorbike_name">Motocicleta</string>
     <string name="activity_type_car_name">Automóvil</string>
+    <string name="map_widget_distance_by_tap">Distancia al pulsar</string>
+    <string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
+    <string name="select_segments">Elegir segmentos</string>
+    <string name="select_segments_description">«%1$s» contiene más de un segmento, debe marcar la parte necesaria para la navegación.</string>
+    <string name="segments_count">Segmento %1$d</string>
+    <string name="temporary_conditional_routing_descr">Usar las restricciones viales que están activas ahora en el mapa</string>
+    <string name="routing_attr_short_way_description">Ruta optimizada más corta (bajo consumo)</string>
+    <string name="routing_attr_driving_style_description">Elige el propósito de la conducción para obtener la ruta más corta, más rápida o más segura</string>
+    <string name="snap_to_road_descr">El icono de la ubicación actual se ajustará a la ruta de navegación actual</string>
+    <string name="map_orientation_threshold_descr">No girar la vista del mapa si la velocidad es inferior a un umbral</string>
+    <string name="restart">Reiniciar</string>
+    <string name="shared_strings_all_regions">Todas las regiones</string>
+    <string name="delete_number_files_question">¿Borrar %1$d archivos\?</string>
+    <string name="track_recording_stop_without_saving">Parar sin guardar</string>
+    <string name="track_recording_save_and_stop">Guardar y parar la grabación</string>
+    <string name="track_recording_title">Grabación de la traza detenida</string>
+    <string name="track_recording_description">¿Dejar de grabar\?
+\nTodos los datos no guardados se perderán.</string>
+    <string name="on_pause">En pausa</string>
+    <string name="app_restart_required">Es necesario reiniciar la aplicación para aplicar algunos ajustes.</string>
+    <string name="routing_attr_height_obstacles_description">La ruta podría evitar las fuertes subidas.</string>
+    <string name="quick_action_coordinates_widget_descr">Alternar para mostrar u ocultar el widget de coordenadas en el mapa.</string>
+    <string name="latest_openstreetmap_update">Última actualización de OpenStreetMap disponible:</string>
+    <string name="updated">Actualizado: %s</string>
+    <string name="last_time_checked">Última comprobación: %s</string>
+    <string name="update_frequency">Frecuencia de actualización</string>
+    <string name="live_update_frequency_week_variant">Las actualizaciones del mapa serán comprobadas cada semana. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="live_update_frequency_day_variant">Las actualizaciones del mapa serán comprobadas cada día. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="live_update_frequency_hour_variant">Las actualizaciones del mapa serán comprobadas cada hora. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="delete_updates">Borrar actualizaciones</string>
+    <string name="live_update_delete_updates_msg">¿Borrar todas las actualizaciones en vivo de «%s»\?</string>
+    <string name="purchases">Compras</string>
+    <string name="select_category_descr">Marca una categoría o añade una nueva</string>
+    <string name="track_recording_will_be_continued">La grabación continuará.</string>
+    <string name="copy_poi_name">Copiar nombre del PDI</string>
+    <string name="shared_string_interval">Intervalo</string>
+    <string name="track_has_no_altitude">La traza no contiene datos de altitud.</string>
+    <string name="track_has_no_speed">La traza no contiene datos de velocidad.</string>
+    <string name="select_another_colorization">Elige otro tipo de color.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Fronteras naturales</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Oculta fronteras de reservas naturales, áreas protegidas y parques nacionales</string>
 </resources>

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

@@ -3891,4 +3891,7 @@
     <string name="poi_patrolled_no">Patrullado: no</string>
     <string name="poi_mobile_library">Biblioteca móvil (parada)</string>
     <string name="poi_gladed_yes">Arboleda: sí</string>
+    <string name="poi_local_ref">Referencia local</string>
+    <string name="poi_geodesist">Geodésico</string>
+    <string name="poi_conference_centre">Centro de conferencias</string>
 </resources>

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

@@ -380,7 +380,7 @@
     <string name="error_avoid_specific_road">No se ha encontrado un desvío</string>
     <string name="map_update">Actualización disponible para %1$s mapa(s)</string>
     <string name="wake_on_voice">Encender pantalla</string>
-    <string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas del tiempo, mapas del clima, mapas geológicos, capas de sombreado, etc. 
+    <string name="osmand_rastermaps_plugin_description">Accede a tantos tipos de mapas en línea (llamados teselas o ráster) que desees, desde teselas predefinidas de OSM (como Mapnik) a imágenes satelitales y capas de propósito especial como mapas meteorológicos, mapas del clima, mapas geológicos, capas de sombreado, etc.
 \n
 \nCualquiera de estos mapas puede usarse como el mapa predefinido que se mostrará, o como una superposición o subyacencia de otro mapa base (como los mapas estándar de OsmAnd en línea). Ciertos elementos de los mapas vectoriales de OsmAnd pueden ocultarse a través del menú «Configurar mapa» para hacer cualquier subyacencia mas visible.
 \n
@@ -418,7 +418,7 @@
     <string name="osmand_parking_plugin_description">Registra dónde se ha estacionado el automóvil, incluyendo cuánto tiempo queda. 
 \n Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú principal y en un widget sobre el mapa. Se puede añadir una alarma de recordatorio al calendario de Android.</string>
     <string name="osmand_distance_planning_plugin_description">Crea caminos pulsando el mapa, usando o modificando archivos GPX existentes, para planificar un viaje y medir la distancia entre puntos. El resultado puede guardarse como un archivo GPX y usarse luego para la orientación.</string>
-    <string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación D-pad, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string>
+    <string name="osmand_accessibility_description">Activa las funciones de accesibilidad del dispositivo, directamente en OsmAnd. Facilita por ejemplo, el ajuste de la velocidad de la voz para voces de texto a voz, la configuración de navegación del pad direccional, usando la rueda de desplazamiento para el control del zoom, o la retroalimentación de texto a voz, por ejemplo, para anunciar la ubicación automáticamente.</string>
     <string name="osm_editing_plugin_description">Haz contribuciones en OSM, como el crear o modificar objetos PDI, abrir o comentar notas de OSM y contribuir con archivos de trazas GPX grabados en OsmAnd, proporcionando tu nombre de usuario y contraseña. OpenStreetMap.org es un proyecto de mapeo de dominio público, global, libre e impulsado por la comunidad.</string>
     <string name="osmand_development_plugin_description">Ajusta las funciones de desarrollo y depuración, como la simulación de navegación, el rendimiento del renderizado o las indicaciones por voz. Destinado para desarrolladores, no es necesario para el normal uso de la aplicación.</string>
     <string name="world_ski_missing">Descargar el mapa especial sin conexión para mostrar las instalaciones de esquí.</string>
@@ -1057,7 +1057,7 @@
     <string name="city_type_suburb">Suburbio</string>
     <string name="city_type_hamlet">Aldea</string>
     <string name="city_type_village">Villa</string>
-    <string name="city_type_town">Pueblo</string>
+    <string name="city_type_town">Ciudad pequeña</string>
     <string name="city_type_city">Ciudad</string>
     <string name="animate_route_off">Parar simulación</string>
     <string name="animate_route">Iniciar simulación</string>
@@ -1662,7 +1662,7 @@
     <string name="shared_string_navigation">Navegación</string>
     <string name="osmand_running_in_background">Ejecutar en modo reposo</string>
     <string name="favourites_edit_dialog_title">Información del favorito</string>
-    <string name="favourites_context_menu_add">Añadir a Favoritos</string>
+    <string name="favourites_context_menu_add">Añadir favorito</string>
     <string name="roads">Caminos</string>
     <string name="default_speed_system_descr">Define la unidad de velocidad.</string>
     <string name="default_speed_system">Unidad de velocidad</string>
@@ -2056,11 +2056,11 @@
     <string name="shared_string_record">Grabar</string>
     <string name="gpx_logging_no_data">Sin datos</string>
     <string name="trip_rec_notification_settings">Activar la grabación rápida</string>
-    <string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación del viaje.</string>
+    <string name="trip_rec_notification_settings_desc">Muestra una notificación del sistema que permite iniciar la grabación de viaje.</string>
     <string name="shared_string_notifications">Notificaciones</string>
     <string name="gpx_no_tracks_title">Sin archivos de trazas aún</string>
     <string name="gpx_no_tracks_title_folder">También puedes añadir archivos de trazas a la carpeta</string>
-    <string name="gpx_add_track">Añadir más…</string>
+    <string name="gpx_add_track">Añadir</string>
     <string name="shared_string_appearance">Aspecto</string>
     <string name="rendering_value_fine_name">Muy fino</string>
     <string name="route_calculation">Cálculo de la ruta</string>
@@ -2171,7 +2171,6 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-
     <string name="routing_attr_driving_style_name">Estilo de conducción</string>
     <string name="select_gpx_folder">Marcar la carpeta del archivo GPX</string>
     <string name="file_can_not_be_moved">No se pudo mover el archivo.</string>
@@ -2305,11 +2304,11 @@
 \n • (Opcional) Muestra la velocidad y altitud
 \n • Activa la visualización de las curvas de nivel y el sombreado de colinas (mediante un complemento adicional)</string>
     <string name="osmand_plus_extended_description_part7">Contribuye directamente con OSM
-\n • Informa sobre problemas de datos en el mapa
-\n • Sube trazas GPX a OSM directamente desde la aplicación
-\n • Añade PDI y súbelos directamente a OSM (o más tarde, si no estás conectado)
-\n • (Opcional) Grabación del viaje en modo reposo (mientras el dispositivo está bloqueado)
-\n OsmAnd es un software de código abierto, activamente desarrollado. Cualquiera puede contribuir con la aplicación informando sobre errores, mejorando las traducciones o desarrollando nuevas funciones. Además, el proyecto también depende de contribuciones financieras para desarrollar y probar nuevas funcionalidades.
+\n• Informa sobre problemas de datos en el mapa
+\n• Sube trazas GPX a OSM directamente desde la aplicación
+\n• Añade PDI y súbelos directamente a OSM (o más tarde, si no estás conectado)
+\n• (Opcional) Grabación de viaje en modo reposo (mientras el dispositivo está bloqueado)
+\nOsmAnd es un software de código abierto, activamente desarrollado. Cualquiera puede contribuir con la aplicación informando sobre errores, mejorando las traducciones o desarrollando nuevas funciones. Además, el proyecto también depende de contribuciones financieras para desarrollar y probar nuevas funcionalidades.
 \n</string>
     <string name="osmand_plus_extended_description_part8">Cobertura y calidad aproximada del mapa:
 \n • Europa Occidental: ****
@@ -2668,7 +2667,7 @@
     <string name="shared_string_wikivoyage">Wikiviajes</string>
     <string name="index_item_world_wikivoyage">Artículos de Wikiviajes en todo el mundo</string>
     <string name="online_webpage_warning">La página sólo está disponible en línea. ¿Abrirla en el navegador web?</string>
-    <string name="images_cache">Caché de imágenes</string>
+    <string name="images_cache">Almacén de imágenes</string>
     <string name="delete_search_history">Borrar historial de búsquedas</string>
     <string name="show_images">Mostrar imágenes</string>
     <string name="shared_string_dont">No</string>
@@ -3302,7 +3301,7 @@
     <string name="select_color">Elegir el color</string>
     <string name="edit_profiles_descr">Los perfiles predefinidos de OsmAnd no se pueden borrar, sino desactivar (en la pantalla anterior) u ordenarse en la parte inferior.</string>
     <string name="edit_profiles">Editar perfiles</string>
-    <string name="select_nav_profile_dialog_message">El «Tipo de navegación» rige la forma en que se calculan las rutas.</string>
+    <string name="select_nav_profile_dialog_message">El «Tipo de navegación» determina cómo se calculan las rutas.</string>
     <string name="profile_appearance">Aspecto del perfil</string>
     <string name="choose_icon_color_name">Icono, color y nombre</string>
     <string name="reorder_profiles">Editar la lista de perfiles</string>
@@ -3322,7 +3321,7 @@
     <string name="multimedia_notes_prefs_descr">Tamaño de imagen, calidad de audio y video</string>
     <string name="osm_editing_prefs_descr">Inicio de sesión, contraseña, edición sin conexión</string>
     <string name="accessibility_prefs_descr">Elegir icono, color y nombre</string>
-    <string name="live_monitoring_descr">Permite compartir la ubicación actual utilizando la grabación del viaje.</string>
+    <string name="live_monitoring_descr">Permite compartir la ubicación actual utilizando la grabación de viaje.</string>
     <string name="live_monitoring">Seguimiento en línea</string>
     <string name="save_track_logging_accuracy">Precisión de registro</string>
     <string name="tracks_view_descr">Puedes encontrar todas tus trazas grabadas en «%1$s» o en la carpeta OsmAnd usando el administrador de archivos.</string>
@@ -3531,7 +3530,7 @@
     <string name="search_poi_types">Buscar por tipos de PDI</string>
     <string name="radius_ruler_item">Regla radial</string>
     <string name="quick_action_item">Acción rápida</string>
-    <string name="osmand_purchases_item">Compras de OsmAnd</string>
+    <string name="osmand_purchases_item">Compras en OsmAnd</string>
     <string name="osm_live_payment_subscription_management">El pago será cargado a la cuenta de Google Play al confirmar la compra. 
 \n 
 \nLa suscripción se renueva automáticamente a menos que se cancele antes de la fecha de renovación. Se le cobrará a su cuenta el período de renovación (mes/trimestre/año) sólo en la fecha de renovación. 
@@ -3562,7 +3561,7 @@
     <string name="lang_ky">Kirguís</string>
     <string name="lang_kk">Kazajo</string>
     <string name="lang_jv">Javanés</string>
-    <string name="lang_gu">Gujarati</string>
+    <string name="lang_gu">Gujaratí</string>
     <string name="lang_cv">Chuvash</string>
     <string name="lang_ce">Checheno</string>
     <string name="lang_bar">Bávaro</string>
@@ -3708,7 +3707,7 @@
     <string name="app_mode_go_cart">Go-kart</string>
     <string name="add_to_a_track">Añadir a una traza</string>
     <string name="add_hidden_group_info">El punto añadido no será visible en el mapa, ya que el grupo elegido está oculto, se puede encontrar en «%s».</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivo(s) de trazas marcado(s)</string>
+    <string name="number_of_gpx_files_selected_pattern">Se muestran %s trazas</string>
     <string name="whole_track">Traza completa</string>
     <string name="threshold_distance">Distancia de umbral</string>
     <string name="system_default_theme">Predefinido del sistema</string>
@@ -3757,12 +3756,12 @@
     <string name="navigate_to_track_descr">Navegar desde mi ubicación a la traza</string>
     <string name="monitoring_control_start">Grabar</string>
     <string name="marker_save_as_track">Guardar como archivo de traza</string>
-    <string name="map_widget_monitoring">Grabación del viaje</string>
+    <string name="map_widget_monitoring">Grabación de viaje</string>
     <string name="layer_gpx_layer">Trazas</string>
     <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
     <string name="import_track_descr">Elige el archivo de la traza a seguir o impórtala desde el dispositivo.</string>
-    <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>
-    <string name="gpx_monitoring_start">Reanudar grabación del viaje</string>
+    <string name="gpx_monitoring_stop">Pausar grabación de viaje</string>
+    <string name="gpx_monitoring_start">Reanudar grabación de viaje</string>
     <string name="follow_track_descr">Elige el archivo de la traza a seguir</string>
     <string name="follow_track">Seguir traza</string>
     <string name="empty_state_my_tracks_desc">Importa o graba archivos de trazas</string>
@@ -3906,7 +3905,7 @@
     <string name="plan_route_add_new_segment">Añadir nuevo segmento</string>
     <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
     <string name="lang_de_casual">Alemán (casual)</string>
-    <string name="app_mode_light_aircraft">Avión ligero</string>
+    <string name="app_mode_light_aircraft">Aeronave ligera</string>
     <string name="shared_string_last_used">Usado por última vez</string>
     <string name="routing_attr_prefer_hiking_routes_name">Preferir rutas de senderismo</string>
     <string name="routing_attr_prefer_hiking_routes_description">Prefiere rutas de senderismo</string>
@@ -4007,4 +4006,45 @@
     <string name="activity_type_hiking_name">Senderismo</string>
     <string name="activity_type_cycling_name">Bicicleta</string>
     <string name="activity_type_car_name">Automóvil</string>
+    <string name="select_segments">Elegir segmentos</string>
+    <string name="select_segments_description">«%1$s» contiene más de un segmento, debe marcar la parte necesaria para la navegación.</string>
+    <string name="segments_count">Segmento %1$d</string>
+    <string name="temporary_conditional_routing_descr">Usar las restricciones viales que están activas ahora en el mapa</string>
+    <string name="routing_attr_short_way_description">Ruta optimizada más corta (bajo consumo)</string>
+    <string name="routing_attr_driving_style_description">Elige el propósito de la conducción para obtener la ruta más corta, más rápida o más segura</string>
+    <string name="snap_to_road_descr">El icono de la ubicación actual se ajustará a la ruta de navegación actual</string>
+    <string name="map_orientation_threshold_descr">No girar la vista del mapa si la velocidad es inferior a un umbral</string>
+    <string name="restart">Reiniciar</string>
+    <string name="shared_strings_all_regions">Todas las regiones</string>
+    <string name="delete_number_files_question">¿Borrar %1$d archivos\?</string>
+    <string name="track_recording_stop_without_saving">Parar sin guardar</string>
+    <string name="track_recording_save_and_stop">Guardar y parar la grabación</string>
+    <string name="track_recording_title">Grabación de la traza detenida</string>
+    <string name="track_recording_description">¿Dejar de grabar\?
+\nTodos los datos no guardados se perderán.</string>
+    <string name="on_pause">En pausa</string>
+    <string name="app_restart_required">Es necesario reiniciar la aplicación para aplicar algunos ajustes.</string>
+    <string name="routing_attr_height_obstacles_description">La ruta podría evitar las fuertes subidas.</string>
+    <string name="quick_action_coordinates_widget_descr">Alternar para mostrar u ocultar el widget de coordenadas en el mapa.</string>
+    <string name="map_widget_distance_by_tap">Distancia al pulsar</string>
+    <string name="latest_openstreetmap_update">Última actualización de OpenStreetMap disponible:</string>
+    <string name="updated">Actualizado: %s</string>
+    <string name="last_time_checked">Última comprobación: %s</string>
+    <string name="update_frequency">Frecuencia de actualización</string>
+    <string name="live_update_frequency_week_variant">Las actualizaciones del mapa serán comprobadas cada semana. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="live_update_frequency_day_variant">Las actualizaciones del mapa serán comprobadas cada día. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="live_update_frequency_hour_variant">Las actualizaciones del mapa serán comprobadas cada hora. Próxima vez el %1$s a las %2$s hs.</string>
+    <string name="delete_updates">Borrar actualizaciones</string>
+    <string name="live_update_delete_updates_msg">¿Borrar todas las actualizaciones en vivo de «%s»\?</string>
+    <string name="purchases">Compras</string>
+    <string name="select_category_descr">Marca una categoría o añade una nueva</string>
+    <string name="track_recording_will_be_continued">La grabación continuará.</string>
+    <string name="copy_poi_name">Copiar nombre del PDI</string>
+    <string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
+    <string name="shared_string_interval">Intervalo</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Oculta fronteras de reservas naturales, áreas protegidas y parques nacionales</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Fronteras naturales</string>
+    <string name="track_has_no_altitude">La traza no contiene datos de altitud.</string>
+    <string name="track_has_no_speed">La traza no contiene datos de velocidad.</string>
+    <string name="select_another_colorization">Elige otro tipo de color.</string>
 </resources>

OsmAnd/res/values-es/strings.xml

@@ -2160,7 +2160,6 @@
     <string name="shared_string_time">Tiempo</string>
     <string name="total_distance">Distancia total</string>
     <string name="routing_attr_height_obstacles_name">Usar datos de elevación</string>
-
     <string name="rendering_attr_depthContours_description">Mostrar curvas y puntos de profundidad.</string>
     <string name="rendering_attr_depthContours_name">Curvas de profundidad náuticas</string>
     <string name="auto_split_recording_title">División automática de grabaciones en intervalos</string>
@@ -3698,7 +3697,7 @@
     <string name="simplified_track">Traza simplificada</string>
     <string name="simplified_track_description">Sólo se grabará la línea de la ruta, los puntos intermedios (waypoints) se borrarán.</string>
     <string name="shared_string_file_name">Nombre de archivo</string>
-    <string name="number_of_gpx_files_selected_pattern">%s archivo(s) de trazas marcado(s)</string>
+    <string name="number_of_gpx_files_selected_pattern">%s archivos de trazas marcados</string>
     <string name="monitoring_control_start">Grabar</string>
     <string name="save_global_track_interval_descr">Especifica el intervalo de grabación general para trazas (activado a través del widget de grabación en el mapa).</string>
     <string name="gpx_monitoring_stop">Pausar grabación del viaje</string>

OsmAnd/res/values-et/phrases.xml

@@ -406,7 +406,7 @@
     <string name="poi_construction">Ehitus</string>
     <string name="poi_works">Töökoht</string>
     <string name="poi_mineshaft">Kaevandusšaht</string>
-    <string name="poi_adit">Adit</string>
+    <string name="poi_adit">Stoll</string>
     <string name="poi_petroleum_well">Naftakaev</string>
     <string name="poi_survey_point">Vaatluspunkt</string>
     <string name="poi_windmill">Tuuleveski</string>
@@ -457,9 +457,9 @@
     <string name="poi_blood_bank">Verepank</string>
     <string name="poi_midwife">Ämmaemand</string>
     <string name="poi_occupational_therapist">Tööterapeut</string>
-    <string name="poi_optometrist">Optometrist</string>
+    <string name="poi_optometrist">Silmaarst</string>
     <string name="poi_physiotherapist">Füsioterapeut</string>
-    <string name="poi_podiatrist">Podiatrist</string>
+    <string name="poi_podiatrist">Jalaarst</string>
     <string name="poi_psychotherapist">Psühhoterapeut</string>
     <string name="poi_healthcare_rehabilitation">Taastusravi</string>
     <string name="poi_speech_therapist">Kõneterapeut</string>
@@ -676,7 +676,7 @@
     <string name="poi_horse_racing">Traavivõistlused</string>
     <string name="poi_ice_skating">Uisutamine</string>
     <string name="poi_ice_stock">Jäävaru</string>
-    <string name="poi_korfbal">Korfball</string>
+    <string name="poi_korfbal">Korfpall</string>
     <string name="poi_orienteering">Orienteerumine</string>
     <string name="poi_paddle_tennis">Mõlatennis</string>
     <string name="poi_paragliding">Paraliuglemine</string>
@@ -1154,7 +1154,7 @@
     <string name="poi_religion_bahai">Bahaism</string>
     <string name="poi_religion_scientologist">Saientologism</string>
     <string name="poi_religion_pagan">Paganlus</string>
-    <string name="poi_religion_tenrikyo">Tenrikyo</string>
+    <string name="poi_religion_tenrikyo">Tenrikyō</string>
     <string name="poi_religion_zoroastrian">Zoroastrism</string>
     <string name="poi_denomination_catholic">Katoliku</string>
     <string name="poi_denomination_baptist">Baptist</string>
@@ -1177,7 +1177,7 @@
     <string name="poi_denomination_new_apostolic">Uus apostliku</string>
     <string name="poi_denomination_church_of_england">Inglismaa kirik</string>
     <string name="poi_denomination_episcopal">Piiskoplik</string>
-    <string name="poi_denomination_shia">Shia</string>
+    <string name="poi_denomination_shia">Šiism</string>
     <string name="poi_denomination_united">Ühine</string>
     <string name="poi_denomination_greek_catholic">Kreeka katoliku</string>
     <string name="poi_denomination_tibetan">Tiibeti</string>
@@ -1197,7 +1197,7 @@
     <string name="poi_denomination_congregational">Koguduse</string>
     <string name="poi_denomination_old_believers">Vanausulised</string>
     <string name="poi_denomination_serbian_orthodox">Serbia õigeusu</string>
-    <string name="poi_denomination_spiritist">Spiritist</string>
+    <string name="poi_denomination_spiritist">Spiritistlik</string>
     <string name="poi_denomination_armenian_apostolic">Armeenia apostellik</string>
     <string name="poi_denomination_dutch_reformed">Hollandi reformitud</string>
     <string name="poi_denomination_apostolic">Apostellik</string>
@@ -2959,7 +2959,7 @@
     <string name="poi_cuisine_brasserie">Brasserie</string>
     <string name="poi_cuisine_bubble_tea">Mullitee</string>
     <string name="poi_cuisine_yakitori">Yakitori</string>
-    <string name="poi_cuisine_sagardotegia">Sagardotegia</string>
+    <string name="poi_cuisine_sagardotegia">Siidrimaja</string>
     <string name="poi_cuisine_meat">Liha</string>
     <string name="poi_cuisine_wings">Tiivad</string>
     <string name="poi_cuisine_waffle">Vahvlid</string>
@@ -3252,7 +3252,7 @@
     <string name="poi_water_supply_water_well">Veekaev</string>
     <string name="poi_water_supply_pipeline">Torustik</string>
     <string name="poi_water_supply_running_water">Jooksev vesi</string>
-    <string name="poi_water_supply_pump">Pump</string>
+    <string name="poi_water_supply_pump">Veepump</string>
     <string name="poi_water_supply_borehole">Puurauk</string>
     <string name="poi_water_supply_water_trucking">Veetransport</string>
     <string name="poi_water_supply_water_tank">Veemahuti</string>
@@ -3726,7 +3726,7 @@
     <string name="poi_cash_withdrawal_postfinance_card">Postfinance kaart</string>
     <string name="poi_cash_withdrawal_migros_bank">Migros pank</string>
     <string name="poi_cash_withdrawal_girocard">Girocard</string>
-    <string name="poi_cash_withdrawal_postbank">Postbank</string>
+    <string name="poi_cash_withdrawal_postbank">Postipank</string>
     <string name="poi_bath_type_hot_spring">Kuumaveeallikas</string>
     <string name="poi_bath_type_onsen">Onsen</string>
     <string name="poi_bath_type_hammam">Hammam</string>
@@ -3750,7 +3750,7 @@
     <string name="poi_url">URL</string>
     <string name="poi_volcano_type">Liik</string>
     <string name="poi_volcano_status">Olek</string>
-    <string name="poi_volcano_type_scoria">Scoria</string>
+    <string name="poi_volcano_type_scoria">Räbu</string>
     <string name="poi_volcano_type_stratovolcano">Kihtvulkaan</string>
     <string name="poi_volcano_type_shield">Kilp</string>
     <string name="poi_volcano_type_maar">Maar</string>
@@ -3881,4 +3881,17 @@
     <string name="poi_wildlife_crossing_bat_tunnel">Tunnel nahkhiirtele</string>
     <string name="poi_wildlife_crossing_bat_bridge">Sild nahkhiirtele</string>
     <string name="poi_wildlife_crossing">Metsloomade teeületuskoht</string>
+    <string name="poi_local_ref">Kohalik viide</string>
+    <string name="poi_geodesist">Geodeetik</string>
+    <string name="poi_conference_centre">Konverentsikeskus</string>
+    <string name="poi_mobile_library">Mobiilse raamatukogu peatus</string>
+    <string name="poi_summit_register_no">Tipu register: ei</string>
+    <string name="poi_summit_register_yes">Tipu register: jah</string>
+    <string name="poi_piste_status_closed">Nõlva olek: suletud</string>
+    <string name="poi_piste_status_open">Nõlva olek: avatud</string>
+    <string name="poi_patrolled_no">Patrullitud: ei</string>
+    <string name="poi_patrolled_yes">Patrullitud: jah</string>
+    <string name="poi_gladed_yes">Lagendikega: jah</string>
+    <string name="poi_piste_name">Nõlva nimi</string>
+    <string name="poi_piste_ski_jump">Suusahüpped</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -643,7 +643,7 @@
     <string name="rendering_attr_highway_class_street_name">Tänav</string>
     <string name="rendering_attr_highway_class_service_name">Teenindus</string>
     <string name="rendering_attr_highway_class_footway_name">Jalgtee</string>
-    <string name="rendering_attr_highway_class_track_name">Rada</string>
+    <string name="rendering_attr_highway_class_track_name">Teekond</string>
     <string name="rendering_attr_highway_class_bridleway_name">Ratsutamistee</string>
     <string name="rendering_attr_highway_class_steps_name">Trepiastmed</string>
     <string name="rendering_attr_highway_class_path_name">Rada</string>
@@ -1212,7 +1212,7 @@
     <string name="proxy_pref_title">Vahendusserver</string>
     <string name="proxy_pref_descr">Määra vahendusserver.</string>
     <string name="settings_privacy">Privaatsus</string>
-    <string name="navigation_over_track">Alusta navigeerimist mööda rada\?</string>
+    <string name="navigation_over_track">Alusta teekonna navigeerimist\?</string>
     <string name="speak_pedestrian">Jalakäijate ülekäigurajad</string>
     <string name="rendering_attr_roadStyle_name">Tee stiil</string>
     <string name="rendering_value__name">Vaikimisi</string>
@@ -2005,7 +2005,7 @@
     <string name="tts_missing_language_data">Kas läheme valitud keele alla laadimiseks rakendusepoodi\?</string>
     <string name="gpx_option_reverse_route">Raja vastupidine suund</string>
     <string name="gpx_option_destination_point">Kasuta olemasoleva sihtkohta</string>
-    <string name="gpx_option_from_start_point">Mööda kogu rada</string>
+    <string name="gpx_option_from_start_point">Järgi teekonda täielikult</string>
     <string name="choose_audio_stream">Hääljuhiste väljund</string>
     <string name="choose_audio_stream_descr">Vali kõlar hääljuhiste esitamiseks.</string>
     <string name="voice_stream_voice_call">Telefonikõne hääl (et katkestada auto Bluetooth raadioid)</string>
@@ -2176,7 +2176,7 @@
     <string name="shared_string_others">Muud</string>
     <string name="default_speed_system_descr">Määra kiiruse ühik.</string>
     <string name="default_speed_system">Kiiruse ühik</string>
-    <string name="nm">nmi</string>
+    <string name="nm">M</string>
     <string name="si_nm">Meremiilid</string>
     <string name="si_kmh">Kilomeetrit tunnis</string>
     <string name="si_mph">Miili tunnis</string>
@@ -2492,7 +2492,6 @@
     <string name="rendering_attr_depthContours_description">Kuva sügavuskontuurid ja -punktid.</string>
     <string name="rendering_attr_depthContours_name">Meresügavuse kontuurid</string>
     <string name="routing_attr_height_obstacles_name">Kasuta kõrgusandmeid</string>
-
     <string name="altitude_descent">Laskumine</string>
     <string name="altitude_ascent">Tõus</string>
     <string name="altitude_range">Kõrgusevahe</string>
@@ -3306,7 +3305,7 @@
     <string name="routing_attr_allow_expert_name">Luba ekspertmarsruudid</string>
     <string name="routing_attr_allow_expert_description">Äärmiselt rasked marsruudid ohtlike takistuste ja ümbrusega.</string>
     <string name="routing_attr_allow_skating_only_name">Luba ainult uisutamismarsruudid</string>
-    <string name="routing_attr_allow_skating_only_description">Rajad, mis on hooldatud vabastiilis või ainult klassikaliste radadeta uisutamiseks.</string>
+    <string name="routing_attr_allow_skating_only_description">Rajad, mis on hooldatud vabastiilis või ainult klassikaliseks radadeta uisutamiseks.</string>
     <string name="routing_attr_allow_classic_only_name">Luba ainult klassikalisi marsruute</string>
     <string name="routing_attr_allow_classic_only_description">Klassikalises stiilis hooldatud marsruudid ainult ilma uisuradadeta. See hõlmab väiksema mootorsaaniga hooldatud marsruute ja suusatajate käsitsi tehtud radu.</string>
     <string name="routing_attr_difficulty_preference_name">Eelistatud raskusaste</string>
@@ -3481,7 +3480,7 @@
     <string name="gpx_direction_arrows">Suunanooled</string>
     <string name="plan_route_last_edited">Viimati muudetud</string>
     <string name="plan_route_import_track">Impordi rada</string>
-    <string name="plan_route_open_existing_track">Ava olemasolev rada</string>
+    <string name="plan_route_open_existing_track">Ava olemasolev teekond</string>
     <string name="plan_route_select_track_file_for_open">Vali avatav rajafail.</string>
     <string name="plan_route_create_new_route">Loo uus marsruut</string>
     <string name="shared_string_done">Valmis</string>
@@ -3611,7 +3610,7 @@
     <string name="additional_actions_descr">Nendele toimingutele pääsed ligi klõpsides nuppu „%1$s“.</string>
     <string name="shared_string_legal">Juriidiline teave</string>
     <string name="reverse_route">Pööra marsruut teistpidi</string>
-    <string name="whole_track">Terve rada</string>
+    <string name="whole_track">Kogu teekond</string>
     <string name="next_segment">Järgmine segment</string>
     <string name="navigation_profile">Navigeerimisprofiil</string>
     <string name="route_between_points_add_track_desc">Vali rajafail, millele lisame uue segmendi.</string>
@@ -3650,10 +3649,10 @@
     <string name="quick_action_add_gpx">Lisa rajale teekonnapunkt</string>
     <string name="map_widget_monitoring">Teekonna salvestamine</string>
     <string name="marker_save_as_track">Salvesta rada failina</string>
-    <string name="follow_track">Jälgi rada</string>
+    <string name="follow_track">Järgi teekonda</string>
     <string name="follow_track_descr">Vali rajafail, mida soovid kasutada</string>
     <string name="import_track_descr">Vali rajafail, mida soovid kasutada või impordi see oma nutiseadmest.</string>
-    <string name="select_another_track">Vali muu rada</string>
+    <string name="select_another_track">Vali muu teekond</string>
     <string name="navigate_to_track_descr">Navigeeri minu asukohast rajale</string>
     <string name="pass_whole_track_descr">Asukoht rajal, kuhu me liigume</string>
     <string name="start_of_the_track">Raja algus</string>
@@ -3661,7 +3660,7 @@
     <string name="delete_address">Kustuta aadress</string>
     <string name="add_address">Lisa aadress</string>
     <string name="access_hint_enter_address">Sisesta aadress</string>
-    <string name="simplified_track">Lihtsustatud rada</string>
+    <string name="simplified_track">Lihtsustatud teekond</string>
     <string name="simplified_track_description">Salvestatakse ainult üldine marsruut, teekonnapunktid kustutatakse.</string>
     <string name="shared_string_file_name">Faili nimi</string>
     <string name="number_of_gpx_files_selected_pattern">%s rajafaili valitud</string>
@@ -3674,7 +3673,7 @@
     <string name="only_selected_segment_recalc">Ainult valitud segment arvutatakse ümber vastavalt valitud profiilile.</string>
     <string name="all_next_segments_will_be_recalc">Kõik järgnevad segmendid arvutatakse ümber vastavalt valitud profiilile.</string>
     <string name="all_previous_segments_will_be_recalc">Kõik eelmised segmendid arvutatakse ümber vastavalt valitud profiilile.</string>
-    <string name="open_saved_track">Ava salvestatud rada</string>
+    <string name="open_saved_track">Ava salvestatud teekond</string>
     <string name="shared_string_is_saved">on salvestatud</string>
     <string name="monitoring_control_start">SALVESTA</string>
     <string name="quick_action_switch_profile_descr">Toimingunupp lülitub valitud profiilide vahel.</string>
@@ -3925,4 +3924,132 @@
     <string name="uploading_count">Laadin üles muudatusi %1$d/%2$d</string>
     <string name="upload_photo_completed">Sai üleslaaditud</string>
     <string name="upload_photo">Laadin üles</string>
+    <string name="activity_type_offroad_name">Maastikul</string>
+    <string name="live_update_frequency_week_variant">Kaardi värskendusi kontrollitakse kord nädalas. Järgmine kord: %1$s %2$s.</string>
+    <string name="live_update_frequency_day_variant">Kaardi värskendusi kontrollitakse kord päevas. Järgmine kord: %1$s %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Kaardi värskendusi kontrollitakse kord tunnis. Järgmine kord: %1$s %2$s.</string>
+    <string name="voice_prompts_timetable">Häälteavituste ajad</string>
+    <string name="routing_attr_prefer_hiking_routes_description">Eelista matkaradu</string>
+    <string name="routing_attr_prefer_hiking_routes_name">Eelista matkaradu</string>
+    <string name="routing_attr_allow_streams_description">Luba ojad ja kraavid</string>
+    <string name="routing_attr_allow_streams_name">Luba ojad ja kraavid</string>
+    <string name="routing_attr_allow_intermittent_description">Luba vahele jäävad veeteed</string>
+    <string name="routing_attr_allow_intermittent_name">Luba vahele jäävad veeteed</string>
+    <string name="add_online_routing_engine">Lisa võrgus olev marsruutimissüsteem</string>
+    <string name="edit_online_routing_engine">Muuda võrgus olevat marsruutimissüsteemi</string>
+    <string name="shared_string_subtype">Alamliik</string>
+    <string name="shared_string_vehicle">Sõiduk</string>
+    <string name="shared_string_api_key">API võti</string>
+    <string name="shared_string_server_url">Serveri aadress</string>
+    <string name="shared_string_enter_param">Sisesta parameeter</string>
+    <string name="keep_it_empty_if_not">Vastasel korral jäta tühjaks</string>
+    <string name="online_routing_example_hint">Kohaviit võigi parameetritega näeb välja nii:</string>
+    <string name="test_route_calculation">Proovi marsruudi arvutust</string>
+    <string name="routing_engine_vehicle_type_driving">Sõites</string>
+    <string name="routing_engine_vehicle_type_foot">Jalgsi</string>
+    <string name="routing_engine_vehicle_type_bike">Jalgratas</string>
+    <string name="routing_engine_vehicle_type_car">Auto</string>
+    <string name="copy_address">Kopeeri aadress</string>
+    <string name="online_routing_engine">Marsruutimissüsteem võrgus</string>
+    <string name="delete_online_routing_engine">Kas kustutada see võrgus olev marsruutimissüsteem\?</string>
+    <string name="online_routing_engines">Marsruutimissüsteemid võrgus</string>
+    <string name="shared_string_folders">Kaustad</string>
+    <string name="select_folder">Vali kaust</string>
+    <string name="select_folder_descr">Vali kaust või loo uus</string>
+    <string name="shared_string_empty">Tühi</string>
+    <string name="analyze_by_intervals">Analüüsi poolitamise intervalle</string>
+    <string name="upload_to_openstreetmap">OpenStreetMap teenusesse laadimine</string>
+    <string name="change_folder">Vaheta kaust</string>
+    <string name="shared_string_sec">sek</string>
+    <string name="announcement_time_passing">Möödasõit</string>
+    <string name="announcement_time_approach">Lähenemine</string>
+    <string name="announcement_time_prepare_long">Pikk ettevalmistus</string>
+    <string name="announcement_time_prepare">Ettevalmistus</string>
+    <string name="announcement_time_off_route">Kõrvalekalle marsruudist</string>
+    <string name="announcement_time_arrive">Sihtkohta saabumine</string>
+    <string name="announcement_time_intervals">Aja ja kauguse intervallid</string>
+    <string name="announcement_time_descr">Erinevate häälteavituste esitamise aeg sõltub tevituse tüübist, navigeerimise kiirusest hetkel ja vaikimisi navigeerimise kiirusest.</string>
+    <string name="announcement_time_title">Teavitamise aeg</string>
+    <string name="start_recording">Alusta salvestamist</string>
+    <string name="routing_engine_vehicle_type_wheelchair">Ratastool</string>
+    <string name="routing_engine_vehicle_type_hiking">Matkamine</string>
+    <string name="routing_engine_vehicle_type_walking">Kõndimine</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">Elektrirattasõit</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Mägirattasõit</string>
+    <string name="routing_engine_vehicle_type_cycling_road">Maanterattasõit</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">Harilik rattasõit</string>
+    <string name="routing_engine_vehicle_type_hgv">Raskeveokid</string>
+    <string name="routing_engine_vehicle_type_small_truck">Väikeveok</string>
+    <string name="routing_engine_vehicle_type_truck">Veoauto</string>
+    <string name="routing_engine_vehicle_type_scooter">Tõukeratas</string>
+    <string name="routing_engine_vehicle_type_racingbike">Maanteeratas</string>
+    <string name="routing_engine_vehicle_type_mtb">Mägiratas (MTB)</string>
+    <string name="context_menu_read_full">Loe kõik</string>
+    <string name="context_menu_edit_descr">Muuda kirjeldust</string>
+    <string name="delete_waypoints">Kustuta kontollpunktid</string>
+    <string name="copy_to_map_markers">Kopeeri kaardi markeritesse</string>
+    <string name="copy_to_map_favorites">Kopeeri lemmikutesse</string>
+    <string name="select_segments">Vali segmendid</string>
+    <string name="select_segments_description">%1$s sisaldab enam kui ühe segmendi. Navigeerimiseks pead sa valima vajaliku osa.</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="hillshade_slope_contour_lines">Reljeefi varjutus / Nõlv / Kontuurjooned</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews on kogukonna juhitud projekt avalikest kohtadest nagu restoranid, hotellid, muuseumid ja kontrollpunktid. See kogub nende kohta igasugu avalikku teavet nagu fotod, ülevaated ja viited teistesse süsteemidesse nagu OpenStreetMap või Wikipeedia.
+\n
+\nKõik OpenPlaceReview andmed on avalikud ja kõigile kättesaadavad aadressil http://openplacereviews.org/data.
+\n
+\nTäiendavalt saad lugeda aadressil http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Kasuta teenust test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">OpenPlaceReviews login</string>
+    <string name="activity_type_water_name">Vesi</string>
+    <string name="activity_type_winter_name">Talv</string>
+    <string name="activity_type_snowmobile_name">Mootorsaan</string>
+    <string name="activity_type_riding_name">Ratsutamine</string>
+    <string name="activity_type_racing_name">Võistlus</string>
+    <string name="activity_type_mountainbike_name">Mägirattasõit</string>
+    <string name="activity_type_cycling_name">Rattasõit</string>
+    <string name="activity_type_hiking_name">Matkamine</string>
+    <string name="activity_type_running_name">Jooksmine</string>
+    <string name="activity_type_walking_name">Kõndimine</string>
+    <string name="activity_type_motorbike_name">Mootorratas</string>
+    <string name="activity_type_car_name">Auto</string>
+    <string name="temporary_conditional_routing_descr">Kasuta tee piiranguid, mis on kaardil hetkel aktiivsed</string>
+    <string name="routing_attr_driving_style_description">Vali sõidu eesmärk, et leida lühem, kiirem või turvalisem marsruut</string>
+    <string name="edit_track">Muuda teekonda</string>
+    <string name="rename_track">Nimeta teekond ümber</string>
+    <string name="show_track_on_map">Kuva teekond kaardil</string>
+    <string name="map_orientation_threshold_descr">Ära pööra kaardivaadet, kui kiirus on täpsuse lävest madalam</string>
+    <string name="restart">Taaskäivita</string>
+    <string name="shared_strings_all_regions">Kõik regioonid</string>
+    <string name="delete_number_files_question">Kas kustutada %1$d filai\?</string>
+    <string name="track_recording_stop_without_saving">Peata salvestamata</string>
+    <string name="track_recording_save_and_stop">Salvesta ja peata salvestamine</string>
+    <string name="track_recording_description">Kas sa soovid kindlasti salvestamise peatada\?
+\nSalvestamata andmed kaotatakse.</string>
+    <string name="track_recording_title">Teekonna salvestamine peatatud</string>
+    <string name="on_pause">Peatatud</string>
+    <string name="app_restart_required">Mõningate seadete rakendamiseks on vajalik rakenduse taaskäivitamine.</string>
+    <string name="quick_action_coordinates_widget_descr">Lüliti, mis kuvab või peidab koordinaatide vidina kaardil.</string>
+    <string name="latest_openstreetmap_update">Uusimad OpenStreetMap värskendused on saadaval:</string>
+    <string name="updated">Värskendatud: %s</string>
+    <string name="last_time_checked">Viimane kontroll: %s</string>
+    <string name="update_frequency">Värskenduste kontrolli sagedus</string>
+    <string name="delete_updates">Kustuta värskendused</string>
+    <string name="live_update_delete_updates_msg">Kas sa tõesti soovid kustutada kõik %s reaalaja värskendust\?</string>
+    <string name="select_category_descr">Vali kategooria või lisa uus</string>
+    <string name="track_recording_will_be_continued">Salvestamist jätkatakse.</string>
+    <string name="copy_poi_name">Kopeeri huvipunkti nimi</string>
+    <string name="quick_action_show_hide_title">Kuva/peida</string>
+    <string name="shared_string_interval">Intervall</string>
+    <string name="track_has_no_altitude">Teekond ei sisalda kõrguse andmeid.</string>
+    <string name="track_has_no_speed">Teekond ei sisalda kiiruse andmeid.</string>
+    <string name="select_another_colorization">Palun vali muud moodi värvimine.</string>
+    <string name="routing_attr_short_way_description">Optimeeritud lühem marsruut (energiat säästev)</string>
+    <string name="snap_to_road_descr">Hetkeasukoha ikoon seotakse aktiivse navigeerimismarsruudiga</string>
+    <string name="routing_attr_height_obstacles_description">Marsruudi loomisel võiks vältida raskeid tõuse.</string>
+    <string name="shared_string_turn">Pööra</string>
+    <string name="purchases">Ostud</string>
+    <string name="map_widget_distance_by_tap">Kaugus toksamise järgi</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Peida (loodus)kaitsealade ja rahvusparkide piirid</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Looduse piirid</string>
 </resources>

OsmAnd/res/values-fa/phrases.xml

@@ -8,10 +8,10 @@
     <string name="poi_beverages">فروشگاه نوشیدنی</string>
     <string name="poi_butcher">فروشگاه گوشت</string>
     <string name="poi_deli">بقالی</string>
-    <string name="poi_farm">فروشگاه محصولات دامی</string>
+    <string name="poi_farm">فروشگاه محصولات مزرعه</string>
     <string name="poi_greengrocer">میوه و سبزی‌فروشی</string>
     <string name="poi_seafood">فروشگاه غذاهای دریایی</string>
-    <string name="poi_confectionery">شیرینی و آجیل فروشی</string>
+    <string name="poi_confectionery">شیرینی و آب‌نبات فروشی</string>
     <string name="poi_ice_cream">بستنی فروشی</string>
     <string name="poi_supermarket">فروشگاه بزرگ</string>
     <string name="poi_tea">فروشگاه چای</string>
@@ -19,18 +19,18 @@
     <string name="poi_vending_machine">دستگاه فروش خودکار</string>
     <string name="poi_books">کتابفروشی</string>
     <string name="poi_bicycle">فروشگاه دوچرخه</string>
-    <string name="poi_anime">فروشگاه کارتون</string>
+    <string name="poi_anime">فروشگاه انیمه</string>
     <string name="poi_antiques">عتیقه فروشی</string>
     <string name="poi_art">فروشگاه هنر</string>
     <string name="poi_baby_goods">کالای کودک</string>
-    <string name="poi_bag">فروشگاه کیف</string>
+    <string name="poi_bag">کیف فروشی</string>
     <string name="poi_bathroom_furnishing">لوازم حمام</string>
     <string name="poi_bed">مبلمان اتاق خواب</string>
     <string name="poi_boutique">بوتیک</string>
-    <string name="poi_carpet">فروشگاه فرش</string>
+    <string name="poi_carpet">فرش فروشی</string>
     <string name="poi_chemist">فروشگاه محصولات بهداشتی و آرایشی</string>
     <string name="poi_clothes">فروشگاه پوشاک</string>
-    <string name="poi_clothes_children">\فروشگاه پوشاک کودکان</string>
+    <string name="poi_clothes_children">فروشگاه پوشاک کودک</string>
     <string name="poi_shoes">کفش فروشی</string>
     <string name="poi_computer">فروشگاه کامپیوتر</string>
     <string name="poi_copyshop">فروشگاه چاپ و تکثیر</string>
@@ -63,7 +63,7 @@
     <string name="poi_musical_instrument">فروشگاه لوزم موسیقی</string>
     <string name="poi_newsagent">روزنامه فروشی</string>
     <string name="poi_optician">عینک سازی</string>
-    <string name="poi_organic">مواد غذایی ارگانیک</string>
+    <string name="poi_organic">محصولات ارگانیک</string>
     <string name="poi_outdoor">بازار روز</string>
     <string name="poi_paint">رنگ فروشی</string>
     <string name="poi_pet">فروشگاه حیوانات خانگی</string>
@@ -72,8 +72,8 @@
     <string name="poi_ship_chandler">کشتی</string>
     <string name="poi_sports">لوازم ورزشی</string>
     <string name="poi_stationery">فروشگاه نوشت افزار</string>
-    <string name="poi_tableware">فروشگاه کارد و چنگال</string>
-    <string name="poi_ticket">فروشگاه بلیط</string>
+    <string name="poi_tableware">فروشگاه ظروف غذاخوری</string>
+    <string name="poi_ticket">بلیت فروشی</string>
     <string name="poi_tobacco">دخانیات</string>
     <string name="poi_toys">اسباب بازی فروشی</string>
     <string name="poi_trade"/>
@@ -121,7 +121,7 @@
     <string name="poi_vehicle_inspection">معاینه فنی خودرو</string>
     <string name="poi_car_wash">کارواش</string>
     <string name="poi_fuel">جایگاه سوخت; جایگاه سوخت‌گیری; پمپ بنزین; پمپ گاز</string>
-    <string name="poi_electricity_combined_charging">ایستگاه شارژ</string>
+    <string name="poi_electricity_combined_charging">ایستگاه شارژ; ایستگاه شارژ خودروی برقی</string>
     <string name="poi_vehicle_ramp">سطح شیب دار خودرو</string>
     <string name="poi_compressed_air">هوای فشرده</string>
     <string name="poi_parking">پارکینگ</string>
@@ -196,7 +196,7 @@
     <string name="poi_pier">اسکله</string>
     <string name="poi_surveillance">نظارت</string>
     <string name="poi_observatory">رصد خانه</string>
-    <string name="poi_astronomical_observatory">رصدخانه نجوم</string>
+    <string name="poi_astronomical_observatory">نجومی</string>
     <string name="poi_construction">ساخت و ساز</string>
     <string name="poi_works">کارگاه</string>
     <string name="poi_mineshaft">معدن</string>
@@ -317,7 +317,7 @@
     <string name="poi_ice_skating">اسکیت روی یخ</string>
     <string name="poi_ice_stock">زمین یخ</string>
     <string name="poi_korfbal">زمین بسکتبال اسکاتلندی</string>
-    <string name="poi_sport_motor">پیست موتور سواری</string>
+    <string name="poi_sport_motor">ورزش موتورسواری</string>
     <string name="poi_sport_multi">چندورزشی</string>
     <string name="poi_orienteering">ورزش جهت یابی</string>
     <string name="poi_paddle_tennis">تنیس پدالی</string>
@@ -428,11 +428,11 @@
     <string name="poi_club_tourism">باشگاه گردشگری</string>
     <string name="poi_club_charity">کلوپ خیریه</string>
     <string name="poi_library">کتابخانه</string>
-    <string name="poi_arts_centre">مرکز هنر</string>
+    <string name="poi_arts_centre">مرکز هنری</string>
     <string name="poi_cinema">سینما</string>
     <string name="poi_casino">کازینو</string>
     <string name="poi_community_centre">مرکز اجتماع</string>
-    <string name="poi_social_centre">مرکز سوسیال</string>
+    <string name="poi_social_centre">مرکز اجتماعی</string>
     <string name="poi_theatre">تئاتر</string>
     <string name="poi_theatre_genre_circus">سیرک</string>
     <string name="poi_dance_floor">رقص</string>
@@ -446,7 +446,7 @@
     <string name="poi_marina">لنگرگاه تفریحی</string>
     <string name="poi_miniature_golf">گلف کوچک</string>
     <string name="poi_playground">زمین بازی</string>
-    <string name="poi_swimming_pool">استخر</string>
+    <string name="poi_swimming_pool">استخر شنا</string>
     <string name="poi_water_park">پارک آبی</string>
     <string name="poi_park">پارک</string>
     <string name="poi_cafe">کافه</string>
@@ -509,7 +509,7 @@
     <string name="poi_funeral_directors">قبرکن</string>
     <string name="poi_craft_computer">صنایع کامپیوتر</string>
     <string name="poi_beauty">سالن زیبایی</string>
-    <string name="poi_beauty_salon_nails">کاشت ناخن</string>
+    <string name="poi_beauty_salon_nails">کاشت ناخن; مانیکور</string>
     <string name="poi_hairdresser">آرایشگر</string>
     <string name="poi_massage">سالن ماساژ</string>
     <string name="poi_tattoo">سالن تاتو</string>
@@ -519,7 +519,7 @@
     <string name="poi_car_sharing">جمعه بازار خودرو</string>
     <string name="poi_boat_sharing">جمعه بازار قایق</string>
     <string name="poi_dock">بارانداز</string>
-    <string name="poi_toilets">سرویس بهداشتی</string>
+    <string name="poi_toilets">سرویس بهداشتی; دستشویی; مستراح</string>
     <string name="poi_sauna">سونا</string>
     <string name="poi_brothel"/>
     <string name="poi_mortuary">سردخانه مردگان</string>
@@ -667,7 +667,7 @@
     <string name="poi_clock_option">تنظیمات ساعت</string>
     <string name="poi_scout_camp">کمپ گردشگری</string>
     <string name="poi_backcountry">کمپ بدون امکانات</string>
-    <string name="poi_piste_grooming">مراقبت از پیست</string>
+    <string name="poi_piste_grooming">آماده‌سازی پیست</string>
     <string name="poi_outdoor_seating">نشستن بیرون</string>
     <string name="poi_smoking">دخانیات</string>
     <string name="poi_delivery">تحویل</string>
@@ -766,7 +766,7 @@
     <string name="poi_office">دفتر</string>
     <string name="poi_tourism">گردشگری</string>
     <string name="poi_sightseeing">دیدنی‌ها</string>
-    <string name="poi_accomodation">محل اسکان</string>
+    <string name="poi_accomodation">محل اسکان; اقامت</string>
     <string name="poi_internet_access">دسترسی اینترنت</string>
     <string name="poi_entertainment">اوقات فراغت</string>
     <string name="poi_club">باشگاه</string>
@@ -1070,13 +1070,13 @@
     <string name="poi_cuisine_soup">سوپ</string>
     <string name="poi_tourism_yes">نقطهٔ گردشگری</string>
     <string name="poi_internet_access_no">دسترسی اینترنت: ندارد</string>
-    <string name="poi_internet_access_fee_no">دسترسی اینترنت - رایگان</string>
+    <string name="poi_internet_access_fee_no">دسترسی اینترنت: رایگان</string>
     <string name="poi_fee_no">خیر</string>
     <string name="poi_drinking_water_no">خیر</string>
     <string name="poi_seasonal_no">خیر</string>
-    <string name="poi_traffic_signals_sound_no">خیر</string>
+    <string name="poi_traffic_signals_sound_no">صدا: خیر</string>
     <string name="poi_piste_grooming_no">خیر</string>
-    <string name="poi_historic_quarry">"معدن تاریخی سنگ "</string>
+    <string name="poi_historic_quarry">معدن تاریخی سنگ</string>
     <string name="poi_diet_vegetarian_filter_yes">گیاه‌خواری</string>
     <string name="poi_diet_vegetarian_only">فقط گیاه‌خواری</string>
     <string name="poi_diet_vegetarian_yes">گیاه‌خواری</string>
@@ -1188,7 +1188,7 @@
     <string name="poi_internet_access_public">دسترسی اینترنت: عمومی</string>
     <string name="poi_internet_access_service">دسترسی اینترنت: با خدمات</string>
     <string name="poi_internet_access_yes">دسترسی اینترنت: دارد</string>
-    <string name="poi_internet_access_fee_yes">دسترسی اینترنت - پولی</string>
+    <string name="poi_internet_access_fee_yes">دسترسی اینترنت: پولی</string>
     <string name="poi_smoking_separated">در اتاق جداگانه</string>
     <string name="poi_smoking_isolated">در یک اتاق جدا</string>
     <string name="poi_piste_grooming_scooter">اسکوتر</string>
@@ -1448,4 +1448,8 @@
     <string name="poi_climbing_crag">بله</string>
     <string name="poi_protected_area">منطقهٔ حفاظت‌شده</string>
     <string name="poi_badminton">بدمینتون</string>
+    <string name="poi_service_car">خدمات خودرو; مکانیکی</string>
+    <string name="poi_substation_type">نوع</string>
+    <string name="poi_mini_roundabout">فلکهٔ کوچک</string>
+    <string name="poi_square">میدان</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -7,7 +7,7 @@
     <string name="plugin_distance_point_ele">ارتفاع</string>
     <string name="plugin_distance_point">نقطه</string>
     <string name="gpx_file_name">نام فایل GPX</string>
-    <string name="gpx_saved_sucessfully">فایل GPX ذخیره شد
+    <string name="gpx_saved_sucessfully">فایل GPX ذخیره شد در
 \n{0}</string>
     <string name="shared_string_do_not_show_again">دوباره نشان نده</string>
     <string name="distance_measurement_start_editing">شروع ویرایش</string>
@@ -56,7 +56,7 @@
     <string name="recording_can_not_be_played">فایل ضبط‌شده قابل‌پخش نیست.</string>
     <string name="recording_context_menu_delete">حذف فایل ضبط‌شده</string>
     <string name="recording_context_menu_play">پخش</string>
-    <string name="recording_default_name">ضبط</string>
+    <string name="recording_default_name">در حال ضبط</string>
     <string name="shared_string_control_stop">توقف</string>
     <string name="shared_string_control_start">شروع</string>
     <string name="map_widget_av_notes">یادداشت‌های صوتی/تصویری</string>
@@ -118,7 +118,7 @@
     <string name="osmand_parking_minutes">دقیقه</string>
     <string name="osmand_parking_position_description_add_time">ساعت پارک خودرو</string>
     <string name="global_app_allocated_memory">حافظهٔ اختصاص‌یافته</string>
-    <string name="native_app_allocated_memory">حافظهٔ کل سیستم</string>
+    <string name="native_app_allocated_memory">کل حافظهٔ native</string>
     <string name="starting_point_too_far">مبدأ از نزدیک‌ترین جاده خیلی دور است.</string>
     <string name="osmand_parking_event">خودرو را از پارکینگ بردارید</string>
     <string name="osmand_parking_warning">هشدار</string>
@@ -223,7 +223,7 @@
     <string name="search_address_building">ساختمان</string>
     <string name="search_address_building_option">ساختمان</string>
     <string name="search_address_street_option">تقاطع</string>
-    <string name="context_menu_item_update_map">به‌روزرسانی نقشه</string>
+    <string name="context_menu_item_update_map">روزآمدسازی نقشه</string>
     <string name="context_menu_item_create_poi">ایجاد POI</string>
     <string name="shared_string_yes">بله</string>
     <string name="shared_string_cancel">لغو</string>
@@ -379,7 +379,7 @@
     <string name="local_openstreetmap_upload">آپلود ویرایش به OSM</string>
     <string name="local_openstreetmap_delete">حذف ویرایش</string>
     <string name="local_openstreetmap_descr_title">ویرایش ناهمزمان OSM:</string>
-    <string name="free_version_message">شما می‌توانید %1$s نقشه دانلود یا به‌روز کنید.</string>
+    <string name="free_version_message">شما می‌توانید %1$s نقشه دانلود یا روزآمد کنید.</string>
     <string name="free_version_title">نسخهٔ رایگان</string>
     <string name="poi_context_menu_showdescription">نمایش توضیحات POI.</string>
     <string name="index_name_north_america">آمریکای شمالی</string>
@@ -454,8 +454,8 @@
     <string name="intermediate_point_too_far">مقصد میانی %1$s از نزدیک‌ترین جاده خیلی دور است.</string>
     <string name="arrived_at_intermediate_point">به مقصد میانی رسیدید</string>
     <string name="context_menu_item_intermediate_point">افزودن به‌عنوان مقصد میانی</string>
-    <string name="add_waypoint_dialog_added">نقطهٔ بین‌راهی GPX‏ ، ‏«{0}»، افزوده شد</string>
-    <string name="add_waypoint_dialog_title">افزودن نقطهٔ بین‌راهی به GPX ضبط‌شده</string>
+    <string name="add_waypoint_dialog_added">راه‌نشان GPX، ‏«{0}»، افزوده شد</string>
+    <string name="add_waypoint_dialog_title">افزودن راه‌نشان به GPX ضبط‌شده</string>
     <string name="amenity_type_administrative">اداری</string>
     <string name="amenity_type_barrier">مانع</string>
     <string name="amenity_type_education">آموزشی</string>
@@ -489,7 +489,7 @@
     <string name="rendering_attr_noAdminboundaries_description">مرزهای مناطق را نشان نده (تقسیمات سیاسی سطح ۵–۹).</string>
     <string name="incremental_search_city">جست‌وجوی حرف‌به‌حرف نام شهر</string>
     <string name="rendering_attr_showRoadMaps_name">نقشه‌های فقط-جاده</string>
-    <string name="safe_mode_description">اجرای برنامه در حالت ایمن (به‌جای کد اصلی از اندروید کُندتر استفاده می‌کند).</string>
+    <string name="safe_mode_description">اجرای برنامه در حالت ایمن (به‌جای کد native از کد Android که کُندتر است استفاده می‌کند).</string>
     <string name="native_library_not_running">برنامه در حالت ایمن اجرا شده است (از طریق تنظیمات آن را غیرفعال کنید).</string>
     <string name="background_service_is_enabled_question">سرویس پس‌زمینهٔ OsmAnd هنوز در حال اجراست. آن را هم متوقف می‌کنید؟</string>
     <string name="close_changeset">بستن بستهٔ تغییرات</string>
@@ -538,7 +538,7 @@
     <string name="data_settings">داده</string>
     <string name="shared_string_settings">تنظیمات</string>
     <string name="additional_settings">تنظیمات دیگر</string>
-    <string name="update_tile">به‌روزرسانی نقشه</string>
+    <string name="update_tile">روزآمدسازی نقشه</string>
     <string name="use_online_routing_descr">برای محاسبهٔ مسیر از اینترنت استفاده شود.</string>
     <string name="use_online_routing">استفاده از مسیریابی آنلاین</string>
     <string name="error_occurred_saving_gpx">ذخیره‌سازی فایل GPX ناموفق بود.</string>
@@ -548,7 +548,7 @@
     <string name="loading_cities">در حال بارکردن شهرها…</string>
     <string name="error_calculating_route">محاسبهٔ مسیر ناموفق بود.</string>
     <string name="hint_search_online">جست‌وجوی آنلاین: شهر، خیابان، پلاک</string>
-    <string name="context_menu_item_update_poi">به‌روزرسانی POI</string>
+    <string name="context_menu_item_update_poi">روزآمدسازی POI</string>
     <string name="sd_unmounted">کارت حافظه در دسترس نیست. 
 \nقادر به دیدن نقشه یا یافتن جزئیات نخواهید بود.</string>
     <string name="route_tr">به راست بپیچید و بروید</string>
@@ -617,11 +617,11 @@
     <string name="bg_service_screen_unlock">قفل‌گشایی</string>
     <string name="bg_service_interval">تنظیم فواصل بیدارباش:</string>
     <string name="select_animate_speedup">سرعت شبیه‌سازی مسیر:</string>
-    <string name="native_app_allocated_memory_descr">کل حافظهٔ اختصاص‌یافته به برنامه %1$s مگابایت (دالویک %2$s مگابایت، بقیه %3$s مگابایت).
-\nحافظهٔ نسبی %4$s مگابایت (حد آندروئید %5$s مگابایت، دالویک %6$s مگابایت).</string>
+    <string name="native_app_allocated_memory_descr">کل حافظهٔ native اختصاص‌یافته به برنامه %1$s مگابایت (دالویک %2$s مگابایت، بقیه %3$s مگابایت).
+\nحافظهٔ proportional ‏%4$s مگابایت (حد اندروید %5$s مگابایت، دالویک %6$s مگابایت).</string>
     <string name="global_app_allocated_memory_descr">حافظهٔ اختصاص‌یافته %1$s مگابایت (حد اندروید %2$s مگابایت، دالویک %3$s مگابایت).</string>
     <string name="shared_location">مکان هم‌رسانده</string>
-    <string name="gpxup_trackable">قابل‌ردگیری</string>
+    <string name="gpxup_trackable">قابل‌ردیابی</string>
     <string name="gpxup_identifiable">قابل‌شناسایی</string>
     <string name="navigate_point_format">قالب</string>
     <string name="basemap_was_selected_to_download">نقشهٔ پایه برای کارکرد اولیه موردنیاز است و در صف دانلود قرار گرفت.</string>
@@ -679,8 +679,8 @@
     <string name="download_files_question_space">آیا {0} فایل را دانلود می‌کنید؟ 
 \n {1} مگابایت (از {2} مگابایت) استفاده خواهد شد.</string>
     <string name="use_transparent_map_theme">پوستهٔ شفاف</string>
-    <string name="native_library_not_supported">کتابخانهٔ بومی بر روی این دستگاه پشتیبانی نمی‌شود.</string>
-    <string name="init_native_library">مقداردهی اولیهٔ کتابخانهٔ بومی…</string>
+    <string name="native_library_not_supported">کتابخانهٔ native بر روی این دستگاه پشتیبانی نمی‌شود.</string>
+    <string name="init_native_library">مقداردهی اولیهٔ کتابخانهٔ native…</string>
     <string name="choose_auto_follow_route">نمای نقشه خودکار-مرکز</string>
     <string name="choose_auto_follow_route_descr">مدت‌زمانی که طول می‌کشد تا نقشه با موقعیت کنونی همگام شود.</string>
     <string name="auto_follow_route_navigation">ناوبری فقط با حالت خودکار-مرکز</string>
@@ -713,10 +713,8 @@
     <string name="gpx_option_destination_point">از مقصد جاری استفاده کن</string>
     <string name="gpx_option_from_start_point">گذر از سرتاسر رد</string>
     <string name="switch_to_vector_map_to_see">برای این محل نقشهٔ بُرداری آفلاین وجود دارد.
-\n 
-\n\t«منو» ← «پیکربندی نقشه» ← «منبع نقشه…» ← «نقشه‌های بُرداری آفلاین».
-\n
-\nبرای فعال‌سازی این مسیر را دنبال کنید.</string>
+\n\t
+\n\tبرای استفاده، فعال کنید: «منو» ← «پیکربندی نقشه» ← «منبع نقشه…» ← «نقشه‌های بُرداری آفلاین».</string>
     <string name="choose_audio_stream">خروجی راهنمای گفتاری</string>
     <string name="layer_underlay">نقشهٔ زیری…</string>
     <string name="map_underlay">نقشهٔ زیری</string>
@@ -725,7 +723,7 @@
     <string name="shared_string_none">هیچ‌کدام</string>
     <string name="map_overlay">نقشهٔ رویی</string>
     <string name="map_overlay_descr">نقشهٔ رویی را انتخاب کنید</string>
-    <string name="tile_source_already_installed">نقشه قبلاً نصب شده است، تنظیمات به‌روز خواهد شد.</string>
+    <string name="tile_source_already_installed">نقشه قبلاً نصب شده است، تنظیمات روزآمد خواهد شد.</string>
     <string name="internet_not_available">برای انجام این عملیات باید به اینترنت وصل باشید.</string>
     <string name="install_more">نصب بیشتر…</string>
     <string name="level_to_switch_vector_raster_descr">در زوم‌های فراتر از این سطح، از نقشه‌های شطرنجی(raster) استفاده شود.</string>
@@ -807,12 +805,12 @@
     <string name="search_history_street">خیابان: {0}، {1}</string>
     <string name="search_history_int_streets">تقاطع: {0} x {1} به {2}</string>
     <string name="search_history_city">شهر: {0}</string>
-    <string name="context_menu_item_update_map_confirm">دادهٔ محلی از طریق اینترنت به‌روز شود؟</string>
+    <string name="context_menu_item_update_map_confirm">دادهٔ محلی از اینترنت روزآمد شود؟</string>
     <string name="update_poi_error_loading">بارکردن داده از سرور ناموفق بود.</string>
     <string name="update_poi_no_offline_poi_index">برای این ناحیه هیچ POIای به‌صورت آفلاین موجود نیست</string>
     <string name="hello">نرم‌افزار ناوبری OsmAnd</string>
     <string name="update_poi_success">دادهٔ نقاط توجه روزآمد شد ({0} مورد بار شد)</string>
-    <string name="update_poi_error_local">به‌روزرسانی لیست محلی POI ناموفق بود.</string>
+    <string name="update_poi_error_local">روزآمدسازی لیست محلی POI ناموفق بود.</string>
     <string name="shared_string_ok">خُب</string>
     <string name="transport">حمل‌ونقل</string>
     <string name="transport_route_distance">مسافت سفر</string>
@@ -947,7 +945,7 @@
 \nتمام داده‌ٔ نقشه (بُرداری یا کاشی) را می‌توانید برای استفادهٔ آفلاین روی کارت حافظه ذخیره کنید.
 \nهمچنین OsmAnd می‌تواند به‌صورت آنلاین و آفلاین مسیریابی کند و با راهنمای گفتاری شما را گام‌به‌گام هدایت کند.
 \n
-\n‏OsmAnd+‎ نسخهٔ پولی این برنامه است. با خریدن آن از این پروژه حمایت می‌کنید، سرمایه‌ای برای توسعهٔ قابلیت‌های جدید فراهم می‌کنید و آخرین به‌روزرسانی‌ها در اختیارتان قرار می‌گیرد. 
+\n‏OsmAnd+‎ نسخهٔ پولی این برنامه است. با خریدن آن از این پروژه حمایت می‌کنید، سرمایه‌ای برای توسعهٔ قابلیت‌های جدید فراهم می‌کنید و آخرین روزآمدسازه‌ها در اختیارتان قرار می‌گیرد.
 \n
 \n* از ویژگی‌های مهم:
 \n- کارایی کامل در حالت آفلاین (قابلیت ذخیره‌سازی نقشه‌های بُرداری یا کاشی در حافظهٔ دستگاه)
@@ -975,7 +973,7 @@
     <string name="osmand_accessibility_description">این افزونه امکانات قابلیت‌دسترسی (accessibility) در دستگاهتان را مستقیماً در OsmAnd به کار می‌گیرد و تسهیلاتی را در اختیارتان می‌گذارد؛ مانند تنظیم‌کردن سرعت گفتار موتور صوتی، تبدیل متن به گفتار (مثل اعلام موقعیت شما)، پیمایش صفحه به‌کمک صفحهٔ جهتی (D-pad) و استفاده از توپک (trackball) برای تنظیم زوم.</string>
     <string name="osm_editing_plugin_description">با ایجاد یا اصلاح نقاط توجه (POI)، ایجاد یادداشت‌های OSM یا نظردادن روی آن‌ها و بارگذاری فایل‌های GPXای که ضبط کرده‌اید در تکمیل نقشهٔ OSM مشارکت کنید. برای این منظور لازم است نام کاربری و گذرواژهٔ خود را در OsmAnd وارد کنید. OpenStreetMap.org یک پروژهٔ نقشه‌کشی جامعه‌محور، جهانی و در مالکیت عمومی است.</string>
     <string name="play_commands_of_currently_selected_voice">گفتاری را انتخاب کنید و با پخش پیام‌ها، آن را امتحان کنید:</string>
-    <string name="native_rendering">رندر بومی</string>
+    <string name="native_rendering">رندرگیری native</string>
     <string name="accessibility_mode">حالت قابلیت دسترسی</string>
     <string name="accessibility_mode_descr">امکانات موردنیاز برای کاربران مبتلا به نارسایی جسمی را فعال می‌کند.</string>
     <string name="direction_style_sidewise">جهت‌ها (۸سویه)</string>
@@ -1011,7 +1009,7 @@
     <string name="overlay_transparency">شفافیت لایهٔ رویی</string>
     <string name="map_transparency_descr">شفافیت نقشهٔ پایه را تنظیم کنید.</string>
     <string name="map_transparency">شفافیت نقشهٔ پایه</string>
-    <string name="select_tile_source_to_install">نقشه‌ها(ی کاشی‌وار) را برای نصب یا به‌روزرسانی انتخاب کنید.</string>
+    <string name="select_tile_source_to_install">نقشه‌ها(ی کاشی‌وار) را برای نصب یا روزآمدسازی انتخاب کنید.</string>
     <string name="level_to_switch_vector_raster">کمترین سطح زوم بُرداری</string>
     <string name="search_osm_offline">جست‌وجو با مختصات جغرافیایی</string>
     <string name="send_location_email_pattern">برای مشاهدهٔ مکان، پیوند اینترنتی %1$s یا پیوند اندرویدی %2$s را باز کنید</string>
@@ -1036,7 +1034,7 @@
     <string name="transport_stop_to_go_out">ایستگاهی را که پیاده می‌شوید انتخاب کنید</string>
     <string name="transport_to_go_after">مسافت قبلی</string>
     <string name="transport_to_go_before">مسافت بعدی</string>
-    <string name="update_poi_is_not_available_for_zoom">با زوم بیشتر می‌توانید POIها را به‌روز کنید</string>
+    <string name="update_poi_is_not_available_for_zoom">با زوم بیشتر می‌توانید POIها را روزآمد کنید</string>
     <string name="commiting_node">در حال ثبت نقطه…</string>
     <string name="poi">POI</string>
     <string name="navigate_point_format_D">DDD.DDDDD</string>
@@ -1213,14 +1211,14 @@
     <string name="osmo_edit_color">رنگ نمایش</string>
     <string name="int_days">روز</string>
     <string name="osmo_connect_menu">اتصال</string>
-    <string name="import_file_favourites">داده را در قالب فایل GPX ذخیره می‌کنید یا نقاط بین‌راهی آن را در علاقه‌مندی‌ها درون‌برد می‌کنید؟</string>
+    <string name="import_file_favourites">داده را در قالب فایل GPX ذخیره می‌کنید یا راه‌نشان‌های آن را به «علاقه‌مندی‌ها» درون‌برد می‌کنید؟</string>
     <string name="gpx_file_is_empty">فایل GPX خالی</string>
     <string name="shared_string_tracks">ردها</string>
     <string name="shared_string_my_favorites">علاقه‌مندی‌ها</string>
     <string name="shared_string_my_places">مکان‌های من</string>
     <string name="loading_smth">در حال بارکردن %1$s…</string>
     <string name="map_widget_plain_time">زمان جاری</string>
-    <string name="shared_string_waypoint">نقطهٔ بین‌راهی</string>
+    <string name="shared_string_waypoint">راه‌نشان‌ها</string>
     <string name="selected_gpx_info_show">"
 \n
 \nبرای نمایش روی نقشه لمس طولانی کنید"</string>
@@ -1228,7 +1226,7 @@
     <string name="shared_string_selected_lowercase">انتخاب</string>
     <string name="gpx_split_interval">بازهٔ تقسیم</string>
     <string name="gpx_info_subtracks">زیررَدها: %1$s</string>
-    <string name="gpx_info_waypoints">نقاط بین‌راهی: %1$s</string>
+    <string name="gpx_info_waypoints">راه‌نشان‌ها: %1$s</string>
     <string name="gpx_info_distance">مسافت: %1$s (%2$s نقطه)</string>
     <string name="gpx_info_start_time">زمان شروع: %1$tF, %1$tT</string>
     <string name="gpx_info_end_time">زمان پایان: %1$tF, %1$tT</string>
@@ -1275,9 +1273,9 @@
     <string name="distance">مسافت</string>
     <string name="index_tours">سفرها</string>
     <string name="shared_string_all">همه</string>
-    <string name="shared_string_waypoints">نقاط بین‌راهی</string>
+    <string name="shared_string_waypoints">راه‌نشان‌ها</string>
     <string name="way_alarms">هشدارهای ترافیکی</string>
-    <string name="speak_favorites">نقاط علاقه‌مندی نزدیک</string>
+    <string name="speak_favorites">علاقه‌مندی‌های نزدیک</string>
     <string name="speak_poi">نقاط توجه نزدیک</string>
     <string name="download_additional_maps">آیا نقشه‌های ناموجود را دانلود می‌کنید %1$s ‏(%2$d مگابایت)؟</string>
     <string name="shared_string_more">بیشتر…</string>
@@ -1371,7 +1369,7 @@
     <string name="everything_up_to_date">همهٔ فایل‌ها به‌روز است</string>
     <string name="home_button">خانه</string>
     <string name="error_avoid_specific_road">مسیر دیگری یافت نشد</string>
-    <string name="map_update">برای %1$s نقشه به‌روزرسانی وجود دارد</string>
+    <string name="map_update">برای %1$s نقشه روزآمدسازه وجود دارد</string>
     <string name="search_for">جست‌وجو</string>
     <string name="shared_string_show_all">نمایش همه</string>
     <string name="coordinates">مختصات</string>
@@ -1429,7 +1427,7 @@
     <string name="navigate_point_northing">به‌طرف شمال</string>
     <string name="navigate_point_easting">به‌طرف شرق</string>
     <string name="download_tab_downloads">همهٔ دانلودها</string>
-    <string name="download_tab_updates">به‌روز‌رسانی‌ها</string>
+    <string name="download_tab_updates">روزآمدسازی‌ها</string>
     <string name="shared_string_dismiss">بی‌خیال</string>
     <string name="use_opengl_render">استفاده از رندرگیری OpenGL</string>
     <string name="use_opengl_render_descr">از رندرگیری سرعت‌یافتهٔ سخت‌افزاری OpenGL استفاده کن (شاید مصرف باتری افزایش یابد یا روی دستگاه‌های خیلی قدیمی کار نکند).</string>
@@ -1521,8 +1519,8 @@
 \n- گروه‌ها و دستگاه‌ها را با سرور همگام کنند؛ 
 \n- گروه‌ها و دستگاه‌ها را در یک پیشخوان شخصی روی وبسایت مدیریت کنند.</string>
     <string name="index_name_netherlands">اروپا - هلند</string>
-    <string name="no_updates_available">به‌روزرسانی وجود ندارد</string>
-    <string name="download_live_updates">به‌روزرسانی‌های زنده</string>
+    <string name="no_updates_available">روزآمدسازه‌ای وجود ندارد</string>
+    <string name="download_live_updates">روزآمدسازی‌های زنده</string>
     <string name="rendering_value_default13_name">پیش‌فرض (۱۳)</string>
     <string name="rendering_value_defaultTranslucentCyan_name">پیش‌فرض (فیروزه‌ای شفاف)</string>
     <string name="rendering_attr_currentTrackColor_name">رنگ GPX</string>
@@ -1542,7 +1540,7 @@
     <string name="rendering_value_translucent_blue_name">آبی شفاف</string>
     <string name="rendering_value_purple_name">بنفش</string>
     <string name="rendering_value_translucent_purple_name">بنفش شفاف</string>
-    <string name="restart_is_required">برای اینکه تغییرات به کار بسته شود، یک بار برنامه را ببندید و باز کنید.</string>
+    <string name="restart_is_required">برای به کار بستن تغییرات، لازم است برنامه باز و بسته شود.</string>
     <string name="light_theme">روشن</string>
     <string name="dark_theme">تیره</string>
     <string name="lang_bn">بنگالی</string>
@@ -1609,7 +1607,7 @@
     <string name="move_marker_bottom_sheet_title">نقشه را جابه‌جا کنید تا موقعیت نشانه عوض شود</string>
     <!-- string name="lat_lon_pattern">طول: %1$.5f عرض: %2$.5f</string -->
     <string name="access_sort">مرتب‌سازی</string>
-    <string name="osm_live_email_desc">برای اطلاع‌رسانی دربارهٔ مشارکت‌های شما.</string>
+    <string name="osm_live_email_desc">برای اطلاع‌رسانی به شما دربارهٔ مشارکت‌هایتان لازم است.</string>
     <string name="download_files_question_space_with_temp">آیا {0} فایل را دانلود می‌کنید؟ 
 \n {3} مگابایت برای ذخیره‌سازی موقت و {1} مگابایت برای ذخیره‌سازی دائمی لازم دارید. (از {2} مگابایت)</string>
     <string name="shared_string_type">نوع</string>
@@ -1626,14 +1624,14 @@
     <string name="osm_live_payment_desc">هزینهٔ اشتراک مطابق دورهٔ انتخابی است. هر زمان که خواستید، اشتراک خود را در گوگل‌پلی لغو کنید.</string>
     <string name="donation_to_osm">کمک مالی به جامعهٔ OSM</string>
     <string name="donation_to_osm_desc">بخشی از کمک‌های مالی به مشارکت‌کنندگان OSM داده می‌شود. هزینهٔ اشتراک تغییری نمی‌کند.</string>
-    <string name="osm_live_subscription_desc">این اشتراک، به‌روزرسانی‌های ساعتی، روزانه و هفتگی و نیز امکان دانلود نامحدود همهٔ نقشه‌ها را فعال می‌کند.</string>
+    <string name="osm_live_subscription_desc">این اشتراک، روزآمدسازی‌های ساعتی، روزانه و هفتگی و نیز امکان دانلود نامحدود همهٔ نقشه‌ها را فعال می‌کند.</string>
     <string name="get_it">دریافت</string>
     <string name="get_for">خرید با %1$s</string>
-    <string name="osm_live_banner_desc">دانلود نامحدود نقشه‌ها و به‌روزرسانی هفتگی، روزانه یا حتی ساعتی اضافه می‌شود.</string>
-    <string name="osmand_plus_banner_desc">دانلود نامحدود نقشه‌ها، به‌روزرسانی‌های نامحدود و افزونهٔ ویکی‌پدیا.</string>
+    <string name="osm_live_banner_desc">دانلود نامحدود نقشه‌ها و روزآمدسازی هفتگی، روزانه یا حتی ساعتی اضافه می‌شود.</string>
+    <string name="osmand_plus_banner_desc">دانلود نامحدود نقشه‌ها، روزآمدسازی‌های نامحدود و افزونهٔ ویکی‌پدیا.</string>
     <string name="si_mi_meters">مایل/متر</string>
     <string name="skip_map_downloading">صرف‌نظر از دانلود نقشه‌ها</string>
-    <string name="skip_map_downloading_desc">شما نقشهٔ آفلاینی را نصب نکرده‌اید. نقشه‌ای را از لیست انتخاب کنید یا اینکه بعداً از طریق «منو ← %1$s»، آن را دانلود کنید.</string>
+    <string name="skip_map_downloading_desc">نقشهٔ آفلاینی نصب نکرده‌اید. نقشه‌ای را از لیست انتخاب نمایید یا بعداً از طریق «منو ← %1$s»، آن را دانلود کنید.</string>
     <string name="search_another_country">منطقهٔ دیگری را انتخاب کنید</string>
     <string name="search_map">جست‌وجوی نقشه‌ها…</string>
     <string name="first_usage_wizard_desc">اجازه دهید برنامه موقعیت شما را پیدا کند تا نقشهٔ آنجا را برای دانلود پیشنهاد بدهد.</string>
@@ -1647,7 +1645,7 @@
     <string name="allow_access_location">اجازهٔ دسترسی به موقعیتتان را بدهید</string>
     <string name="first_usage_greeting">مسیریابی و کشف جاهای تازه بدون اتصال به اینترنت</string>
     <string name="search_my_location">موقعیت من را پیدا کن</string>
-    <string name="update_all_maps_now">اکنون همهٔ نقشه‌ها را به‌روز می‌کنید؟</string>
+    <string name="update_all_maps_now">اکنون همهٔ نقشه‌ها را روزآمد می‌کنید؟</string>
     <string name="clear_tile_data">پاک‌کردن همهٔ کاشی‌ها</string>
     <string name="routing_attr_short_way_name">راه صرفه‌جویی سوخت</string>
     <string name="replace_favorite_confirmation">آیا این نقطهٔ جدید را جانشین «%1$s» می‌کنید؟</string>
@@ -1710,7 +1708,7 @@
     <string name="rendering_value_medium_name">متوسط</string>
     <string name="rendering_value_bold_name">ضخیم</string>
     <string name="no_map_markers_found">لطفاً نشانه‌ها را از طریق نقشه اضافه کنید</string>
-    <string name="no_waypoints_found">هیچ نقطهٔ بین‌راهی پیدا نشد</string>
+    <string name="no_waypoints_found">هیچ راه‌نشانی پیدا نشد</string>
     <string name="report">گزارش</string>
     <string name="storage_permission_restart_is_required">اکنون برنامه مجاز به نوشتن در ذخیره‌گاه خارجی است اما نیاز است برنامه را ببندید و دوباره اجرا کنید.</string>
     <string name="shared_string_move_up">به ↑</string>
@@ -1757,7 +1755,7 @@
     <string name="subscribe_email_error">خطا</string>
     <string name="sea_depth_thanks">از اینکه منحنی‌های میزان عمق دریا را خریدید سپاسگزاریم</string>
     <string name="analyze_on_map">آنالیز روی نقشه</string>
-    <string name="shared_string_visible">در حال نمایش</string>
+    <string name="shared_string_visible">نمایان</string>
     <string name="restore_purchases">بازیابی خریدها</string>
     <string name="fonts_header">فونت‌های نقشه</string>
     <string name="right_side_navigation">رانندگی از راست</string>
@@ -1799,7 +1797,7 @@
     <string name="relief_smoothness_factor_descr">اولویت ساختار زمین: هموار یا پرتپه.</string>
     <string name="shared_string_slope">شیب</string>
     <string name="points_delete_multiple">آیا از حذف این %1$d نقطه مطمئن هستید؟</string>
-    <string name="track_points_category_name">نقاط بین‌راهی، نقاط توجه(POI)، عارضه‌های نام‌دار</string>
+    <string name="track_points_category_name">راه‌نشان‌ها، نقاط توجه، عارضه‌های نام‌دار</string>
     <string name="shared_string_gpx_track">رد</string>
     <string name="shared_string_time_span">مدت‌زمان</string>
     <string name="select_gpx_folder">پوشهٔ فایل GPX را انتخاب کنید</string>
@@ -1811,12 +1809,11 @@
     <string name="average_altitude">میانگین ارتفاع</string>
     <string name="total_distance">مسافت کل</string>
     <string name="routing_attr_height_obstacles_name">استفاده از دادهٔ ارتفاعی</string>
-
     <string name="rendering_attr_depthContours_description">نمایش نقاط و منحنی‌های میزان عمقی.</string>
     <string name="rendering_attr_depthContours_name">منحنی‌های میزان عمق دریا</string>
     <string name="rendering_attr_contourDensity_description">تراکم منحنی میزان</string>
     <string name="rendering_attr_contourDensity_name">تراکم منحنی میزان</string>
-    <string name="rendering_attr_contourWidth_description">عرض منحنی میزان</string>
+    <string name="rendering_attr_contourWidth_description">ضخامت منحنی میزان</string>
     <string name="rendering_attr_contourWidth_name">ضخامت منحنی میزان</string>
     <string name="routing_attr_allow_motorway_name">استفاده از آزادراه</string>
     <string name="routing_attr_allow_motorway_description">مسیردهی از آزادراه مجاز می‌شود.</string>
@@ -1881,7 +1878,7 @@
     <string name="shared_string_options">گزینه‌ها</string>
     <string name="measurement_tool_save_as_new_track_descr">نقطه‌ها را به‌عنوان نقاط مسیر یا در قالب یک خط ذخیره کنید.</string>
     <string name="osm_live_ask_for_purchase">لطفاً ابتدا اشتراک OsmAnd Live را بخرید</string>
-    <string name="osm_live_header">با خرید این اشتراک نقشه‌های سراسر جهان را به‌صورت ساعتی به‌روز کنید.
+    <string name="osm_live_header">با خرید این اشتراک می‌توانید نقشهٔ هر جایی را ساعتی روزآمد کنید.
 \n بخشی از درآمد حاصله به جامعهٔ OSM برمی‌گردد‌‌ و صرف همکاری‌ها با OSM می‌شود.
 \n اگر دوستدار OSM و OsmAnd هستید و مایلید حامی آن‌ها باشید و از خدمات پشتیبانی‌شان بهره‌مند شوید، بهترین راه همین تهیهٔ اشتراک است.</string>
     <string name="select_map_marker">نشانهٔ نقشه را انتخاب کنید</string>
@@ -1916,7 +1913,7 @@
     <string name="data_is_not_available">اطلاعات وجود ندارد</string>
     <string name="shared_string_remove">حذف</string>
     <string name="shared_string_read_more">بیشتر بخوانید</string>
-    <string name="clear_updates_proposition_message">به‌روزرسانی‌های دانلودشده را حذف کنید تا به نسخهٔ اولیهٔ نقشه برگردید</string>
+    <string name="clear_updates_proposition_message">روزآمدسازه‌های دانلودشده را حذف کنید تا به نسخهٔ اولیهٔ نقشه برگردید</string>
     <string name="road_blocked">جاده مسدود است</string>
     <string name="shared_string_select">انتخاب</string>
     <string name="switch_start_finish">تعویض مبدأ و مقصد</string>
@@ -1929,7 +1926,7 @@
     <string name="rec_split_clip_length_desc">مدت‌زمان کلیپ‌های ضبط‌شده را مشخص کنید.</string>
     <string name="rec_split_storage_size">حجم فضای ذخیره‌سازی</string>
     <string name="rec_split_storage_size_desc">مقدار فضای قابل‌تصرف برای همهٔ کلیپ‌های ضبط‌شده را مشخص کنید.</string>
-    <string name="live_updates">به‌روزرسانی‌های زنده</string>
+    <string name="live_updates">روزآمدسازی‌های زنده</string>
     <string name="available_maps">نقشه‌های موجود</string>
     <string name="select_voice_provider">راهنمای گفتاری را انتخاب کنید</string>
     <string name="select_voice_provider_descr">راهنمای گفتاری به زبان خود را انتخاب یا دانلود کنید.</string>
@@ -1958,7 +1955,7 @@
     <string name="lang_nds">آلمانی فرودین</string>
     <string name="read_more">بیشتر بخوانید</string>
     <string name="whats_new">امکانات جدید در</string>
-    <string name="shared_string_update">به‌روزرسانی</string>
+    <string name="shared_string_update">روزآمدسازی</string>
     <string name="shared_string_upload">آپلود</string>
     <string name="world_map_download_descr">نقشهٔ پایهٔ جهان (که سرتاسر جهان را در زوم کم پوشش می‌دهد) وجود ندارد یا قدیمی شده. لطفاً برای داشتن نمایی کلی از جهان آن را دانلود کنید.</string>
     <string name="shared_string_qr_code">کد QR</string>
@@ -2024,8 +2021,8 @@
     <string name="navigate_point_olc">کدِ مکانی باز (OLC)</string>
     <string name="navigate_point_olc_info_invalid">کد OLC نامعتبر است
 \n</string>
-    <string name="navigate_point_olc_info_short">کد OLC کوتاه است؛ 
-\nلطفاً کد کامل را بنویسید.</string>
+    <string name="navigate_point_olc_info_short">کد کوتاه است؛
+\nلطفاً کد OLC کامل را بنویسید</string>
     <string name="navigate_point_olc_info_area">کد OLC کامل و معتبر است؛ 
 \nپهنهٔ متناظر: %1$s × %2$s</string>
     <string name="increase_search_radius">محدودهٔ جست‌وجو را بزرگ‌تر کن</string>
@@ -2105,7 +2102,7 @@
     <string name="confirm_download_roadmaps">نقشهٔ فقط-جاده لازم نیست، زیرا نقشهٔ استاندارد (کامل) را دارید. هنوز مایلید که دانلودش کنید؟</string>
     <string name="value_downloaded_of_max">%1$.1f از %2$.1f مگابایت</string>
     <string name="file_size_in_mb">%.1f مگابایت</string>
-    <string name="update_all">به‌روزرسانی همه (%1$s مگابایت)</string>
+    <string name="update_all">روزآمدسازی همه (%1$s مگابایت)</string>
     <string name="free_downloads_used">دانلودهای رایگان استفاده‌شده</string>
     <string name="free_downloads_used_description">تعداد دانلودهای رایگان باقیمانده را نشان می‌دهد.</string>
     <string name="application_dir_description">محل ذخیره‌سازی نقشه‌ها و فایل‌های دیگر را مشخص کنید.</string>
@@ -2128,12 +2125,12 @@
     <string name="dashboard_or_drawer_title">دکمهٔ پیشخوان یا منو</string>
     <string name="dashboard_or_drawer_description">دو انتخاب دارید که بتوانید از طریق پیشخوانِ قابل‌تنظیم یا منوی ثابت، برنامه را کنترل کنید. همواره می‌توانید این انتخاب را در تنظیمات پیشخوان تغییر دهید.</string>
     <string name="only_download_over_wifi">فقط با وای‌فای دانلود کن</string>
-    <string name="live_update">به‌روزرسانی زنده</string>
-    <string name="update_now">الآن به‌روز کن</string>
+    <string name="live_update">روزآمدسازی زنده</string>
+    <string name="update_now">الآن روزآمد کن</string>
     <string name="missing_write_external_storage_permission">برنامه اجازهٔ دسترسی به کارت حافظه ندارد</string>
-    <string name="last_update">آخرین به‌روزرسانی: %s</string>
-    <string name="update_time">زمان به‌روزرسانی</string>
-    <string name="updates_size">حجم به‌روزرسانی</string>
+    <string name="last_update">آخرین روزآمدسازی: %s</string>
+    <string name="update_time">زمان روزآمدسازی</string>
+    <string name="updates_size">حجم روزآمدسازه</string>
     <string name="last_map_change">آخرین تغییر نقشه: %s</string>
     <string name="hourly">ساعتی</string>
     <string name="daily">روزانه</string>
@@ -2278,9 +2275,9 @@
     <string name="mapillary_action_descr">نمای خیابانی را از دید خود به‌وسیلهٔ مپیلاری هم‌رسانی کنید.</string>
     <string name="mapillary_widget">ابزارک مپیلاری</string>
     <string name="mapillary_widget_descr">به‌وسیلهٔ این ابزارک با مپیلاری سریع‌تر کار کنید.</string>
-    <string name="mapillary_descr">تصاویر خیابانی آنلاین برای همه. مکان‌ها را کشف کنید، همکاری کنید و جهان را به‌تصویر درآورید.</string>
+    <string name="mapillary_descr">تصاویر آنلاین سطح خیابان برای همه. مکان‌ها را کشف کنید، همکاری کنید و جهان را به‌تصویر درآورید.</string>
     <string name="mapillary">مپیلاری</string>
-    <string name="plugin_mapillary_descr">تصاویر خیابانی آنلاین برای همه. مکان‌ها را کشف کنید، همکاری کنید و جهان را به‌تصویر درآورید.</string>
+    <string name="plugin_mapillary_descr">تصاویر آنلاین سطح خیابان برای همه. مکان‌ها را کشف کنید، همکاری کنید و جهان را به‌تصویر درآورید.</string>
     <string name="private_access_routing_req">مقصد شما در ناحیه‌ای با دسترسی خصوصی قرار دارد. دسترسی به جاده‌های خصوصی برای این سفر مجاز شود؟</string>
     <string name="restart_search">شروع مجدد جست‌وجو</string>
     <string name="nothing_found">چیزی پیدا نشد</string>
@@ -2412,7 +2409,7 @@
 \n • اعلام محدودیت‌های سرعت را فعال کنید تا در صورت تجاوز از سرعت مجاز به شما هشدار دهد
 \n • زوم نقشه متناسب با سرعتتان تنظیم می‌شود
 \n • با استفاده از نشانی، نوع مکان (مثلاً پارکینگ، رستوران، هتل، پمپ گاز، موزه) یا مختصات جغرافیایی به جست‌وجو بپردازید
-\n • نقاط بین‌راهی مسیرتان را مشخص کنید 
+\n • پشتیبانی از نقاط میانی در برنامه‌ریزی سفر
 \n • رد خودتان را ثبت کنید یا یک رد GPX را دانلود و آن را دنبال کنید
 \n</string>
     <string name="distance_moving">مسافت اصلاح‌شده</string>
@@ -2425,15 +2422,15 @@
 \n • شیوهٔ نمایش نام‌های روی نقشه را انتخاب کنید: انگلیسی، محلی یا نویسه‌گردانی‌شده 
 \n • نمایش نقشه‌های تخصصی آنلاین، تصاویر ماهواره‌ای (بینگ) و رولایه‌های مختلف مانند ردهای GPX گردشگردی یا ناوبری با امکان تنظیم شفافیت
 \n</string>
-    <string name="context_menu_item_delete_waypoint">نقطهٔ بین‌راهی GPX را حذف می‌کنید؟</string>
-    <string name="context_menu_item_edit_waypoint">ویرایش نقطهٔ بین‌راهی GPX</string>
+    <string name="context_menu_item_delete_waypoint">راه‌نشان GPX را حذف می‌کنید؟</string>
+    <string name="context_menu_item_edit_waypoint">ویرایش راه‌نشان GPX</string>
     <string name="rendering_value_darkyellow_name">زرد تیره</string>
     <string name="quick_favorites_name_preset">پیش‌تنظیم نام</string>
-    <string name="quick_action_add_gpx_descr">دکمه‌ای برای ایجاد یک نقطهٔ بین‌راهی GPX در مرکز صفحه.</string>
-    <string name="add_waypoint">افزودن نقطهٔ بین‌راهی</string>
-    <string name="save_gpx_waypoint">ذخیره‌کردن نقطهٔ بین‌راهی GPX</string>
-    <string name="waypoint_one">نقطهٔ بین‌راهی ۱</string>
-    <string name="import_track_desc">در فایل %1$s هیچ نقطهٔ بین‌راهی وجود ندارد. در قالب یک رد درون‌برد شود؟</string>
+    <string name="quick_action_add_gpx_descr">دکمه‌ای برای افزودن یک راه‌نشان GPX در مرکز صفحه.</string>
+    <string name="add_waypoint">افزودن راه‌نشان</string>
+    <string name="save_gpx_waypoint">ذخیره‌کردن راه‌نشانِ GPX</string>
+    <string name="waypoint_one">راه‌نشان ۱</string>
+    <string name="import_track_desc">در فایل %1$s هیچ راه‌نشانی وجود ندارد. در قالب یک رد درون‌برد شود؟</string>
     <string name="show_map">نشان‌دادن نقشه</string>
     <string name="route_is_calculated">مسیر محاسبه شد</string>
     <string name="round_trip">سفر رفت‌وبرگشتی</string>
@@ -2444,7 +2441,7 @@
 \n
 \nراهبر دیداری و شنیداری، مشاهدهٔ نقاط توجه (POIها یا Points of interest)، ایجاد و مدیریت ردهای GPX، استفاده از تصویرسازی منحنی‌های میزان و اطلاعات ارتفاع، انتخاب حالت‌های پیاده، دوچرخه، خودرو، امکان ویرایش مکان‌ها و... چیزهایی هستند که تجربهٔ مؤثر و لذت‌بخشی را در کار با نقشه برایتان به ارمغان می‌آورد.
 \n
-\n‏OsmAnd+‎ نسخهٔ پولی این برنامه است. با خریدن آن از این پروژه حمایت می‌کنید، سرمایه‌ای برای توسعهٔ قابلیت‌های جدید فراهم می‌کنید و آخرین به‌روزرسانی‌ها در اختیارتان قرار می‌گیرد. 
+\n‏OsmAnd+‎ نسخهٔ پولی این برنامه است. با خریدن آن از این پروژه حمایت می‌کنید، سرمایه‌ای برای توسعهٔ قابلیت‌های جدید فراهم می‌کنید و آخرین روزآمدسازه‌ها در اختیارتان قرار می‌گیرد.
 \n
 \nاز ویژگی‌های مهم برنامه:</string>
     <string name="plugin_touringview_descr">با فعال‌کردن این نما سبک نقشهٔ OsmAnd به نمای گردشگری (Touring view) تغییر می‌کند که سبکی با جزئیات فراوان و مناسب برای مسافران و رانندگان حرفه‌ای است. 
@@ -2499,7 +2496,7 @@
 \n • امکان انتخاب بین حالت آنلاین (سریع) و آفلاین (بدون هزینهٔ اضافی بابت اینترنت)
 \n • راهنمای گام‌به‌گام گفتاری (پیام‌های گفتاری انسانی و ماشینی)
 \n • راهنمای خطوط عبوری، نام خیابان‌ها و زمان تخمینی رسیدن
-\n • پشتیبانی از نقاط بین‌راهی مسیر 
+\n • پشتیبانی از نقاط میانی در برنامه‌ریزی سفر
 \n • اگر از مسیر منحرف شوید، مسیر جدیدی برایتان پیدا می‌کند
 \n • جست‌وجو با استفاده از نشانی، نوع مکان (مثلاً پارکینگ، رستوران، هتل، پمپ گاز، موزه) یا مختصات جغرافیایی</string>
     <string name="osmand_plus_extended_description_part8">پوشش و کیفیت تقریبی نقشه: 
@@ -2529,7 +2526,7 @@
 \n • دسترسی به اطلاعات OSM بر اساس منطقه یا کشور
 \n • مکان‌های ویکی‌پدیا که برای گردشگری بسیار مفید است
 \n • دانلود نامحدود مستقیماً از طریق برنامه
-\n • نقشه‌های بُرداری فشرده که حداقل ماهی یک بار به‌روز می‌شود 
+\n • نقشه‌های بُرداری فشرده که حداقل ماهی یک بار روزآمد می‌شود
 \n • امکان انتخاب میان نقشهٔ کامل یا فقط شبکهٔ راه‌های یک منطقه (مثلاً نقشهٔ کامل ژاپن ۷۰۰ مگابایت است و نقشهٔ راه‌های ژاپن ۲۰۰ مگابایت است)</string>
     <string name="osmand_plus_extended_description_part5">امکانات ایمنی 
 \n • تغییر خودکار بین حالت شب یا روز 
@@ -2557,7 +2554,7 @@
     <string name="enter_new_name">نام جدیدی بنویسید</string>
     <string name="shared_string_back">عقب</string>
     <string name="shared_string_view">نما</string>
-    <string name="waypoints_added_to_map_markers">نقاط بین‌راهی به نشانه‌های نقشه اضافه شد</string>
+    <string name="waypoints_added_to_map_markers">راه‌نشان‌ها به نشانه‌های نقشه اضافه شد</string>
     <string name="import_gpx_file_description">را می‌توانید در قالب یک فایل GPX یا علاقه‌مندی‌ها درون‌برد کنید.</string>
     <string name="import_as_gpx">درون‌برد در قالب فایل GPX</string>
     <string name="import_as_favorites">درون‌برد به‌عنوان علاقه‌مندی‌ها</string>
@@ -2579,19 +2576,19 @@
     <string name="distance_indication_descr">مشخص کنید مسافت شما تا نشانه‌های فعال کجا نشان داده شود.</string>
     <string name="active_markers_descr">تعداد جهت‌نماها را مشخص کنید.</string>
     <string name="appearance_on_the_map">تنظیمات ظاهری</string>
-    <string name="add_track_to_markers_descr">ردّی را انتخاب کنید تا نقاط بین‌راهیِ آن را به نشانه‌ها اضافه کنید.</string>
+    <string name="add_track_to_markers_descr">ردّی را انتخاب کنید تا راه‌نشان‌های آن را به نشانه‌ها اضافه کنید.</string>
     <string name="add_favourites_group_to_markers_descr">دسته‌ای از علاقه‌مندی‌ها را انتخاب کنید تا به نشانه‌ها اضافه شود.</string>
-    <string name="shared_string_gpx_waypoints">نقاط بین‌راهی رد</string>
+    <string name="shared_string_gpx_waypoints">راه‌نشان‌های رد</string>
     <string name="favourites_group">گروه علاقه‌مندی‌ها</string>
     <string name="add_group">افزودن گروه</string>
-    <string name="add_group_descr">گروهی از علاقه‌مندی‌ها یا نقاط بین‌راهی GPX را درون‌برد کنید.</string>
+    <string name="add_group_descr">گروهی از علاقه‌مندی‌ها یا راه‌نشان‌های GPX را درون‌برد کنید.</string>
     <string name="empty_state_markers_active">روی نقشه نشانه‌گذاری کنید!</string>
     <string name="empty_state_markers_active_desc">مکان‌ها را به‌صورت کوتاه یا طولانی لمس کنید و سپس دکمهٔ پرچم را بزنید.</string>
     <string name="empty_state_markers_groups">گروه درون‌برد کنید</string>
-    <string name="empty_state_markers_groups_desc">گروه‌های علاقه‌مندی یا نقاط بین‌راهی را در قالب نشانه درون‌برد کنید.</string>
+    <string name="empty_state_markers_groups_desc">گروهی از علاقه‌مندی‌ها یا راه‌نشان‌ها را به‌عنوان نشانه درون‌برد کنید.</string>
     <string name="empty_state_markers_history_desc">نشانه‌هایی که به‌عنوان گذرانده مشخص شود در این صفحه نشان داده می‌شود.</string>
     <string name="shared_string_more_without_dots">بیشتر</string>
-    <string name="looking_for_tracks_with_waypoints">در حال جست‌وجوی ردهای دارای نقطهٔ بین‌راهی</string>
+    <string name="looking_for_tracks_with_waypoints">در حال جست‌وجوی ردهای دارای راه‌نشان</string>
     <string name="empty_state_osm_edits">اشیای OSM را بسازید یا ویرایش کنید</string>
     <string name="empty_state_osm_edits_descr">‏POIها را اضافه یا ویرایش کنید، یادداشت‌های OSMای اضافه کنید یا روی آن‌ها نظر بدهید و فایل‌های GPX ضبط‌شده را آپلود کنید.</string>
     <string name="shared_string_deleted">حذف‌شده(ها)</string>
@@ -2676,10 +2673,10 @@
     <string name="group_deleted">گروه حذف شد</string>
     <string name="rendering_attr_whiteWaterSports_name">ورزش‌‌های آب‌های خروشان</string>
     <string name="clear_all_intermediates">پاک‌کردن همهٔ نقاط میانی</string>
-    <string name="select_waypoints_category_description">همهٔ نقاط بین‌راهی رد را بیفزایید یا دسته‌های جداگانه انتخاب کنید.</string>
+    <string name="select_waypoints_category_description">همهٔ راه‌نشان‌های رد را اضافه نمایید یا دسته‌های جداگانه انتخاب کنید.</string>
     <string name="shared_string_total">کل</string>
     <string name="nothing_found_in_radius">چیزی پیدا نشد:</string>
-    <string name="waypoints_removed_from_map_markers">نقاط بین‌راهی از نشانه‌های نقشه حذف شد</string>
+    <string name="waypoints_removed_from_map_markers">راه‌نشان‌ها از نشانه‌های نقشه حذف شدند</string>
     <string name="shared_string_travel_guides">راهنماهای مسافرت</string>
     <string name="shared_string_result">نتیجه</string>
     <string name="use_two_digits_longitude">طول جغرافیایی دورقمی</string>
@@ -2720,7 +2717,7 @@
     <string name="unlock_all_features">قفل‌گشایی از همهٔ قابلیت‌های OsmAnd</string>
     <string name="paid_app">برنامهٔ پولی</string>
     <string name="paid_plugin">افزونهٔ پولی</string>
-    <string name="travel_card_update_descr">دادهٔ تازهٔ ویکی‌سفر منتشر شده است. به‌روز کنید و لذت ببرید.</string>
+    <string name="travel_card_update_descr">برای ویکی‌سفر دادهٔ تازه منتشر شده است. روزآمد کنید و لذت ببرید.</string>
     <string name="travel_card_download_descr">راهنمای مسافرت از ویکی‌سفر را دانلود کنید تا بدون نیاز به اینترنت دربارهٔ مناطق مختلف جهان مطالعه کنید.</string>
     <string name="update_is_available">به‌روزرسانی وجود دارد</string>
     <string name="download_file">دانلود فایل</string>
@@ -2767,7 +2764,7 @@
     <string name="access_intermediate_arrival_time">زمان رسیدن به میانی</string>
     <string name="map_widget_intermediate_time">مدت تا میانی</string>
     <string name="unirs_render_descr">اصلاح‌یافتهٔ سبک پیشفرض برای ایجاد پادنمایی بیشتر در راه‌های پیاده و دوچرخه. از رنگ‌بندی مپنیک استفاده می‌کند.</string>
-    <string name="get_osmand_live">‏‏OsmAnd Live را تهیه کنید تا همهٔ این قابلیت‌ها باز شود: به‌روزآوری روزانهٔ نقشه و دانلودهای نامحدود، همهٔ افزونه‌های رایگان و پولی، ویکی‌پدیا، ویکی‌سفر و...</string>
+    <string name="get_osmand_live">‏‏OsmAnd Live را تهیه کنید تا همهٔ این قابلیت‌ها باز شود: روزآمدسازی روزانهٔ نقشه با دانلودهای نامحدود، همهٔ افزونه‌های رایگان و پولی، ویکی‌پدیا، ویکی‌سفر و چیزهای دیگر.</string>
     <string name="quick_action_edit_actions">ویرایش کنش‌ها</string>
     <string name="error_notification_desc">لطفاً یک نماگرفت از این اعلان به support@osmand.net بفرستید</string>
     <string name="coord_input_edit_point">اصلاح نقطه</string>
@@ -2788,7 +2785,7 @@
     <string name="search_street">جست‌وجوی خیابان</string>
     <string name="start_search_from_city">ابتدا شهر/محل را انتخاب کنید</string>
     <string name="shared_string_restore">بازیابی</string>
-    <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از علاقه‌مندی‌ها یا نقاط بین‌راهی GPX وارد شده‌اند و از آن‌ها گذشته‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
+    <string name="keep_passed_markers_descr">نشانه‌هایی که در قالب گروهی از علاقه‌مندی‌ها یا راه‌نشان‌های GPX وارد شده‌اند و از آن‌ها گذشته‌اید روی نقشه باقی می‌مانند. اگر گروه مربوط به آن‌ها را غیرفعال کنید، نشانه‌ها از روی نقشه محو می‌شوند.</string>
     <string name="keep_passed_markers">نشانه‌های پشت سر گذاشته را روی نقشه نگه دار</string>
     <string name="markers_remove_dialog_msg">نشانهٔ %s حذف شود؟</string>
     <string name="edit_map_marker">ویرایش نشانه</string>
@@ -3172,7 +3169,7 @@
     <string name="general_settings_profile_descr">پوستهٔ برنامه، یکاها، منطقه</string>
     <string name="configure_profile">پیکربندی پروفایل</string>
     <string name="voice_announces_info">پیام‌های گفتاری فقط در هنگام ناوبری پخش می‌شود.</string>
-    <string name="voice_announces_descr">راهنما و فرمان‌های ناوبری</string>
+    <string name="voice_announces_descr">فرمان‌های ناوبری و اعلام پیام‌ها</string>
     <string name="voice_announces">پیام‌های گفتاری</string>
     <string name="screen_alerts">هشدارهای تصویری</string>
     <string name="application_profile_changed">پروفایل برنامه به «%s» تغییر کرد</string>
@@ -3208,7 +3205,7 @@
     <string name="rendering_attr_piste_type_snow_park_name">پارک برفی</string>
     <string name="rendering_attr_piste_type_sleigh_name">سورتمه کالسکه‌ای</string>
     <string name="rendering_attr_piste_type_sled_name">سورتمه</string>
-    <string name="rendering_attr_piste_type_hike_name"/>
+    <string name="rendering_attr_piste_type_hike_name">پیاده‌گردی</string>
     <string name="rendering_attr_piste_type_skitour_name">تور اسکی</string>
     <string name="rendering_attr_piste_type_downhill_name">دان‌هیل</string>
     <string name="rendering_attr_piste_type_nordic_name">نوردیک</string>
@@ -3249,9 +3246,9 @@
     <string name="contour_lines_and_hillshade">سایه‌روشن و منحنی‌های میزان</string>
     <string name="routing_attr_prefer_unpaved_name">ترجیح جاده‌های روسازی‌نشده</string>
     <string name="routing_attr_prefer_unpaved_description">اولویت را به جاده‌های روسازی‌نشده می‌دهد.</string>
-    <string name="update_all_maps">به‌روزرسانی همهٔ نقشه‌ها</string>
-    <string name="update_all_maps_q">آیا همهٔ نقشه‌ها (%1$d) را به‌روز می‌کنید؟</string>
-    <string name="release_3_5">• تنظیمات برنامه و پروفایل‌ها به‌روز شد: تنظیمات بر اساس نوع مرتب شده‌اند و امکان شخصی‌سازی هر پروفایل اضافه شده است. 
+    <string name="update_all_maps">روزآمدسازی همهٔ نقشه‌ها</string>
+    <string name="update_all_maps_q">آیا همهٔ نقشه‌ها (%1$d) را روزآمد می‌کنید؟</string>
+    <string name="release_3_5">• تنظیمات برنامه و پروفایل‌ها روزآمد شد: تنظیمات بر اساس نوع مرتب شده‌اند و امکان شخصی‌سازی هر پروفایل اضافه شده است.
 \n
 \n• کادر جدیدی برای دانلود نقشه اضافه شده که هنگام مرور، نقشه‌ها را پیشنهاد می‌کند.
 \n
@@ -3259,7 +3256,7 @@
 \n
 \n• چند ایراد مسیریابی در سراسر جهان رفع شد.
 \n
-\n• نقشهٔ پایه با جزئیات بیشتر از شبکهٔ راه‌ها به‌روز شد. 
+\n• نقشهٔ پایه با جزئیات بیشتر از شبکهٔ راه‌ها روزآمد شد.
 \n
 \n• مناطق آب‌گرفته در سراسر جهان اصلاح شد.
 \n
@@ -3278,8 +3275,8 @@
     <string name="tts_initialization_error">شروع موتور متن به گفتار ناموفق بود.</string>
     <string name="simulate_your_location_gpx_descr">موقعیت خود را با استفاده از یک رد GPX ضبط‌شده شبیه‌سازی کنید.</string>
     <string name="exported_osmand_profile">پروفایل OsmAnd:‏ %1$s</string>
-    <string name="monthly_map_updates">به‌روزرسانی‌های ماهانهٔ نقشه</string>
-    <string name="daily_map_updates">به‌روزرسانی‌های ساعتی نقشه</string>
+    <string name="monthly_map_updates">روزآمدسازی‌های ماهانهٔ نقشه</string>
+    <string name="daily_map_updates">روزآمدسازی‌های ساعتی نقشه</string>
     <string name="send_search_query_description">عبارت جستجوی شما «%1$s» و همچنین مکان شما ارسال خواهد شد. 
 \n 
 \nاطلاعات خصوصی جمع‌آوری نمی‌شود. فقط دادهٔ جست‌وجو برای بهبود الگوریتم جست‌وجو موردنیاز است.</string>
@@ -3310,7 +3307,7 @@
     <string name="clear_confirmation_msg">‏%1$s پاک‌سازی شود؟</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">شبکه‌های گره</string>
     <string name="shared_string_turn_off">خاموش</string>
-    <string name="join_segments">پیوند پاره‌ها</string>
+    <string name="join_segments">اتصال پاره‌ها</string>
     <string name="save_heading">ثبت جهت</string>
     <string name="save_heading_descr">هنگام ضبط، جهت (heading) را برای هر یک از نقطه‌های رد ثبت می‌کند.</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -3385,7 +3382,7 @@
     <string name="tracks_view_descr">ردهای ضبط‌شدهٔ شما در %1$s یا در پوشهٔ OsmAnd قرار دارند.</string>
     <string name="multimedia_notes_view_descr">یادداشت‌های OSMای شما در %1$s قرار دارند.</string>
     <string name="osm_edits_view_descr">همهٔ ویرایش‌ها یا یادداشت‌های OSMای آپلودنشدهٔ خود را در %1$s ببینید. تغییرات آپلودشده را دیگر نمی‌بینید.</string>
-    <string name="logcat_buffer_descr">لاگ‌های جزئی برنامه را بررسی و هم‌رسانی کنید</string>
+    <string name="logcat_buffer_descr">لاگ‌های باجزئیات برنامه را بررسی و هم‌رسانی کنید</string>
     <string name="multimedia_use_system_camera">استفاده از برنامهٔ سیستم</string>
     <string name="multimedia_photo_play_sound">صدای شاتر دوربین</string>
     <string name="osm_authorization_success">احراز هویت موفقیت‌آمیز بود</string>
@@ -3497,7 +3494,7 @@
     <string name="shared_string_terrain">ناهمواری‌ها</string>
     <string name="hillshade_description">نقشهٔ سایه‌روشن که شیب‌ها، بلندی‌ها و پستی‌ها را با استفاده از سایه‌های تیره نمایان می‌کند.</string>
     <string name="terrain_slider_description">کمینه و بیشینهٔ زوم برای نمایش لایه را مشخص کنید.</string>
-    <string name="hillshade_download_description">"باید نقشهٔ دیگری را نیز دانلود کنید تا سایه‌روشن‌ها را  روی نقشه ببینید."</string>
+    <string name="hillshade_download_description">باید نقشهٔ دیگری را نیز دانلود کنید تا سایه‌روشن‌ها را روی نقشه ببینید.</string>
     <string name="slope_download_description">برای مشاهدهٔ شیب‌ها روی نقشه باید نقشهٔ دیگری را نیز دانلود کنید.</string>
     <string name="slope_read_more">دربارهٔ شیب‌ها می‌توانید در %1$s بیشتر بخوانید.</string>
     <string name="shared_string_transparency">شفافیت</string>
@@ -3557,7 +3554,7 @@
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="osm_live_payment_subscription_management">هنگام تأیید خرید، بها از حساب گوگل‌پلی شما پرداخت می‌شود.
 \n
-\nاگر پیش از پایان زمان اشتراک، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید، اشتراک شما به‌طور خودکار تمدید نخواهد شد. فقط در موعد تمدید اشتراک، برای دورهٔ اشتراک (ماهانه/سه‌ماهه/سالانه) از حسابتان برداشت می‌شود.
+\nاشتراک شما به‌طور خودکار تمدید خواهد شد مگر اینکه پیش از تاریخ تمدید، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید. فقط در موعد تمدید اشتراک، برای دورهٔ تمدید (ماهانه / سه‌ماهه / سالانه) از حسابتان برداشت می‌شود.
 \n
 \nبرای مدیریت یا لغو اشتراک خود، به تنظیمات گوگل‌پلی بروید.</string>
     <string name="tracker_item">OsmAnd tracker</string>
@@ -3598,7 +3595,7 @@
     <string name="lang_pnb">پنجابی</string>
     <string name="release_3_7">• نقشه‌های آفلاین جدید شیب
 \n
-\n • شخصی‌سازی کامل علاقه‌مندی‌ها و نقاط بین‌راهی GPX - رنگ، نماد و شکل دلخواه 
+\n • شخصی‌سازی کامل علاقه‌مندی‌ها و راه‌نشان‌های GPX - رنگ، نماد و شکل دلخواه
 \n
 \n • شخصی‌سازی ترتیب آیتم‌های منوی زمینه، پیکربندی نقشه و کشو
 \n
@@ -3632,7 +3629,7 @@
     <string name="parking_positions">جاهای پارک</string>
     <string name="reset_deafult_order">بازنشانی ترتیب پیشفرض اقلام</string>
     <string name="gpx_parse_error">‏OsmAnd GPX قالب درستی ندارد. لطفاً برای بررسی بیشتر با گروه پشتیبانی تماس بگیرید.</string>
-    <string name="turn_screen_on_wake_time_descr">زمان خاموشی صفحه پس از بیدارباش را انتخاب کنید. («%1$s» یعنی خاموش نشود)</string>
+    <string name="turn_screen_on_wake_time_descr">زمان خاموشی صفحه پس از بیدارباش را انتخاب کنید. («%1$s» یعنی زمانی تنظیم نخواهد شد.)</string>
     <string name="screen_timeout_descr">اگر «%1$s» روشن باشد، زمان فعالیت به آن وابسته خواهد بود.</string>
     <string name="shared_string_always">همیشه</string>
     <string name="screen_control">کنترل صفحه</string>
@@ -3644,11 +3641,11 @@
     <string name="turn_screen_on_power_button_descr">فشردن دکمهٔ خاموش/روشن دستگاه، صفحه را روشن می‌کند و OsmAnd را روی صفحهٔ قفل نمایش می‌دهد.</string>
     <string name="turn_screen_on_power_button">دکمهٔ خاموش/روشن</string>
     <string name="turn_screen_on_proximity_sensor">حسگر مجاورتی</string>
-    <string name="keep_screen_on">روشن نگه داشتن صفحه</string>
+    <string name="keep_screen_on">صفحه روشن بماند</string>
     <string name="keep_screen_off">صفحه را خاموش نگه دار</string>
     <string name="mercator_projection">فراتابی مرکاتور</string>
     <string name="one_image_per_tile">یک فایل تصویر برای هر کاشی</string>
-    <string name="map_source_zoom_levels_descr">هنگام استفاده از منبع به‌عنوان نقشه یا رولایه/زیرلایه، بر نمایش آن اثر می‌گذارند. 
+    <string name="map_source_zoom_levels_descr">هنگامی که به‌عنوان نقشه یا رولایه/زیرلایه استفاده می‌شود، نمایش آن تحت تأثیر قرار می‌گیرد:
 \n
 \n‏%1$s: نقشه به دامنهٔ زوم انتخاب‌شده محدود می‌شود.
 \n
@@ -3660,7 +3657,7 @@
     <string name="expire_time">زمان انقضا</string>
     <string name="storage_format">قالب ذخیره‌گاه</string>
     <string name="map_source_zoom_levels">کمترین و بیشترین درجهٔ زوم را برای نمایش یا بارکردن نقشهٔ آنلاین تنظیم کنید.</string>
-    <string name="expire_time_descr">کاشی‌های ذخیره‌شده پس از این مدت (به دقیقه) مجدداً دانلود می‌شوند. این خانه را خالی بگذارید تا کاشی‌های این منبع هیچ‌گاه تازه‌سازی نشود. 
+    <string name="expire_time_descr">کاشی‌های ذخیره‌شده پس از این مدت (به دقیقه) مجدداً دانلود می‌شوند. این خانه را خالی بگذارید تا کاشی‌های این منبع هیچ‌گاه تازه‌سازی نشوند.
 \n
 \nیک روز ۱ ۴۴۰ دقیقه است.
 \nیک هفته ۱۰ ۰۸۰ دقیقه است.
@@ -3678,7 +3675,7 @@
     <string name="shared_string_meters">متر</string>
     <string name="details_dialog_decr">جزئیات اضافه‌تر را روی نقشه آشکار یا پنهان کنید</string>
     <string name="shared_string_night_map">نقشهٔ شب</string>
-    <string name="turn_screen_on_power_button_disabled">غیرفعال است. به گزینهٔ «روشن نگه داشتن صفحه» در قسمت «زمان خاموشی پس از بیدارباش» نیاز دارد.</string>
+    <string name="turn_screen_on_power_button_disabled">غیرفعال است. به گزینهٔ «صفحه روشن بماند» در قسمت «زمان خاموشی پس از بیدارباش» نیاز دارد.</string>
     <string name="pseudo_mercator_projection">فراتابی شبه مرکاتور</string>
     <string name="rendering_attr_piste_type_connection_name">اتصال</string>
     <string name="rendering_attr_piste_difficulty_connection_name">اتصال</string>
@@ -3773,10 +3770,10 @@
     <string name="route_between_points_desc">مشخص کنید نقطه‌ها با خط مستقیم به هم وصل شوند یا مسیر بینشان مطابق تنظیمات زیر محاسبه شود.</string>
     <string name="whole_track">تمام رد</string>
     <string name="next_segment">پارهٔ بعدی</string>
-    <string name="route_between_points_warning_desc">در ادامه برای استفاده از این گزینه، با یکی از پروفایل‌های ناوبری‌تان رد خود را به نزدیک‌ترین جادهٔ مجاز بچسبانید.</string>
+    <string name="route_between_points_warning_desc">در ادامه، رد خود را به نزدیک‌ترین جادهٔ مجاز متناسب با یکی از پروفایل‌های ناوبری‌تان بچسبانید، تا از این گزینه استفاده کنید.</string>
     <string name="navigation_profile">پروفایل ناوبری</string>
     <string name="route_between_points_add_track_desc">یک فایل رد انتخاب کنید تا پارهٔ جدید را به آن بیفزایید.</string>
-    <string name="street_level_imagery">تصاویر نمای خیابان</string>
+    <string name="street_level_imagery">تصاویر سطح خیابان</string>
     <string name="plan_route_exit_dialog_descr">آیا می‌خواهید همهٔ تغییرات در مسیر طراحی‌شده از بین برود؟</string>
     <string name="in_case_of_reverse_direction">اگر برعکس حرکت کردم</string>
     <string name="start_of_the_track">ابتدای رد</string>
@@ -3793,11 +3790,11 @@
     <string name="add_address">افزودن نشانی</string>
     <string name="delete_address">حذف نشانی</string>
     <string name="simplified_track">ردِ ساده‌شده</string>
-    <string name="simplified_track_description">فقط خط مسیر ذخیره می‌شود. نقاط بین‌راهی حذف خواهند شد.</string>
+    <string name="simplified_track_description">فقط خط مسیر ذخیره می‌شود. راه‌نشان‌ها حذف خواهند شد.</string>
     <string name="shared_string_file_name">نام فایل</string>
     <string name="system_default_theme">پیشفرض سیستم</string>
     <string name="only_selected_segment_recalc">فقط پارهٔ انتخاب‌شده با استفاده از پروفایل انتخابی بازمحاسبه می‌شود.</string>
-    <string name="sort_last_modified">آخرین تغییر</string>
+    <string name="sort_last_modified">آخرین تغییریافته</string>
     <string name="sort_name_descending">نام: ی - الف</string>
     <string name="sort_name_ascending">نام: الف - ی</string>
     <string name="save_track_to_gpx">ردنگاری خودکار در هنگام ناوبری</string>
@@ -3809,8 +3806,8 @@
     <string name="save_track_to_gpx_globally">ضبط رد در فایل GPX</string>
     <string name="empty_state_my_tracks">فایل رد اضافه کنید</string>
     <string name="empty_state_my_tracks_desc">فایل رد درون‌برد یا ضبط کنید</string>
-    <string name="context_menu_item_add_waypoint">افزودن نقطهٔ بین‌راهی رد</string>
-    <string name="quick_action_add_gpx">افزودن نقطهٔ بین‌راهی رد</string>
+    <string name="context_menu_item_add_waypoint">افزودن راه‌نشان رد</string>
+    <string name="quick_action_add_gpx">افزودن راه‌نشان رد</string>
     <string name="map_widget_monitoring">ضبط سفر</string>
     <string name="marker_save_as_track">ذخیره در قالب فایل رد</string>
     <string name="number_of_gpx_files_selected_pattern">%s فایل رد انتخاب شده است</string>
@@ -3823,7 +3820,7 @@
     <string name="app_mode_enduro_motorcycle">موتور پرشی</string>
     <string name="app_mode_motor_scooter">اسکوتر موتوری</string>
     <string name="app_mode_wheelchair_forward">ویلچر رو به جلو</string>
-    <string name="threshold_distance">فاصله آستانه</string>
+    <string name="threshold_distance">فاصلهٔ آستانه</string>
     <string name="start_finish_icons">نمادهای ابتدا و انتها</string>
     <string name="routing_attr_avoid_footways_name">راه‌های پیاده</string>
     <string name="routing_attr_avoid_footways_description">از راه‌های پیاده پرهیز می‌کند</string>
@@ -3831,7 +3828,7 @@
     <string name="use_live_public_transport">دادهٔ OsmAnd Live</string>
     <string name="use_live_routing">دادهٔ OsmAnd Live</string>
     <string name="complex_routing_descr">مسیریابی دومرحله‌ای برای ناوبری خودرویی.</string>
-    <string name="use_native_pt_desc">برای مسیریابی حمل‌ونقل عمومی از محاسبات جاوا (امن) استفاده می‌کند</string>
+    <string name="use_native_pt_desc">برای مسیریابی حمل‌ونقل عمومی از محاسبات جاوا (ایمن) استفاده می‌کند</string>
     <string name="shared_string_local_maps">نقشه‌های محلی</string>
     <string name="icon_group_special">ویژه</string>
     <string name="icon_group_transport">حمل‌ونقل</string>
@@ -3841,10 +3838,10 @@
     <string name="icon_group_emergency">اورژانس</string>
     <string name="icon_group_travel">سفر</string>
     <string name="what_is_new">تازه‌ها</string>
-    <string name="perform_oauth_authorization_description">برای استفاده از قابلیت‌های ویرایشی، از طریق OAuth ثبت ورود کنید</string>
-    <string name="perform_oauth_authorization">ثبت ورود از طریق OAuth</string>
+    <string name="perform_oauth_authorization_description">برای استفاده از قابلیت‌های ویرایشی، از طریق OAuth وارد شوید</string>
+    <string name="perform_oauth_authorization">ورود از طریق OAuth</string>
     <string name="clear_osm_token">پاک‌سازی توکن OAuth اوپن‌استریت‌مپ</string>
-    <string name="osm_edit_logout_success">خروج ثبت شد</string>
+    <string name="osm_edit_logout_success">خارج شدید</string>
     <string name="file_already_imported">فایل قبلاً در OsmAnd درون‌برد شده است</string>
     <string name="use_two_phase_routing">استفاده از الگوریتم مسیریابی دومرحله‌ای A*‎</string>
     <string name="shared_string_graph">نمودار</string>
@@ -3855,7 +3852,7 @@
     <string name="message_you_need_add_two_points_to_show_graphs">دست‌کم دو نقطه اضافه کنید</string>
     <string name="login_open_street_map">ورود به اوپن‌استریت‌مپ</string>
     <string name="login_open_street_map_org">ورود به OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">ثبت ورود از طریق اوپن‌استریت‌مپ</string>
+    <string name="sign_in_with_open_street_map">ورود از طریق اوپن‌استریت‌مپ</string>
     <string name="open_street_map_login_mode">برای آپلود تغییرات جدید باید وارد شوید (login).
 \n
 \nبرای ورود می‌توانید از روش امن OAuth یا روش نام کاربری و گذرواژه استفاده کنید.</string>
@@ -3880,20 +3877,20 @@
     <string name="export_not_enough_space_descr">دستگاه شما تنها %1$s فضای خالی دارد. لطفا مقادری فضا خالی کنید و یا تعداد موارد برون‌ریزی را کاهش دهید.</string>
     <string name="export_not_enough_space">فضای کافی موجود نیست</string>
     <string name="select_groups_for_import">گروه‌هایی را که درون‌ریزی خواهند شد را انتخاب کنید.</string>
-    <string name="select_items_for_import">مواردی را که درون‌ریزی خواهند شد را انتخاب کنید.</string>
+    <string name="select_items_for_import">مواردی که درون‌برد خواهند شد را انتخاب کنید.</string>
     <string name="add_to_mapillary">افزودن به مپیلاری</string>
     <string name="add_to_opr">افزودن به OpenPlaceReviews</string>
-    <string name="use_dev_url_descr">برای امتحان کردن بارگذاری یادداشت / نقاط توجه و GPX از dev.openstreetmap.org به جای openstreetmep.org استفاده کنید.</string>
-    <string name="use_dev_url">از dev.openstreetmap.org استفاده کنید</string>
+    <string name="use_dev_url_descr">برای آپلود آزمایشی یادداشت / نقطهٔ توجه / GPX، به‌جای openstreetmep.org از dev.openstreetmap.org استفاده کنید.</string>
+    <string name="use_dev_url">استفاده از dev.openstreetmap.org</string>
     <string name="add_photos_descr">برنامه OsmAnd عکس‌ها را از چند منبع نشان می‌دهد:
 \nاز OpenPlaceReview برای عکس‌های نقاط توجه؛
 \nاز مپیلاری برای تصویر سطح خیابان؛
 \nاز وب و ویکی‌پدیا برای عکس‌های نقاط توجه متناسب با داده‌های اوپن‌استریت‌مپ.</string>
     <string name="app_mode_light_aircraft">هواپیمای سبک</string>
-    <string name="plan_route_join_segments">اتصال بخش‌ها</string>
-    <string name="plan_route_split_before">"تقطیع از این جا به  قبل"</string>
+    <string name="plan_route_join_segments">اتصال پاره‌ها</string>
+    <string name="plan_route_split_before">تقطیع از اینجا به قبل</string>
     <string name="plan_route_split_after">تقطیع از این جا به بعد</string>
-    <string name="plan_route_add_new_segment">افزودن یک بخش جدید</string>
+    <string name="plan_route_add_new_segment">افزودن یک پارهٔ جدید</string>
     <string name="profile_type_osmand_string">نمایهٔ OsmAnd</string>
     <string name="profile_type_user_string">نمایهٔ کاربر</string>
     <string name="voice_prompts_timetable">زمان‌های پیام‌های گفتاری</string>
@@ -3904,7 +3901,7 @@
     <string name="enter_text_separated">برچسب‌ها را بنویسید و با کاما جدا کنید.</string>
     <string name="osm_edit_close_note">بستن یادداشت OSM</string>
     <string name="osm_edit_comment_note">نظردادن به یادداشت OSM</string>
-    <string name="osm_login_descr">می‌توانید با روش ایمن OAuth وارد شوید یا از نام‌کاربری و گذرواژه‌تان استفاده کنید.</string>
+    <string name="osm_login_descr">می‌توانید با روش ایمن OAuth وارد شوید یا از نام کاربری و گذرواژه‌تان استفاده کنید.</string>
     <string name="app_mode_motorboat">قایق‌موتوری</string>
     <string name="cannot_upload_image">آپلود عکس ناموفق بود، لطفاً بعداً دوباره امتحان کنید</string>
     <string name="select_picture">انتخاب تصویر</string>
@@ -3914,7 +3911,7 @@
     <string name="file_size_needed_for_import">برای درون‌برد لازم است</string>
     <string name="reverse_all_points">برعکس‌کردن همهٔ نقطه‌ها</string>
     <string name="profile_by_default_description">پروفایلِ هنگام شروع برنامه را انتخاب کنید.</string>
-    <string name="shared_string_last_used">آخرین استفاده</string>
+    <string name="shared_string_last_used">آخرین استفاده‌شده</string>
     <string name="add_online_routing_engine">افزودن موتور مسیریابی آنلاین</string>
     <string name="edit_online_routing_engine">ویرایش موتور مسیریابی آنلاین</string>
     <string name="shared_string_vehicle">وسیله نقلیه</string>
@@ -3926,4 +3923,150 @@
     <string name="routing_engine_vehicle_type_foot">پا</string>
     <string name="routing_engine_vehicle_type_bike">دوچرخه</string>
     <string name="routing_engine_vehicle_type_car">خودرو</string>
+    <string name="app_restart_required">برای به کار بستن برخی تنظیمات، لازم است برنامه باز و بسته شود.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">پنهان‌کردن مرز ذخیره‌گاه‌های طبیعی، مناطق حفاظت‌شده و پارک‌های ملی</string>
+    <string name="last_time_checked">آخرین زمان بررسی: %s</string>
+    <string name="latest_openstreetmap_update">آخرین روزآمدسازهٔ اوپن‌استریت‌مپ:</string>
+    <string name="updated">روزآمدشده: %s</string>
+    <string name="live_update_frequency_week_variant">روزآمدی نقشه هر هفته بررسی می‌شود. زمان بعدی %1$s در %2$s.</string>
+    <string name="live_update_frequency_day_variant">روزآمدی نقشه هر روز بررسی می‌شود. زمان بعدی %1$s در %2$s.</string>
+    <string name="live_update_frequency_hour_variant">روزآمدی نقشه هر ساعت بررسی می‌شود. زمان بعدی %1$s در %2$s.</string>
+    <string name="delete_updates">حذف روزآمدسازه‌ها</string>
+    <string name="live_update_delete_updates_msg">آیا از حذف هر %s روزآمدسازهٔ زنده مطمئن هستید؟</string>
+    <string name="update_frequency">تکرار روزآمدسازی</string>
+    <string name="select_category_descr">دسته را انتخاب نمایید یا یکی جدید اضافه کنید</string>
+    <string name="track_recording_will_be_continued">ضبط ادامه می‌یابد.</string>
+    <string name="copy_poi_name">کپی نام نقطهٔ توجه</string>
+    <string name="quick_action_show_hide_title">آشکار/پنهان‌سازی</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">مرزهای حفاظت محیط‌زیست</string>
+    <string name="track_has_no_altitude">رد فاقد دادهٔ ارتفاع است.</string>
+    <string name="track_has_no_speed">رد فاقد دادهٔ سرعت است.</string>
+    <string name="routing_attr_short_way_description">مسیر کوتاه‌ترِ بهینه (صرفه‌جویی انرژی)</string>
+    <string name="snap_to_road_descr">نماد موقعیتِ کنونی به مسیر ناوبریِ جاری می‌چسبد</string>
+    <string name="routing_attr_height_obstacles_description">مسیریاب از سربالایی‌های شدید دوری می‌کند.</string>
+    <string name="purchases">خریدها</string>
+    <string name="start_recording">شروع ضبط</string>
+    <string name="show_track_on_map">نمایش رد روی نقشه</string>
+    <string name="routing_engine_vehicle_type_wheelchair">صندلی چرخ‌دار</string>
+    <string name="routing_engine_vehicle_type_hiking">پیاده‌گردی</string>
+    <string name="routing_engine_vehicle_type_walking">پیاده‌روی</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">دوچرخه‌سواری برقی</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">دوچرخه‌سواری کوهستان</string>
+    <string name="routing_engine_vehicle_type_cycling_road">دوچرخه‌سواری جاده</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">دوچرخه‌سواری منظم</string>
+    <string name="routing_engine_vehicle_type_hgv">وسیلهٔ نقلیهٔ سنگین</string>
+    <string name="routing_engine_vehicle_type_small_truck">کامیونت</string>
+    <string name="routing_engine_vehicle_type_truck">کامیون</string>
+    <string name="routing_engine_vehicle_type_racingbike">دوچرخهٔ مسابقه‌ای</string>
+    <string name="message_server_error">خطای کارساز: %1$s</string>
+    <string name="message_name_is_already_exists">این نام وجود دارد</string>
+    <string name="delete_online_routing_engine">این موتور مسیریابی آنلاین حذف شود؟</string>
+    <string name="context_menu_edit_descr">ویرایش توضیحات</string>
+    <string name="delete_waypoints">حذف راه‌نشان‌ها</string>
+    <string name="copy_to_map_markers">کپی در نشانه‌های نقشه</string>
+    <string name="copy_to_map_favorites">کپی در علاقه‌مندی‌ها</string>
+    <string name="upload_photo">در حال آپلود</string>
+    <string name="upload_photo_completed">آپلود کامل شد</string>
+    <string name="uploading_count">در حال آپلود %1$d از %2$d</string>
+    <string name="select_segments">انتخاب پاره‌ها</string>
+    <string name="select_segments_description">‏%1$s بیش از یک پاره دارد و باید بخش مورد نیاز برای ناوبری را انتخاب کنید.</string>
+    <string name="segments_count">پارهٔ %1$d</string>
+    <string name="uploaded_count">%1$d از %2$d آپلود شد</string>
+    <string name="toast_select_edits_for_upload">ویرایش‌ها را برای آپلود انتخاب کنید</string>
+    <string name="hillshade_slope_contour_lines">سایه‌روشن / شیب / منحنی‌های میزان</string>
+    <string name="open_place_reviews_plugin_description">‏OpenPlaceReviews پروژه‌ای جامعه‌محور با موضوع مکان‌های عمومی مانند رستوران‌ها، هتل‌ها، موزه‌ها و نقاط بین‌راهی است که همهٔ اطلاعات عمومی دربارهٔ آن‌ها را جمع‌آوری می‌کند؛ اطلاعاتی مانند نگاره، دیدگاه و پیوند به سایر سامانه‌ها همچون اوپن‌استریت‌مپ و ویکی‌پدیا.
+\n
+\nتمام دادهٔ OpenPlaceReview باز و در دسترس همگان است: http://openplacereviews.org/data.
+\n
+\nاینجا بیشتر بخوانید: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">استفاده از test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">ورود به OpenPlaceReviews</string>
+    <string name="activity_type_water_name">آب</string>
+    <string name="activity_type_winter_name">زمستان</string>
+    <string name="activity_type_snowmobile_name">برف‌رو</string>
+    <string name="activity_type_riding_name">سوارکاری</string>
+    <string name="activity_type_racing_name">مسابقه</string>
+    <string name="activity_type_mountainbike_name">دوچرخهٔ کوهستان</string>
+    <string name="activity_type_cycling_name">دوچرخه‌سواری</string>
+    <string name="activity_type_hiking_name">پیاده‌گردی</string>
+    <string name="activity_type_running_name">دویدن</string>
+    <string name="activity_type_walking_name">پیاده‌روی</string>
+    <string name="activity_type_offroad_name">آفرود</string>
+    <string name="activity_type_motorbike_name">موتورسیکلت</string>
+    <string name="activity_type_car_name">خودرو</string>
+    <string name="temporary_conditional_routing_descr">محدودیت‌های جاده که اکنون روی نقشه فعال هستند را لحاظ کن</string>
+    <string name="routing_attr_driving_style_description">هدف رانندگی را انتخاب نمایید تا مسیری کوتاه‌تر، سریع‌تر یا ایمن‌تر دریافت کنید</string>
+    <string name="map_orientation_threshold_descr">اگر سرعت پایین‌تر از مقدار زیر بود، نمای نقشه را نچرخان</string>
+    <string name="shared_strings_all_regions">همهٔ مناطق</string>
+    <string name="delete_number_files_question">%1$d فایل را حذف می‌کنید؟</string>
+    <string name="track_recording_stop_without_saving">توقف بدون ذخیره‌سازی</string>
+    <string name="track_recording_save_and_stop">ذخیره‌سازی و توقف ضبط</string>
+    <string name="track_recording_title">ضبط رد متوقف شد</string>
+    <string name="track_recording_description">آیا برای توقف ضبط مطمئن هستید؟
+\nهرچه که ذخیره نشده، از دست خواهد رفت.</string>
+    <string name="shared_string_subtype">زیرنوع</string>
+    <string name="use_native_pt">پیاده‌سازی Native حمل‌ونقل عمومی</string>
+    <string name="ltr_or_rtl_combine_via_star">%1$s * %2$s</string>
+    <string name="release_3_9">• گزینه‌ای برای برون‌برد و درون‌برد همهٔ داده‌ها شامل تنظیمات، منابع و مکان‌های من اضافه شد.
+\n
+\n • طراحی مسیر: برای پاره‌هایی از رد که مسیر دارند نمودار رسم می‌شود. امکان ساخت و ویرایش چندین پارهٔ رد اضافه شد.
+\n
+\n • شیوهٔ احراز هویت OAuth برای OpenStreetMap اضافه شد، رابط کاربری کادرهای OSM بهبود یافت.
+\n
+\n • پشتیبانی از رنگ‌های دلخواه برای علاقه‌مندی‌ها (favorites) و راه‌نشان‌های رد (track waypoints)
+\n
+\n</string>
+    <string name="routing_engine_vehicle_type_mtb">MTB</string>
+    <string name="routing_attr_prefer_hiking_routes_description">ترجیح مسیرهای پیاده‌گردی</string>
+    <string name="routing_attr_prefer_hiking_routes_name">ترجیح مسیرهای پیاده‌گردی</string>
+    <string name="routing_attr_allow_streams_name">رودهای کوچک و نهرهای مصنوعی مجاز باشد</string>
+    <string name="routing_attr_allow_streams_description">مسیریابی از رودهای کوچک (stream) و نهرهای مصنوعی (drain) مجاز باشد</string>
+    <string name="routing_attr_allow_intermittent_description">مسیریابی از آبراه‌های دوره‌ای و غیردائمی را مجاز می‌کند</string>
+    <string name="routing_attr_allow_intermittent_name">آبراه‌های غیردائمی مجاز باشد</string>
+    <string name="shared_string_sec">sec</string>
+    <string name="routing_engine_vehicle_type_scooter">اسکوتر</string>
+    <string name="context_menu_read_full">تمام‌صفحه</string>
+    <string name="select_another_colorization">لطفاً رنگ‌بندی دیگری انتخاب کنید.</string>
+    <string name="lang_de_casual">آلمانی (خودمانی)</string>
+    <string name="snowmobile_render_descr">مناسب برای اسنوموبیل‌سواری (برف‌روسواری) است. دارای مسیرها و جاده‌های ویژه.</string>
+    <string name="osm_live_payment_desc_hw">هزینهٔ اشتراک با رسیدن موعد دورهٔ انتخابی از حسابتان پرداخت می‌شود. هر زمان که خواستید در AppGallery آن را لغو کنید.</string>
+    <string name="osm_live_payment_subscription_management_hw">هنگام تأیید خرید، بها از حساب AppGallery شما پرداخت می‌شود.
+\n
+\nاشتراک شما به‌طور خودکار ادامه می‌یابد مگر اینکه پیش از تاریخ تمدید، اشتراک خود را لغو کرده باشید. فقط در موعد تمدید اشتراک، برای دورهٔ تمدید (ماهانه / سه‌ماهه / سالانه) از حسابتان برداشت می‌شود.
+\n
+\nبرای مدیریت یا لغو اشتراک خود، به تنظیمات AppGallery بروید.</string>
+    <string name="subscription_expired_title">اشتراک OsmAnd Live لغو شده است (expired)</string>
+    <string name="subscription_paused_title">اشتراک OsmAnd Live موقتاً متوقف شده است (paused)</string>
+    <string name="subscription_on_hold_title">اشتراک OsmAnd Live در انتظار است (on hold)</string>
+    <string name="app_mode_kayak">کایاک</string>
+    <string name="shared_string_server_url">Server URL</string>
+    <string name="keep_it_empty_if_not">اگر نیاز ندارد خالی بگذارید</string>
+    <string name="copy_address">کپی آدرس</string>
+    <string name="online_routing_engine">موتور مسیریابی آنلاین</string>
+    <string name="online_routing_engines">موتورهای مسیریابی آنلاین</string>
+    <string name="shared_string_folders">پوشه‌ها</string>
+    <string name="select_folder">انتخاب پوشه</string>
+    <string name="select_folder_descr">پوشه را انتخاب کنید یا یکی جدید اضافه نمایید</string>
+    <string name="shared_string_empty">تهی</string>
+    <string name="analyze_by_intervals">تحلیل بازه‌های تقسیم‌شده</string>
+    <string name="upload_to_openstreetmap">آپلود در OpenStreetMap</string>
+    <string name="edit_track">ویرایش رد</string>
+    <string name="rename_track">تغییر نام رد</string>
+    <string name="change_folder">تغییر پوشه</string>
+    <string name="shared_string_turn">پیچ</string>
+    <string name="announcement_time_passing">هنگام گذر</string>
+    <string name="announcement_time_approach">نزدیک‌شدن</string>
+    <string name="announcement_time_prepare_long">آمادگی زودتر</string>
+    <string name="announcement_time_prepare">آمادگی</string>
+    <string name="announcement_time_off_route">خروج از مسیر</string>
+    <string name="announcement_time_arrive">رسیدن به مقصد</string>
+    <string name="announcement_time_intervals">بازه‌های زمانی و مسافتی</string>
+    <string name="announcement_time_descr">زمان اعلام پیام‌های گفتاری به نوع پیام، سرعت ناوبری جاری و سرعت ناوبری پیش‌فرض بستگی دارد.</string>
+    <string name="announcement_time_title">زمان اعلام پیام</string>
+    <string name="restart">شروع دوباره</string>
+    <string name="on_pause">مکث کرده</string>
+    <string name="quick_action_coordinates_widget_descr">دکمه‌ای برای آشکار یا پنهان کردن ابزارک مختصات روی نقشه.</string>
+    <string name="shared_string_interval">بازه</string>
+    <string name="map_widget_distance_by_tap">فاصله با لمس دوانگشتی</string>
 </resources>

OsmAnd/res/values-fi/phrases.xml

@@ -395,7 +395,7 @@
     <string name="poi_fuel_91ul">91UL polttoaine</string>
     <string name="poi_fuel_100ll">100LL polttoaine</string>
     <string name="poi_fuel_jeta1">Jet A-1 polttoaine</string>
-    <string name="poi_fuel_adblue">AdBlue polttoaine</string>
+    <string name="poi_fuel_adblue">Diesel-pakokaasuneste</string>
     <string name="poi_fuel_wood">Polttoaine: puu</string>
     <string name="poi_fuel_charcoal">Polttoaine: puuhiili</string>
     <string name="poi_fuel_coal">Polttoaine: hiili</string>
@@ -1233,7 +1233,7 @@
     <string name="poi_service_repair_no">Ei korjaamoa</string>
     <string name="poi_service_electrical">Sähköajoneuvojen korjaamo</string>
     <string name="poi_motorcycle_repair">Moottoripyöräkorjaamo</string>
-    <string name="poi_self_service_no">Ei itsepalvelua</string>
+    <string name="poi_self_service_no">Ei</string>
     <string name="poi_automated_no">Ei automaattinen</string>
     <string name="poi_full_service_yes">Täysi palvelu</string>
     <string name="poi_brushless_no">Ei harjatonta pesua</string>
@@ -1253,7 +1253,7 @@
     <string name="poi_diaper_yes">Vauvan vaihtopöytä</string>
     <string name="poi_diaper_no">Ei vauvan vaihtopöytää</string>
     <string name="poi_diaper_room">Vaipanvaihtohuone</string>
-    <string name="poi_car_wash_no">Ei autopesua</string>
+    <string name="poi_car_wash_no">Ei</string>
     <string name="poi_maxstay">Maksimipysäköintiaika</string>
     <string name="poi_vending_parking_tickets">Pysäköintilippuja</string>
     <string name="poi_vending_cigarettes">Savukkeita</string>
@@ -1522,4 +1522,11 @@
     <string name="poi_guest_house">Vieras talo</string>
     <string name="poi_lodging">Majapaikka</string>
     <string name="poi_attraction_roller_coaster">Vuoristorata</string>
+    <string name="poi_herbalist">Yrttikauppa</string>
+    <string name="poi_consulate_filter">Konsulaatti</string>
+    <string name="poi_traffic_signals_arrow">Nuoli</string>
+    <string name="poi_traffic_signals_vibration">Tärinä</string>
+    <string name="poi_fire_hydrant_pressure_filter">Paine</string>
+    <string name="poi_bicycle_parking_building">Erityinen rakennus</string>
+    <string name="poi_trade_building_supplies">Rakennustarvikkeet</string>
 </resources>

OsmAnd/res/values-fi/strings.xml

@@ -37,7 +37,7 @@
     <string name="osmand_short_description_80_chars">OsmAnd on avoimen lähdekoodin navigointisovellus offline ja online kartoille</string>
     <string name="osmand_plus_short_description_80_chars">OsmAnd on avoimen lähdekoodin navigointisovellus offline ja online kartoille</string>
     <string name="recalculate_route_to_your_location">Liikennemuoto:</string>
-    <string name="select_navigation_mode">Valitse liikennemuoto</string>
+    <string name="select_navigation_mode">Liikennemuoto:</string>
     <string name="day_night_info_description">Auringon nousu : %1$s
 \nAuringon lasku : %2$s</string>
     <string name="day_night_info">Päivä/yö info</string>
@@ -201,7 +201,7 @@
     <string name="favorite_places_category">Paikat</string>
     <string name="shared_string_others">Muut</string>
     <string name="shared_string_name">Nimi</string>
-    <string name="favourites_edit_dialog_category">Kategoria</string>
+    <string name="favourites_edit_dialog_category">Luokka</string>
     <string name="shared_string_no_thanks">Ei kiitos</string>
     <string name="daynight_mode_day">Päivä</string>
     <string name="daynight_mode_night">Yö</string>
@@ -542,7 +542,7 @@
     <string name="download_select_map_types">Muut kartat</string>
     <string name="av_def_action_video">Tallenna videota</string>
     <string name="av_def_action_audio">Tallenna ääntä</string>
-    <string name="av_video_format_descr">Valitse videon tallennusformaatti</string>
+    <string name="av_video_format_descr">Videon tallennusformaatti:</string>
     <string name="av_video_format">Videon tallennusformaatti</string>
     <string name="av_use_external_recorder">Käytä ulkoista nauhoitinta</string>
     <string name="av_settings_descr">Muuta ääni- ja videoasetuksia</string>
@@ -708,7 +708,7 @@
     <string name="agps_info">A-GPS tiedot</string>
     <string name="shared_string_manage">Hallinta</string>
     <string name="welcome_select_region">Valitse ajoalue, jotta liikennemerkit ja -määräykset ovat oikein:</string>
-    <string name="welcome_text">OsmAnd tarjoaa maailmanlaajuisen offline karttaselailun, ja maailmanlaajuisen offline navigoinnin!</string>
+    <string name="welcome_text">OsmAnd tarjoaa maailmanlaajuisen offline karttaselailun, ja offline navigoinnin.</string>
     <string name="osm_changes_added_to_local_edits">OSM muutokset lisätty paikalliseen muutosjoukkoon</string>
     <string name="local_osm_changes_upload_all_confirm">Haluatko varmasti lähettää %1$d muutosta(ksia) OSMiin\?</string>
     <string name="confirmation_to_clear_history">Tyhjennetäänkö historia\?</string>
@@ -975,7 +975,8 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="osm_live_month_cost_desc">Kuukausimaksu</string>
     <string name="osm_live_not_active">Ei aktiivinen</string>
     <string name="osm_live_enter_user_name">Ole hyvä ja anna julkinen nimi</string>
-    <string name="osm_live_thanks">Kiitos live-päivitysten tilauksesta!</string>
+    <string name="osm_live_thanks">Kiitos, että tuet OsmAndia!
+\nAktivodaksesi kaikki uudet ominaisuudet, sinun on käynnistettävä OsmAnd uudelleen.</string>
     <string name="osm_live_region_desc">Osa lahjoituksestasi lähetetään OSM-käyttäjille, jotka ovat lähettäneet muutoksia haluamallesi alueelle</string>
     <string name="osm_live_ask_for_purchase">Osta OSM Live -tilaus ensin</string>
     <string name="file_name_containes_illegal_char">Tiedostonimi sisältää virheellisiä merkkejä</string>
@@ -1008,9 +1009,8 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="download_files_error_not_enough_space">Tilaa ei ole tarpeeksi!
 \n{3} Mt tarvitaan väliaikaisesti, {1} Mt pysyvästi.
 \n(Vain {2} Mt on käytettävissä.)</string>
-    <string name="download_files_question_space_with_temp">Lataa {0} tiedosto(a)?
- Tallennnustilaa käytetään {3} Mt hetkellisesti, {1} Mt pysyvästi.
- (Vapaata tilaa on {2} Mt.)</string>
+    <string name="download_files_question_space_with_temp">Lataa {0} tiedosto(a)\?
+\nTallennnustilaa käytetään {3} Mt hetkellisesti, {1} Mt pysyvästi. (Vapaata tilaa on {2} Mt.)</string>
     <string name="upload_osm_note">Lähetä OSM-huomautus</string>
     <string name="shared_string_toolbar">Työkalupalkki</string>
     <string name="shared_string_widgets">Työkalut</string>
@@ -1317,7 +1317,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="app_mode_boat">Vene</string>
     <string name="app_mode_aircraft">Lentokone</string>
     <string name="animate_routing_route_not_calculated">Laske reitti ensin</string>
-    <string name="animate_routing_route">"Simuloi laskettua reittiä "</string>
+    <string name="animate_routing_route">Simuloi käyttämällä laskettua reittiä</string>
     <string name="animate_routing_gpx">Simuloi käyttäen GPX jälkeä</string>
     <string name="auto_zoom_none">Ei automaattista zoomausta</string>
     <string name="auto_zoom_close">Lähennä</string>
@@ -1413,7 +1413,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="wait_current_task_finished">Ole hyvä ja odota kunnes nykyinen toiminto on suoritettu</string>
     <string name="files_limit">%1$d tiedostoa jäljellä</string>
     <string name="install_paid">Täydellinen versio</string>
-    <string name="cancel_route">Keskeytä reitti</string>
+    <string name="cancel_route">Hylätäänkö reitti\?</string>
     <string name="cancel_navigation">Keskeytä suunnistus</string>
     <string name="clear_destination">Poista määränpää</string>
     <string name="street_name">Katunimi</string>
@@ -1448,7 +1448,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
 \nsovelluksen suoritus taustalta</string>
     <string name="map_widget_mini_route">Pienoisreittikartta</string>
     <string name="bg_service_interval">Aseta virkistyksen aikaväli:</string>
-    <string name="select_animate_speedup">Aseta nopeus reitin simuloinnille</string>
+    <string name="select_animate_speedup">Reitin simulointinopeus:</string>
     <string name="global_app_allocated_memory_descr">Muistia varattu %1$s MB (Android raja %2$s MB, Dalvik %3$s MB).</string>
     <string name="share_route_as_gpx">Jaa reitti GPX-tiedostona</string>
     <string name="share_route_subject">OsmAndista jaettu reitti</string>
@@ -1460,7 +1460,7 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="rendering_attr_hmRendered_name">Näytä lisää kartan yksityiskohtia</string>
     <string name="local_index_routing_data">Reititystiedot</string>
     <string name="map_online_data">Online ja kuvakekartat</string>
-    <string name="play_commands_of_currently_selected_voice">Käytä komentoja valitulla äänellä</string>
+    <string name="play_commands_of_currently_selected_voice">Valitse ääni ja testaa toistamalla ilmoituksia:</string>
     <string name="test_voice_prompts">Testaa ääniohjeita</string>
     <string name="support_new_features_descr">Lahjoita nähdäksesi uusia ominaisuuksia totetettavaksi sovellutukseen</string>
     <string name="accessibility_mode_descr">Ota käyttöön esteettömyysominaisuudet</string>
@@ -1718,9 +1718,9 @@ Maailmanlaajuiset tiedot (välillä 70 astetta pohjoista ja 70 astetta eteläist
     <string name="selected_gpx_info_show">"
 \n
 \nPaina pitkään nähdäksesi kartalla"</string>
-    <string name="local_index_gpx_info_show">
-
-Paina ja pidä nähdäksesi kartalla</string>
+    <string name="local_index_gpx_info_show">"
+\n
+\nPaina pitkään nähdäksesi vaihtoehdot"</string>
     <string name="gpx_info_asc_altitude">Alas/Ylös: %1$s</string>
     <string name="calculate_osmand_route_without_internet">OsmAnd reittisegmentin laskeminen ilman internettiä</string>
     <string name="gpx_option_calculate_first_last_segment">Laske OsmAnd reitti ensimmäiselle ja viimeiselle reitin segmentille</string>
@@ -1732,10 +1732,10 @@ Paina ja pidä nähdäksesi kartalla</string>
     <string name="route_from">Mistä:</string>
     <string name="download_using_mobile_internet">Wi-Fi ei ole nyt yhdistetty. Haluatko käyttää nykyistä internet yhteytttä lataukseen?</string>
     <string name="precise_routing_mode_descr">Ota käyttöön laskenta tarkalle reitille ilman pikkuvirheitä. Vielä etäisyysrajoitteinen ja hidas.</string>
-    <string name="av_def_action_choose">Valitse käytettäessä</string>
-    <string name="av_widget_action_descr">Valitse oletustyökalutoiminto</string>
+    <string name="av_def_action_choose">Pyynnöstä\?</string>
+    <string name="av_widget_action_descr">Oletustyökalutoiminto:</string>
     <string name="av_widget_action">Oletustyökalutoiminto</string>
-    <string name="av_use_external_recorder_descr">Käytä järjestelmän nauhoitinta videolle</string>
+    <string name="av_use_external_recorder_descr">Käytä järjestelmän nauhoitinta videolle.</string>
     <string name="av_use_external_camera_descr">Käytä järjestelmän sovellutusta kuvalle</string>
     <string name="av_use_external_camera">Käytä kamerasovellutusta</string>
     <string name="recording_is_recorded">Audio/video on nauhoituksessa. Lopettaaksesi sen paina AV työkalua.</string>
@@ -1765,7 +1765,7 @@ Paina ja pidä nähdäksesi kartalla</string>
     <string name="auto_announce_off">Keskeytä automaattiset ilmoitukset</string>
     <string name="access_direction_audio_feedback">Reittiohjaus (äänipalautteena)</string>
     <string name="access_direction_haptic_feedback">Reittiohjaus (värinäpalautteena)</string>
-    <string name="storage_directory_readonly_desc">"Datahakemisto on vaihdettu sisäiseen muistiin, sillä valittu hakemisto on vain luku -tilassa.  Ole hyvä ja valitse sopiva datahakemisto."</string>
+    <string name="storage_directory_readonly_desc">Vaihdettu sisäiseen muistiin, sillä valittu tallennushakemisto on kirjoitussuojattu. Ole hyvä ja valitse tallennushakemisto johon voi kirjoittaa.</string>
     <string name="osm_live_email_desc">Tarvitsemme sen huolehtiaksemme tiedostasi maksuosuuksia varten</string>
     <string name="translit_name_if_miss">Translitteroi, jos nimi puuttuu kielellä %1$s</string>
     <string name="translit_names">Translitteroi nimet</string>
@@ -1776,7 +1776,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="background_service_wait_int_descr">Aseta suurin sallittu odotusaika jokaiselle taustan paikanmäritykselle.</string>
     <string name="background_service_wait_int">Maksimi aika paikanmääritykselle</string>
     <string name="background_service_int_descr">Taustapalvelun käyttämä virkistyksen väliaika:</string>
-    <string name="background_service_provider_descr">Valitse taustapalvelun käyttämä sijainnin tarjoaja</string>
+    <string name="background_service_provider_descr">Taustapalvelun käyttämä sijaintitapa:</string>
     <string name="background_service_provider">Sijainnin tarjoaja</string>
     <string name="off_router_service_no_gps_available">Taustasuunnistuspalvelu tarvitsee sijainnin tarjoajan asetettavaksi päälle.</string>
     <string name="transport">Liikenne</string>
@@ -1815,7 +1815,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="use_magnetic_sensor">Käytä magneetista sensoria</string>
     <string name="srtm_paid_version_msg">Harkitse ostavasi Korkeuskäyrä laajennuksen Kaupasta tukeaksesi jatkokehitystä.</string>
     <string name="recording_playing">Audio halutusta nauhoituksesta soitetaan.
-%1$s</string>
+\n%1$s</string>
     <string name="recording_context_menu_arecord">Tee audio muistiinpano</string>
     <string name="rendering_attr_alpineHiking_name">Alppivaelluksen mittakaava (SAC)</string>
     <string name="rendering_attr_alpineHiking_description">Hahmota polut SAC mittakaavan mukaisesti</string>
@@ -1898,7 +1898,6 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_time">Aika</string>
     <string name="total_distance">Kokonaisetäisyys</string>
     <string name="routing_attr_height_obstacles_name">Käytä korkeustietoja</string>
-
     <string name="auto_split_recording_title">Jaa automaattisesti nauhoitukset tauon jälkeen</string>
     <string name="rendering_attr_hideWaterPolygons_name">Piilota vesi</string>
     <string name="shared_string_action_name">Toiminnon nimi</string>
@@ -2063,7 +2062,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="shared_string_travel_guides">Matkaoppaat</string>
     <string name="waypoints_removed_from_map_markers">Välietapit poistettu karttamarkkereista</string>
     <string name="nothing_found_in_radius">Mitään ei löydetty:</string>
-    <string name="select_waypoints_category_description">Lisää kaikki jäljen välietapit tai valitse erilliset kategoriat.</string>
+    <string name="select_waypoints_category_description">Lisää kaikki jäljen välietapit tai valitse erilliset luokat.</string>
     <string name="shared_string_total">Yhteensä</string>
     <string name="clear_all_intermediates">Poista kaikki välipisteet</string>
     <string name="group_deleted">Ryhmä poistettu</string>
@@ -2081,7 +2080,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="last_intermediate_dest_description">Lisää välipysähdys</string>
     <string name="first_intermediate_dest_description">Lisää ensimmäisen pysähdys</string>
     <string name="show_closed_notes">Näytä suljetut huomautukset</string>
-    <string name="switch_osm_notes_visibility_desc">Näytä/piilota OSM-huomautukset kartalla.</string>
+    <string name="switch_osm_notes_visibility_desc">Näytä tai piilota OSM-huomautukset kartalla.</string>
     <string name="gpx_file_desc">GPX - soveltuu vietäväksi JOSM:iin tai muihin OSM-editoreihin.</string>
     <string name="osc_file_desc">OSC - soveltuu vietäväksi OpenStreetMappiin.</string>
     <string name="shared_string_gpx_file">GPX-tiedosto</string>
@@ -2132,7 +2131,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="show_guide_line_descr">Näytä suuntaviiva sijainnistasi aktiivisten markkerien sijainteihin.</string>
     <string name="show_arrows_descr">Näytä yksi tai kaksi nuolta ilmaisemaan suunta aktiivisiin markkereihin.</string>
     <string name="distance_indication_descr">Valitse, kuinka etäisyys aktiivisiin pisteisiin näytetään.</string>
-    <string name="active_markers_descr">Määritä suuntailmaisimien lukumäärä:</string>
+    <string name="active_markers_descr">Määritä suuntailmaisimien lukumäärä.</string>
     <string name="digits_quantity">Desimaalien määrä</string>
     <string name="quick_action_edit_actions">Muokkaa toimintoja</string>
     <string name="dd_mm_ss_format">DD°MM′SS″</string>
@@ -2207,8 +2206,8 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="select_postcode">Valitse postinumero</string>
     <string name="quick_action_auto_zoom">Kartan automaattinen tarkennus päälle/pois</string>
     <string name="quick_action_auto_zoom_desc">Tämän toimintonappulan koskettaminen ottaa käyttöön/poistaa käytöstä nopeuteesi perustuvan kartan automaattisen tarkennuksen.</string>
-    <string name="quick_action_auto_zoom_on">"Ota kartan automaattinen tarkennus käyttöön "</string>
-    <string name="quick_action_auto_zoom_off">"Poista kartan automaattinen tarkennus käytöstä "</string>
+    <string name="quick_action_auto_zoom_on">Ota automaattinen tarkennus käyttöön</string>
+    <string name="quick_action_auto_zoom_off">Poista automaattinen tarkennus käytöstä</string>
     <string name="quick_action_add_destination">Aseta määränpää</string>
     <string name="quick_action_replace_destination">Korvaa määränpää</string>
     <string name="quick_action_add_first_intermediate">Lisää ensimmäinen välietappi</string>
@@ -2223,7 +2222,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="open_in_browser_wiki_description">Näytä artikkeli selaimessa.</string>
     <string name="how_to_open_wiki_title">Kuinka avata Wikipedia artikkelit?</string>
     <string name="thank_you_for_feedback">Kiitos palautteestasi</string>
-    <string name="add_start_and_end_points">Lisää lähtö- ja maalipisteet</string>
+    <string name="add_start_and_end_points">Lisää lähtö ja määränpää</string>
     <string name="route_add_start_point">Lisää lähtöpiste</string>
     <string name="route_descr_select_start_point">Valitse lähtöpiste</string>
     <string name="rendering_attr_surface_unpaved_name">Päällystämätön</string>
@@ -2508,7 +2507,7 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="legend_item_description">Kartan symboliikkaopas.</string>
     <string name="navigation_profiles_item">Navigointiprofiilit</string>
     <string name="lang_ba">baškiiri</string>
-    <string name="move_inside_category">Voit siirtää kohteita vain tämän kategorian sisällä.</string>
+    <string name="move_inside_category">Voit siirtää kohteita vain tämän luokan sisällä.</string>
     <string name="app_mode_ski_snowmobile">Moottorikelkka</string>
     <string name="shared_string_languages">Kielet</string>
     <string name="shared_string_language">Kieli</string>
@@ -2730,4 +2729,35 @@ Jos pidät OsmAndista ja OSMsta ja haluat tukea niitä, on tämä täydellinen t
     <string name="uploading_count">Lähetetty %1$d muutosta %2$d muutoksesta</string>
     <string name="uploaded_count">Lähetettiin %1$d muutosta %2$d muutoksesta</string>
     <string name="toast_select_edits_for_upload">Valitse lähetettävät muutokset</string>
+    <string name="search_no_results_feedback">Ei hakutuloksia\?
+\nAntaa palautetta</string>
+    <string name="routing_attr_prefer_hiking_routes_name">Suosi vaellusreittejä</string>
+    <string name="routing_attr_prefer_hiking_routes_description">Suosi vaellusreittejä</string>
+    <string name="rearrange_categories">Järjestä luokat uudelleen</string>
+    <string name="select_category_descr">Valitse luokka tai lisää uusi</string>
+    <string name="quick_action_gpx_category_descr">Valitse valinnainen luokka.</string>
+    <string name="sort_by_category">Lajittele luokan mukaan</string>
+    <string name="add_custom_category">Lisää oma luokka</string>
+    <string name="quick_action_show_hide_title">Näytä/piilota</string>
+    <string name="temporary_conditional_routing">Harkitse väliaikaisia rajoituksia</string>
+    <string name="start_recording">Aloita nauhottaminen</string>
+    <string name="track_recording_save_and_stop">Tallenna ja lopeta nauhoitus</string>
+    <string name="track_recording_description">Haluatko varmasti lopettaa nauhoituksen\?
+\nKaikki tallentamattomat tiedot menetetään.</string>
+    <string name="track_recording_will_be_continued">Nauhoitusta jatketaan.</string>
+    <string name="added_profiles_descr">Laajennuksen lisäämät profiilit</string>
+    <string name="added_profiles">Lisätyt profiilit</string>
+    <string name="profile_appearance">Profiilin ulkoasu</string>
+    <string name="add_new_profile_q">Lisätäänkö uusi profiili \'%1$s\'\?</string>
+    <string name="master_profile">Pääprofiili</string>
+    <string name="reset_all_profile_settings">Palautetaanko kaikki profiiliasetukset\?</string>
+    <string name="profile_type_custom_string">Mukautettu profiili</string>
+    <string name="profile_backup_failed">Profiilin varmuuskopiointi epäonnistui.</string>
+    <string name="saving_new_profile">Tallennetaan uutta profiilia</string>
+    <string name="restore_all_profile_settings">Palautetaanko kaikki profiiliasetukset\?</string>
+    <string name="shared_string_add_profile">Lisää profiili</string>
+    <string name="change_application_profile">Vaihda sovelluksen profiilia</string>
+    <string name="profiles_for_action_not_found">Tällaisia profiileja ei löytynyt.</string>
+    <string name="profile_type_osmand_string">OsmAnd-profiili</string>
+    <string name="profile_type_user_string">Käyttäjäprofiili</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -2737,7 +2737,7 @@
     <string name="poi_animal_shelter_fish">Poissons</string>
     <string name="poi_information_trail_blaze">Balise de chemin</string>
     <string name="poi_traffic_signals_sound_walk">Seulement quand la traversée est autorisée</string>
-    <string name="poi_piste_grooming_backcountry">Arrière-pays</string>
+    <string name="poi_piste_grooming_backcountry">Non damée</string>
     <string name="poi_aerialway_occupancy">Cabine/Siège/capacité de voiture</string>
     <string name="poi_payment_account_cards_yes">Cartes de comptes</string>
     <string name="poi_payment_account_cards_no">Cartes de compte non acceptées</string>
@@ -3881,4 +3881,15 @@
     <string name="poi_waste_transfer_station">Station de traitement des déchets</string>
     <string name="poi_weightbridge">Pont de levage</string>
     <string name="poi_ranger_station">Poste de garde forestier</string>
+    <string name="poi_conference_centre">Centre de conférence</string>
+    <string name="poi_piste_status_closed">Statut de la piste : fermée</string>
+    <string name="poi_piste_status_open">Statut de la piste : ouvert</string>
+    <string name="poi_piste_name">Nom de la piste</string>
+    <string name="poi_piste_ski_jump">Saut à ski</string>
+    <string name="poi_summit_register_no">Livre d\'or au sommet : non</string>
+    <string name="poi_summit_register_yes">Livre d\'or au sommet : oui</string>
+    <string name="poi_patrolled_no">Surveillé : non</string>
+    <string name="poi_patrolled_yes">Surveillé : oui</string>
+    <string name="poi_local_ref">Référence locale</string>
+    <string name="poi_geodesist">Géodésien</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -2154,7 +2154,6 @@
     <string name="rendering_attr_depthContours_description">Afficher les lignes et points de sonde.</string>
     <string name="rendering_attr_depthContours_name">Lignes de sonde maritimes</string>
     <string name="routing_attr_height_obstacles_name">Utiliser les données d\'altitude</string>
-
     <string name="average_altitude">Altitude moyenne</string>
     <string name="total_distance">Distance totale</string>
     <string name="shared_string_time">Durée</string>
@@ -3995,4 +3994,45 @@
 \n
 \nPour en savoir, consultez http://openplacereviews.org.</string>
     <string name="activity_type_racing_name">Course automobile</string>
+    <string name="temporary_conditional_routing_descr">Utilisez les limitations routières actuellement actives sur la carte</string>
+    <string name="track_recording_description">Êtes-vous certain de vouloir interrompre l\'enregistrement \?
+\nToutes les données non sauvegardées seront perdues.</string>
+    <string name="live_update_delete_updates_msg">Êtes-vous certain de vouloir supprimer %s mises à jour temps réel \?</string>
+    <string name="map_orientation_threshold_descr">Ne pas pivoter la carte si la vitesse est inférieure à un seuil</string>
+    <string name="on_pause">En pause</string>
+    <string name="app_restart_required">Un redémarrage de l\'application est nécessaire pour appliquer certains paramètres.</string>
+    <string name="routing_attr_height_obstacles_description">Le routage peut éviter de fortes montées.</string>
+    <string name="map_widget_distance_by_tap">Distance par appui</string>
+    <string name="latest_openstreetmap_update">Dernière mise à jour d\'OpenStreetMap disponible :</string>
+    <string name="updated">Mis à jour : %s</string>
+    <string name="last_time_checked">Dernière vérification : %s</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="restart">Redémarrer</string>
+    <string name="shared_strings_all_regions">Toutes les régions</string>
+    <string name="delete_number_files_question">Supprimer %1$d fichiers \?</string>
+    <string name="track_recording_stop_without_saving">Arrêter sans enregistrer</string>
+    <string name="track_recording_save_and_stop">Enregistrer et arrêter l\'enregistrement</string>
+    <string name="track_recording_title">Enregistrement de la trace arrêté</string>
+    <string name="select_segments">Sélectionnez les segments</string>
+    <string name="update_frequency">Fréquence de mise à jour</string>
+    <string name="live_update_frequency_week_variant">Les cartes seront vérifiées chaque semaine. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
+    <string name="live_update_frequency_day_variant">Les cartes seront vérifiées tous les jours. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Les cartes seront vérifiées toutes les heures. La prochaine vérification de mise à jour s\'effectuera à %1$s dans %2$s.</string>
+    <string name="delete_updates">Supprimer les mises à jour</string>
+    <string name="purchases">Achats</string>
+    <string name="select_category_descr">Sélectionnez la catégorie ou ajoutez-en une nouvelle</string>
+    <string name="track_recording_will_be_continued">L\'enregistrement se poursuivra.</string>
+    <string name="copy_poi_name">Copier le nom du PI</string>
+    <string name="quick_action_show_hide_title">Afficher / masquer</string>
+    <string name="shared_string_interval">Intervalle</string>
+    <string name="track_has_no_altitude">La trace ne contient aucune donnée d\'altitude.</string>
+    <string name="track_has_no_speed">La trace ne contient aucune donnée de vitesse.</string>
+    <string name="routing_attr_short_way_description">Itinéraire court optimisé (plus économe en énergie)</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Masquer les limites des réserves naturelles, des zones protégées et des parcs nationaux</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Limites naturelles</string>
+    <string name="select_segments_description">%1$s contient plus d\'un segment, vous devez sélectionner le tronçon nécessaire à la navigation.</string>
+    <string name="routing_attr_driving_style_description">Sélectionnez le mode de conduite pour avoir l\'itinéraire le plus court, le plus rapide, ou le plus sûr</string>
+    <string name="quick_action_coordinates_widget_descr">Appuyer pour afficher ou cacher le widget Coordonnées sur la carte.</string>
+    <string name="snap_to_road_descr">L’icône de localisation va se déplacer sur le trajet en cours.</string>
+    <string name="select_another_colorization">Veuillez sélectionner un autre type de colorisation.</string>
 </resources>

OsmAnd/res/values-gl/phrases.xml

@@ -3881,4 +3881,17 @@
     <string name="poi_wildlife_crossing_bat_bridge">Ponte para morcegos</string>
     <string name="poi_wildlife_crossing">Paso de fauna</string>
     <string name="poi_swimming_area">Área de natación</string>
+    <string name="poi_local_ref">Referencia local</string>
+    <string name="poi_geodesist">Xeodésico</string>
+    <string name="poi_conference_centre">Centro de conferencias</string>
+    <string name="poi_mobile_library">Posición de parada de biblioteca móbil</string>
+    <string name="poi_summit_register_no">Rexistro do cumio: no</string>
+    <string name="poi_summit_register_yes">Rexistro do cumio: si</string>
+    <string name="poi_piste_status_closed">Estado da pista: pechada</string>
+    <string name="poi_piste_status_open">Estado da pista: aberta</string>
+    <string name="poi_patrolled_no">Patrullado: non</string>
+    <string name="poi_patrolled_yes">Patrullado: si</string>
+    <string name="poi_gladed_yes">Arborado: si</string>
+    <string name="poi_piste_name">Nome da pista</string>
+    <string name="poi_piste_ski_jump">Salto de esquí</string>
 </resources>

OsmAnd/res/values-gl/strings.xml

@@ -2565,10 +2565,9 @@ Lon %2$s</string>
     <string name="do_not_send_anonymous_app_usage_desc">O OsmAnd recompila información sobre as lapelas que abres na aplicación. Non estamos a recompilar datos da localización, datos inseridos na aplicación ou datos relacionados coas áreas que ollas, procuras ou baixas.</string>
     <string name="do_not_show_startup_messages_desc">Agocha os descontos da aplicación e as mensaxes especiais dos acontecementos locais.</string>
     <string name="routing_attr_relief_smoothness_factor_name">Escoller variación da altitude</string>
-
     <string name="rendering_attr_depthContours_description">Amosar curvas e puntos do afundimento.</string>
     <string name="rendering_attr_depthContours_name">Curvas do afundimento náuticos</string>
-    <string name="auto_split_recording_title">División automática das gravacións en intres</string>
+    <string name="auto_split_recording_title">Dividir gravacións após unha pausa</string>
     <string name="auto_split_recording_descr">Comezar novo segmento despois dun intre de 6 min, nova pista despois dun intre de 2 h, ou novo ficheiro despois dun intre máis longo se mudaches a data.</string>
     <string name="shared_string_paused">Detido</string>
     <string name="save_track_min_distance">Mínimo desprazamento para o rexistro</string>
@@ -3696,9 +3695,9 @@ Lon %2$s</string>
     <string name="lenght_limit_description">Fornece a lonxitude do teu vehículo. Algunhas restricións de ruta poden ser aplicadas a vehículos longos.</string>
     <string name="quick_action_remove_next_destination">Eliminar punto de destino máis preto</string>
     <string name="please_provide_point_name_error">Fornece un nome para o punto</string>
-    <string name="quick_action_remove_next_destination_descr">O punto de destino actual na ruta será eliminado. Se fora o destino, a navegación sería interrompida.</string>
+    <string name="quick_action_remove_next_destination_descr">Elimina o seguinte destino da ruta. Se é o destino final, a navegación será detida.</string>
     <string name="search_download_wikipedia_maps">Baixar mapas da Wikipedia</string>
-    <string name="plugin_wikipedia_description">Obter información sobre os puntos de interese da Wikipedia. É o teu guía de peto sen conexión - só activar o complemento da Wikipedia e desfrutar dos artigos sobre os elementos ó teu redor.</string>
+    <string name="plugin_wikipedia_description">Obtén información sobre os puntos de interese da Wikipedia, unha guía de peto sen conexión que inclúe artigos sobre obxectos e destinos.</string>
     <string name="app_mode_enduro_motorcycle">Enduro</string>
     <string name="app_mode_motor_scooter">Scooter</string>
     <string name="app_mode_wheelchair">Cadeira de rodas</string>
@@ -3809,11 +3808,11 @@ Lon %2$s</string>
     <string name="start_finish_icons">Iconas de inicio e fin</string>
     <string name="contour_lines_thanks">Grazas por mercar \'Curvas de nivel\'</string>
     <string name="osm_live_payment_desc_hw">A subscrición é cobrada por período escollido. Cancélaa na AppGallery en calquera intre.</string>
-    <string name="osm_live_payment_subscription_management_hw">O pagamento será cargado na túa conta da AppGallery no mesmo intre da confirmación da compra.
+    <string name="osm_live_payment_subscription_management_hw">O pagamento será cobrado á túa conta do AppGallery ao confirmar a compra.
 \n
-\nA subscrición é renovada de xeito automático a menos que sexa cancelada antes da data de renovación. A túa conta será cargada polo período de renovación (mes/trimestre/ano) só na data de renovación.
+\nA subscrición é renovada de xeito automático a menos que se cancele antes da data de renovación. A conta será cobrada polo período de renovación (mes/trimestre/ano) só na data de renovación.
 \n
-\nPodes xestionar e cancelar as túas subscricións indo ós axustes da AppGallery.</string>
+\nPodes administrar e desbotar as subscricións nos axustes do AppGallery.</string>
     <string name="routing_attr_avoid_footways_description">Evitar sendas peonís, camiños e beirarrúas</string>
     <string name="routing_attr_avoid_footways_name">Evitar sendas peonís</string>
     <string name="development">Desenvolvemento</string>
@@ -4001,4 +4000,58 @@ Lon %2$s</string>
     <string name="open_place_reviews">OpenPlaceReviews</string>
     <string name="opr_use_dev_url">Empregar test.openplacereviews.org</string>
     <string name="login_open_place_reviews">Iniciar sesión ao OpenPlaceReviews</string>
+    <string name="snap_to_road_descr">A icona da localización actual será axustada á ruta de navegación actual</string>
+    <string name="map_orientation_threshold_descr">Non xirar a vista do mapa se a velocidade é inferior a un limiar</string>
+    <string name="restart">Reiniciar</string>
+    <string name="shared_strings_all_regions">Todas as rexións</string>
+    <string name="delete_number_files_question">Eliminar %1$d ficheiros\?</string>
+    <string name="track_recording_stop_without_saving">Deter ser gardar</string>
+    <string name="track_recording_save_and_stop">Gardar e deter a gravación</string>
+    <string name="track_recording_title">Gravación da pista detida</string>
+    <string name="track_recording_description">Deixar de gravar\?
+\nTodos os datos non gardados serán perdidos.</string>
+    <string name="on_pause">Detido</string>
+    <string name="app_restart_required">É necesario reiniciar a aplicación para aplicar algúns axustes.</string>
+    <string name="routing_attr_height_obstacles_description">A ruta podería evitar as fortes pendentes.</string>
+    <string name="quick_action_coordinates_widget_descr">Trocar para amosar ou agochar o trebello de coordenadas no mapa.</string>
+    <string name="map_widget_distance_by_tap">Distancia ao premer</string>
+    <string name="latest_openstreetmap_update">Última actualización do OpenStreetMap dispoñíbel:</string>
+    <string name="updated">Actualizado: %s</string>
+    <string name="last_time_checked">Última comprobación: %s</string>
+    <string name="update_frequency">Frecuencia de actualización</string>
+    <string name="live_update_frequency_week_variant">As actualizacións do mapa serán comprobadas cada semana. A seguinte vez %1$s en %2$s.</string>
+    <string name="live_update_frequency_day_variant">As actualizacións do mapa serán comprobadas cada día. A seguinte vez %1$s en %2$s.</string>
+    <string name="delete_updates">Eliminar actualizacións</string>
+    <string name="live_update_delete_updates_msg">Eliminar todas as actualizacións ao vivo de %s\?</string>
+    <string name="purchases">Compras</string>
+    <string name="select_category_descr">Escolle categoría ou engade unha nova</string>
+    <string name="track_recording_will_be_continued">A gravación continuará.</string>
+    <string name="copy_poi_name">Copiar nome do PDI</string>
+    <string name="quick_action_show_hide_title">Amosar/Agochar</string>
+    <string name="shared_string_interval">Intre</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Espazos naturais</string>
+    <string name="track_has_no_altitude">A pista non contén datos de altitude.</string>
+    <string name="track_has_no_speed">A pista non contén datos de velocidade.</string>
+    <string name="select_another_colorization">Escolle outro tipo de cor.</string>
+    <string name="live_update_frequency_hour_variant">As actualizacións de mapas serán comprobadas cada hora. A seguinte vez %1$s en %2$s.</string>
+    <string name="select_segments">Escoller segmentos</string>
+    <string name="select_segments_description">%1$s contén máis dun segmento, precisas selecionar a parte necesaria para a navegación.</string>
+    <string name="segments_count">Segmento %1$d</string>
+    <string name="activity_type_water_name">Auga</string>
+    <string name="activity_type_winter_name">Inverno</string>
+    <string name="activity_type_snowmobile_name">Motoneve</string>
+    <string name="activity_type_riding_name">Equitación</string>
+    <string name="activity_type_racing_name">Carreira</string>
+    <string name="activity_type_mountainbike_name">Bicicleta de montaña</string>
+    <string name="activity_type_cycling_name">Bicicleta</string>
+    <string name="activity_type_hiking_name">Sendeirismo</string>
+    <string name="activity_type_running_name">Correndo</string>
+    <string name="activity_type_walking_name">A pé</string>
+    <string name="activity_type_offroad_name">Todo terreo</string>
+    <string name="activity_type_motorbike_name">Motocicleta</string>
+    <string name="activity_type_car_name">Automóbil</string>
+    <string name="temporary_conditional_routing_descr">Empregar as restricións de estrada que están activas agora no mapa</string>
+    <string name="routing_attr_short_way_description">Ruta optimizada máis curta (baixo consumo)</string>
+    <string name="routing_attr_driving_style_description">Escolle o propósito da condución para obter unha ruta máis curta, máis rápida ou máis segura</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Agochar reservas naturais, áreas protexidas e de parques nacionais</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3889,4 +3889,7 @@
     <string name="poi_piste_status_open">Pálya állapota: nyitva</string>
     <string name="poi_piste_name">Pálya neve</string>
     <string name="poi_piste_ski_jump">Síugrósánc</string>
+    <string name="poi_local_ref">Vágány / kocsiállás</string>
+    <string name="poi_geodesist">Földmérő</string>
+    <string name="poi_conference_centre">Konferencia-központ</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -1161,7 +1161,7 @@
     <string name="index_name_italy">Európa – Olaszország</string>
     <string name="index_name_gb">Európa – Nagy-Britannia</string>
     <string name="calculate_osmand_route_without_internet">OsmAnd útvonalszakasz számítása offline</string>
-    <string name="gpx_option_calculate_first_last_segment">OsmAnd útvonal számítása az első és utolsó útszakaszra</string>
+    <string name="gpx_option_calculate_first_last_segment">OsmAnd útvonal számítása az első és az utolsó útszakaszra</string>
     <string name="always_center_position_on_map">Pozíció megjelenítése mindig középen</string>
     <string name="voice_pref_title">Hang</string>
     <string name="misc_pref_title">Egyebek</string>
@@ -1366,7 +1366,7 @@
     <string name="navigate_point_zone">Zóna</string>
     <string name="download_tab_updates">Frissítések</string>
     <string name="download_tab_downloads">Letöltés</string>
-    <string name="download_tab_local">Helyi</string>
+    <string name="download_tab_local">Telepítve</string>
     <string name="no_internet_connection">A letöltés nem lehetséges, ellenőrizze az internetkapcsolatot.</string>
     <string name="shared_string_dismiss">Bezárás</string>
     <string name="everything_up_to_date">Minden fájl naprakész</string>
@@ -1396,7 +1396,7 @@
     <string name="settings_privacy">Adatvédelem</string>
     <string name="shared_string_gpx_points">Pontok</string>
     <string name="shared_string_my_location">Saját pozícióm</string>
-    <string name="navigation_over_track">Elindítod a navigációt a nyomvonal mentén?</string>
+    <string name="navigation_over_track">Elindítja a navigációt a nyomvonal mentén\?</string>
     <string name="avoid_roads_msg">Elkerülendő utak kijelölésével aktiválhat alternatív útvonalakat</string>
     <string name="enable_proxy_title">HTTP proxy engedélyezése</string>
     <string name="enable_proxy_descr">HTTP proxy beállítása minden hálózati kéréshez.</string>
@@ -1430,7 +1430,7 @@
     <string name="share_note">Jegyzet megosztása</string>
     <string name="shared_string_export">Exportálás</string>
     <string name="plugin_touringview_name">Turistatérkép-nézet</string>
-    <string name="track_segments">Nyomvonal szakaszok</string>
+    <string name="track_segments">Nyomvonalszakaszok</string>
     <string name="track_points">Nyomvonal pontok</string>
     <string name="shared_string_selected">Kijelölve</string>
     <string name="rename_failed">Az átnevezés nem sikerült.</string>
@@ -2164,11 +2164,10 @@
     <string name="shared_string_time">Idő</string>
     <string name="total_distance">Teljes táv</string>
     <string name="routing_attr_height_obstacles_name">Magasságadatok használata</string>
-
     <string name="rendering_attr_depthContours_description">Mélységvonalak és pontok megjelenítése.</string>
     <string name="rendering_attr_depthContours_name">Tengeri mélységvonalak</string>
     <string name="auto_split_recording_title">Felvételek automatikus szétvágása szünet után</string>
-    <string name="auto_split_recording_descr">Új szakasz kezdése 6 perc szünet után, új nyomvonal 2 óra szünet után, vagy új fájl hosszabb szünet után ha a dátum megváltozott.</string>
+    <string name="auto_split_recording_descr">Új szakasz kezdése 6 perc szünet után, új nyomvonal 2 óra szünet után vagy új fájl hosszabb szünet után ha a dátum megváltozott.</string>
     <string name="max_speed">Maximum sebesség</string>
     <string name="average_speed">Átlagsebesség</string>
     <string name="shared_string_time_moving">Mozgásban töltött idő</string>
@@ -2313,7 +2312,7 @@
     <string name="mapillary_menu_descr_username">Csak az általa hozzáadott képek megtekintése:</string>
     <string name="mapillary_menu_title_username">Felhasználónév</string>
     <string name="mapillary_menu_filter_description">A képek szűrése feltöltő, dátum vagy típus szerint. Csak magas nagyítási szinteknél lépnek érvénybe.</string>
-    <string name="map_widget_ruler_control">Sugaras vonalzó</string>
+    <string name="map_widget_ruler_control">Sugárirányú vonalzó</string>
     <string name="average">Átlag</string>
     <string name="of">%1$d / %2$d</string>
     <string name="ascent_descent">Emelkedő/Lejtő</string>
@@ -2914,8 +2913,8 @@
     <string name="osmand_routing_promo">Az ..osmand/routing mappában hozzáadhatja a routing.xml fájl saját módosított verzióját</string>
     <string name="app_mode_skiing">Síelés</string>
     <string name="base_profile_descr_ski">Síelés</string>
-    <string name="show_compass_ruler">Iránytűvonalzó megjelenítése</string>
-    <string name="hide_compass_ruler">Iránytűvonalzó elrejtése</string>
+    <string name="show_compass_ruler">Iránytű megjelenítése</string>
+    <string name="hide_compass_ruler">Iránytű elrejtése</string>
     <string name="select_icon_profile_dialog_title">Ikon kijelölése</string>
     <string name="settings_routing_mode_string">Mód: %s</string>
     <string name="settings_derived_routing_mode_string">Felhasználói mód, eredete: %s</string>
@@ -3202,7 +3201,7 @@
     <string name="added_profiles_descr">Bővítmény által hozzáadott profilok</string>
     <string name="shared_string_turn_off">Kikapcsolás</string>
     <string name="new_plugin_added">Új bővítmény hozzáadva</string>
-    <string name="join_segments">Szegmensek összekapcsolása</string>
+    <string name="join_segments">Szakaszok egyesítése</string>
     <string name="save_heading">Irány belefoglalása</string>
     <string name="save_heading_descr">Felvételkor az egyes útpontok irányát is menti.</string>
     <string name="select_navigation_icon">Pozíció ikon haladás közben</string>
@@ -3479,7 +3478,7 @@
     <string name="tracker_item">OsmAnd helymegosztás</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
     <string name="quick_action_item">Gyorsművelet</string>
-    <string name="radius_ruler_item">Sugaras vonalzó</string>
+    <string name="radius_ruler_item">Sugárirányú vonalzó</string>
     <string name="measure_distance_item">Távolságmérés</string>
     <string name="travel_item">Utazás (Wikivoyage és Wikipédia)</string>
     <string name="map_markers_item">Térképjelölők</string>
@@ -3716,7 +3715,7 @@
     <string name="save_track_to_gpx">Nyomvonal automatikus felvétele navigáció közben</string>
     <string name="monitoring_min_speed_descr_side_effect">Mellékhatás: A nyomvonalból hiányozni fog minden olyan szakasz, ahol a legkisebb sebesség feltétele nem teljesült (pl. egy meredek dombra tolja fel a kerékpárt). Nem lesz információ az állásokról sem, például a pihenőkről. Ez hatással van minden elemzésre és utófeldolgozásra, például amikor megpróbálja meghatározni az utazás teljes hosszát, a mozgásban töltött időt vagy az átlagsebességét.</string>
     <string name="one_point_error">Adjon hozzá legalább két pontot.</string>
-    <string name="attach_to_the_roads">Csatolás az utakhoz</string>
+    <string name="attach_to_the_roads">Utakhoz igazítás</string>
     <string name="marker_save_as_track">Mentés nyomvonalfájlként</string>
     <string name="select_another_track">Másik nyomvonal kiválasztása</string>
     <string name="open_saved_track">Elmentett nyomvonal megnyitása</string>
@@ -3888,7 +3887,7 @@
     <string name="app_mode_light_aircraft">Könnyű légi jármű</string>
     <string name="plan_route_split_before">Elvágás előtte</string>
     <string name="plan_route_split_after">Elvágás utána</string>
-    <string name="plan_route_join_segments">Szakaszok egyesítése</string>
+    <string name="plan_route_join_segments">Szakaszok összekapcsolása</string>
     <string name="plan_route_add_new_segment">Új szakasz hozzáadása</string>
     <string name="release_3_9">• Lehetőség az összes adat exportálására és importálására, beleértve a beállításokat, erőforrásokat és a saját helyeket is
 \n
@@ -3999,4 +3998,45 @@
     <string name="activity_type_offroad_name">Terepjáró</string>
     <string name="activity_type_motorbike_name">Motorkerékpár</string>
     <string name="activity_type_car_name">Személyautó</string>
+    <string name="map_widget_distance_by_tap">Távolságmérés koppintással</string>
+    <string name="shared_string_interval">Intervallum</string>
+    <string name="update_frequency">Frissítés gyakorisága</string>
+    <string name="updated">Frissítésve: %s</string>
+    <string name="last_time_checked">Legutóbb ellenőrizve: %s</string>
+    <string name="latest_openstreetmap_update">Legutóbbi elérhető OpenStreetMap-frissítés:</string>
+    <string name="quick_action_coordinates_widget_descr">A térképen lévő koordináta-widgetet megjelenítő vagy elrejtő kapcsoló.</string>
+    <string name="routing_attr_height_obstacles_description">Az útvonaltervezés elkerülhetné a meredek emelkedőket.</string>
+    <string name="app_restart_required">Egyes beállítások alkalmazásához újra kell indítani az alkalmazást.</string>
+    <string name="on_pause">Szüneteltetve</string>
+    <string name="track_recording_description">Biztosan megszakítja a felvételt\?
+\nMinden el nem mentett adat el fog veszni.</string>
+    <string name="track_recording_title">Nyomvonal felvétele leállítva</string>
+    <string name="track_recording_save_and_stop">Mentés és felvétel leállítása</string>
+    <string name="track_recording_stop_without_saving">Leállítás mentés nélkül</string>
+    <string name="delete_number_files_question">Töröl %1$d fájlt\?</string>
+    <string name="shared_strings_all_regions">Az összes régió</string>
+    <string name="restart">Újraindítás</string>
+    <string name="map_orientation_threshold_descr">Küszöbérték alatti sebességnél ne forogjon a térkép</string>
+    <string name="snap_to_road_descr">A jelenlegi helyet jelző ikon bepattan az aktuális navigációs útvonalba</string>
+    <string name="routing_attr_driving_style_description">Vezetési mód kiválasztása rövidebb, gyorsabb vagy biztonságosabb útvonal tervezéséhez</string>
+    <string name="routing_attr_short_way_description">Optimalizált rövidebb útvonal (energiamegtakarítás)</string>
+    <string name="temporary_conditional_routing_descr">A térképen jelenleg aktív forgalomkorlátozások figyelembe vétele</string>
+    <string name="segments_count">%1$d szakasz</string>
+    <string name="select_segments_description">%1$s több szakaszt is tartalmaz. Válassza ki a navigációhoz szükséges részt.</string>
+    <string name="select_segments">Szakaszok kijelölése</string>
+    <string name="delete_updates">Frissítések törlése</string>
+    <string name="live_update_delete_updates_msg">Biztosan törölni szeretné az összes (%s) élő frissítést\?</string>
+    <string name="purchases">Vásárlások</string>
+    <string name="select_category_descr">Kategória kiválasztása vagy új hozzáadása</string>
+    <string name="track_recording_will_be_continued">A felvétel folytatódni fog.</string>
+    <string name="copy_poi_name">Érdekes pont nevének másolása</string>
+    <string name="quick_action_show_hide_title">Megjelenítés / elrejtés</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Természetvédelmi területek, védett területek és nemzeti parkok határainak elrejtése</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Természetvédelmi területek határai</string>
+    <string name="track_has_no_altitude">A nyomvonal nem tartalmaz magassági adatokat.</string>
+    <string name="track_has_no_speed">A nyomvonal nem tartalmaz sebességadatokat.</string>
+    <string name="select_another_colorization">Kérjük, válasszon másik színezést.</string>
+    <string name="live_update_frequency_week_variant">Az alkalmazás hetente ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
+    <string name="live_update_frequency_day_variant">Az alkalmazás naponta ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
+    <string name="live_update_frequency_hour_variant">Az alkalmazás óránként ellenőrzi a térképfrissítéseket. Következő ellenőrzés: %1$s (ennyi idő múlva: %2$s).</string>
 </resources>

OsmAnd/res/values-is/phrases.xml

@@ -3891,4 +3891,7 @@
     <string name="poi_gladed_yes">Skafið: já</string>
     <string name="poi_piste_name">Heiti brautar</string>
     <string name="poi_piste_ski_jump">Skíðastökk</string>
+    <string name="poi_local_ref">Staðvær tilvísun</string>
+    <string name="poi_conference_centre">Ráðstefnumiðstöð</string>
+    <string name="poi_geodesist">Landmælingar</string>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -1990,7 +1990,6 @@
     <string name="fonts_header">Letur fyrir kort</string>
     <string name="right_side_navigation">Ekið á hægri akrein</string>
     <string name="driving_region_automatic">Sjálfvirkt</string>
-
     <string name="auto_split_recording_title">Skipta skráningu sjálfvirkt eftir bil</string>
     <string name="incremental_search_city">Stigvaxandi leit í borg</string>
     <string name="rendering_attr_showRoadMaps_description">Veldu þegar birta á kort einungis með vegum:</string>
@@ -3684,7 +3683,7 @@
     <string name="route_between_points">Leið milli punkta</string>
     <string name="next_segment">Næsti bútur</string>
     <string name="search_download_wikipedia_maps">Sækja Wikipedia-kort</string>
-    <string name="street_level_imagery">Götumyndir</string>
+    <string name="street_level_imagery">Myndefni í götuhæð</string>
     <string name="routing_attr_length_name">Takmörk á lengd</string>
     <string name="plan_a_route">Skipuleggja leið</string>
     <string name="save_as_new_track">Vista sem nýjan feril</string>
@@ -4005,4 +4004,50 @@
     <string name="activity_type_offroad_name">Utanvegaakstur</string>
     <string name="activity_type_motorbike_name">Vélhjól</string>
     <string name="activity_type_car_name">Akandi</string>
+    <string name="routing_attr_height_obstacles_description">Leiðagerð gæti forðast miklar brekkur upp í mót.</string>
+    <string name="select_category_descr">Veldu flokk eða bættu við nýjum</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews er samfélagsdrifið verkefni um opinbera staði eins og veitingastaði, hótel, söfn og ýmsa merkisstaði. Það safnar saman um þetta öllum opinberum upplýsingum á borð við ljósmyndir, umsagnir, tenglum í aðrar veitur eins og OpenStreetMap, Wikipedia, o.fl..
+\n
+\nÖll gögn OpenPlaceReview eru opin og öllum aðgengileg: http://openplacereviews.org/data.
+\n
+\nÞú getur lesið meira um verkefnið hér: http://openplacereviews.org</string>
+    <string name="map_widget_distance_by_tap">Vegalengd með því að ýta</string>
+    <string name="select_segments_description">%1$s inniheldur meira en einn bút, þú þarft að velja þann sem er nauðsynlegur fyrir leiðsögnina.</string>
+    <string name="routing_attr_driving_style_description">Veldu tilgang aksturs til að fá styttri, hraðari eða öruggari leið</string>
+    <string name="snap_to_road_descr">Táknið fyrir núverandi staðsetningu mun grípa í leiðina sem leiðsögn fylgir</string>
+    <string name="map_orientation_threshold_descr">Ekki snúa ásýnd á kortið ef hraði fer niður fyrir ákveðin mörk</string>
+    <string name="quick_action_coordinates_widget_descr">Víxlnappur til að birta eða fela hnitaglugga á kortinu.</string>
+    <string name="select_segments">Veldu búta</string>
+    <string name="segments_count">Bútur %1$d</string>
+    <string name="temporary_conditional_routing_descr">Nota vegtakmarkanir sem núna eru virkar á kortinu</string>
+    <string name="routing_attr_short_way_description">Bestuð styttri leið (orkusparandi)</string>
+    <string name="restart">Endurræsa</string>
+    <string name="shared_strings_all_regions">Öll svæði</string>
+    <string name="delete_number_files_question">Eyða %1$d skrám\?</string>
+    <string name="track_recording_stop_without_saving">Stöðva án þess að vista</string>
+    <string name="track_recording_save_and_stop">Vista og stöðva upptöku</string>
+    <string name="track_recording_title">Upptaka ferils stöðvuð</string>
+    <string name="track_recording_description">Ertu viss um að þú viljir stöðva þessa upptöku\?
+\nÖll óvistuð gögn munu tapast.</string>
+    <string name="on_pause">Við bið</string>
+    <string name="app_restart_required">Endurræsingar forrits er krafist til að virkja sumar stillingar.</string>
+    <string name="latest_openstreetmap_update">Síðasta tiltæka uppfærsla OpenStreetMap:</string>
+    <string name="updated">Uppfært: %s</string>
+    <string name="last_time_checked">Síðast athugað: %s</string>
+    <string name="update_frequency">Uppfærslutíðni</string>
+    <string name="live_update_frequency_week_variant">Uppfærslur korta verða athugaðar í hverri viku. Næsta skipti %1$s eftir %2$s.</string>
+    <string name="live_update_frequency_day_variant">Uppfærslur korta verða athugaðar á hverjum degi. Næsta skipti %1$s eftir %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Uppfærslur korta verða athugaðar á klukkustundar fresti. Næsta skipti %1$s eftir %2$s.</string>
+    <string name="delete_updates">Eyða uppfærslum</string>
+    <string name="live_update_delete_updates_msg">Ertu viss um að þú viljir eyða öllum %s raunuppfærslum\?</string>
+    <string name="purchases">Innkaup</string>
+    <string name="track_recording_will_be_continued">Upptökunni verður haldið áfram.</string>
+    <string name="copy_poi_name">Afrita heiti POI-merkisstaðar</string>
+    <string name="quick_action_show_hide_title">Birta/Fela</string>
+    <string name="shared_string_interval">Millibil</string>
+    <string name="track_has_no_altitude">Ferillinn inniheldur ekki hæðargögn.</string>
+    <string name="track_has_no_speed">Ferillinn inniheldur ekki hraðagögn.</string>
+    <string name="select_another_colorization">Veldu aðra tegund litunar.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Fela mörk friðlanda, verndaðra svæða og þjóðgarða</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Mörk náttúru</string>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -2705,7 +2705,6 @@
 \n ניתן לקבל נווט אמין למדינה שלך - בין אם זו ישראל, צרפת, גרמניה, מקסיקו, אנגליה, ספרד, הולנד, ארה״ב, רוסיה, ברזיל או כל מדינה אחרת.</string>
     <string name="nm">מייל ימי</string>
     <string name="rendering_attr_hikingRoutesOSMC_description">עיבוד מסלולים לפי עקבות OSMC.</string>
-
     <string name="plugin_nautical_descr">תוסף זה מעשיר את המפה ואת הניווט של יישומון OsmAnd ומאפשר לייצר מפות ימיות לחתירה, הפלגה וסוגים נוספים של ספורט ימי. 
 \n
 \nתוסף מפה מיוחד ל־OsmAnd יספק את כל סימוני הניווט הימיים והסימנים הימיים המוסכמים, לניווט במקווי מים פנימיים לרבות ניווט באזורים הקרובים לחוף. התיאור של כל סימון ניווט מספק את הפרטים הנדרשים כדי לזהות אותם ואת המשמעות שלהם (קטגוריה, צורה, צבע, רצף, הפניה וכו׳). 
@@ -4008,4 +4007,44 @@
     <string name="activity_type_offroad_name">שטח</string>
     <string name="activity_type_motorbike_name">אופנוע</string>
     <string name="activity_type_car_name">מכונית</string>
+    <string name="updated">עדכון: %s</string>
+    <string name="last_time_checked">מועד הבדיקה האחרונה: %s</string>
+    <string name="update_frequency">תדירות עדכון</string>
+    <string name="live_update_frequency_week_variant">בכל שבוע יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
+    <string name="live_update_frequency_day_variant">בכל יום יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
+    <string name="live_update_frequency_hour_variant">בכל שעה יתבצע חיפוש לעדכוני מפה. הפעם הבאה %1$s ב־%2$s.</string>
+    <string name="delete_updates">מחיקת עדכונים</string>
+    <string name="purchases">רכישות</string>
+    <string name="select_category_descr">נא לבחור קטגוריה או להוסיף אחת חדשה</string>
+    <string name="track_recording_will_be_continued">ההקלטה תמשיך.</string>
+    <string name="copy_poi_name">העתק שם הנ״ע</string>
+    <string name="quick_action_show_hide_title">הצגה/הסתרה</string>
+    <string name="shared_string_interval">הפרש</string>
+    <string name="track_has_no_altitude">המסלול אינו מכיל נתוני גובה.</string>
+    <string name="track_has_no_speed">המסלול אינו מכיל מהירות גבוהה.</string>
+    <string name="select_another_colorization">נא לבחור סוג אחר של צביעה.</string>
+    <string name="restart">הפעלה מחדש</string>
+    <string name="shared_strings_all_regions">כל האזורים</string>
+    <string name="delete_number_files_question">למחוק %1$d קבצים\?</string>
+    <string name="track_recording_stop_without_saving">לעצור בלי לשמור</string>
+    <string name="track_recording_save_and_stop">לשמור ולעצור את ההקלטה</string>
+    <string name="track_recording_title">הקלטת המסלול נעצרה</string>
+    <string name="track_recording_description">לעצור את ההקלטה\?
+\nכל הנתונים שלא יישמרו יאבדו.</string>
+    <string name="select_segments">נא לבחור מקטעים</string>
+    <string name="select_segments_description">%1$s מכיל יותר ממקטע אחד, עליך לבחור את החלקים הנחוצים לניווט.</string>
+    <string name="segments_count">מקטע %1$d</string>
+    <string name="temporary_conditional_routing_descr">להשתמש במגבלות הגביש שפעילות כעת על המפה</string>
+    <string name="routing_attr_short_way_description">מסלול מקוצר מרחק (לחסכון באנרגיה)</string>
+    <string name="routing_attr_driving_style_description">נא לבחור מטרת נסיעה כדי לקבל מסלול מהיר או בטוח יותר</string>
+    <string name="snap_to_road_descr">סמל המיקום הנוכחי יוצמד למסלול הניווט הנוכחי</string>
+    <string name="map_orientation_threshold_descr">לא לסובב את המפה אם המהירות קטנה מסף מסוים</string>
+    <string name="on_pause">בהשהיה</string>
+    <string name="app_restart_required">צריך להפעיל את היישומון מחדש כדי שכמה מהשינויים יחולו.</string>
+    <string name="routing_attr_height_obstacles_description">הרכבת המסלול יכולה להימנע מעליות תלולות.</string>
+    <string name="quick_action_coordinates_widget_descr">מפסק להצגה או הסתרה של וידג׳ט נקודות הציון במפה.</string>
+    <string name="map_widget_distance_by_tap">מרחק בנגיעה</string>
+    <string name="latest_openstreetmap_update">קיים עדכון ל־OpenStreetMap:</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">להסתיר גבולות של שמורות טבע, אזורים מוגנים ופארקים ציבוריים</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">גבולות טבעיים</string>
 </resources>

OsmAnd/res/values-ja/strings.xml

@@ -2084,7 +2084,6 @@ POIの更新は利用できません</string>
     <string name="shared_string_time">時間</string>
     <string name="total_distance">総走行距離</string>
     <string name="routing_attr_height_obstacles_name">標高データを使用</string>
-
     <string name="rendering_attr_hideWaterPolygons_description">水域</string>
     <string name="rendering_attr_hideWaterPolygons_name">水域ポリゴン</string>
     <string name="wiki_around">近隣のWikipedia記事</string>
@@ -2133,14 +2132,14 @@ POIの更新は利用できません</string>
     <string name="quick_action_take_photo_note_descr">画面中央に写真メモを追加するボタンです。</string>
     <string name="quick_action_add_osm_bug_descr">画面中央にOSMメモを追加するボタンです。</string>
     <string name="quick_action_add_poi_descr">画面中央にPOIを追加できるボタンです。</string>
-    <string name="quick_action_navigation_voice_descr">ナビゲーション中の案内音声の有効無効を切り替えることが出来ます。</string>
+    <string name="quick_action_navigation_voice_descr">ナビゲーション中の案内音声の有効/無効を切り替えます。</string>
     <string name="quick_action_add_parking_descr">画面中央に駐車場所を追加するボタンです。</string>
     <string name="quick_action_interim_dialog">実行時に入力画面を表示</string>
     <string name="favorite_empty_place_name">場所</string>
     <string name="quick_action_duplicates">重複を避けるためにクイックアクション名は[%1$s]に変更されました。</string>
     <string name="quick_action_duplicate">クイックアクション名の重複</string>
-    <string name="quick_action_showhide_favorites_descr">マップ画面でのお気に入り地点の表示/非表示の切替が出来ます。</string>
-    <string name="quick_action_showhide_poi_descr">マップ画面でのPOIの表示/非表示の切替が出来ます。</string>
+    <string name="quick_action_showhide_favorites_descr">マップ画面でのお気に入り地点の表示/非表示を切り替えます。</string>
+    <string name="quick_action_showhide_poi_descr">マップ画面でのPOIの表示/非表示を切り替えます。</string>
     <string name="quick_action_poi_show">%1$sを表示</string>
     <string name="quick_action_poi_hide">%1$sを非表示</string>
     <string name="quick_action_add_category">カテゴリーを追加</string>
@@ -2546,7 +2545,7 @@ POIの更新は利用できません</string>
     <string name="by_type">種類別</string>
     <string name="digits_quantity">小数点以下の桁数</string>
     <string name="go_to_next_field">次の入力項目へ移動</string>
-    <string name="tap_on_map_to_hide_interface_descr">マップ画面のタップで操作ボタンやウィジェットの表示と交互に切り替えます。</string>
+    <string name="tap_on_map_to_hide_interface_descr">マップ画面のタップで操作ボタンやウィジェットの表示を切り替えます。</string>
     <string name="tap_on_map_to_hide_interface">フルスクリーンモード</string>
     <string name="live_monitoring_max_interval_to_send">オンライン追跡用のバッファ指定</string>
     <string name="live_monitoring_max_interval_to_send_desrc">送信用現在地データをネット接続せずにどのくらいの時間記録するか、バッファを指定します</string>
@@ -2829,7 +2828,7 @@ POIの更新は利用できません</string>
     <string name="osm_recipient_stat">編集 %1$s, 合計 %2$s mBTC</string>
     <string name="shared_string_launch">起動</string>
     <string name="lang_gn_py">グアラニー語</string>
-    <string name="quick_action_switch_day_night_descr">OsmAndマップ表示の昼/夜モードを切り替えることが出来ます。</string>
+    <string name="quick_action_switch_day_night_descr">OsmAndマップ表示の昼/夜モードを切り替えます。</string>
     <string name="quick_action_switch_day_mode">昼モード</string>
     <string name="quick_action_switch_night_mode">夜モード</string>
     <string name="quick_action_day_night_switch_mode">昼/夜モードの切り替え</string>
@@ -3715,7 +3714,7 @@ POIの更新は利用できません</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_descr">マップ上の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>
@@ -3849,4 +3848,106 @@ POIの更新は利用できません</string>
 \nグラフは再計算後に利用できるようになります。</string>
     <string name="use_dev_url_descr">OSM通知/ POI / GPXのアップロードをテストする場合、openstreetmap.orgではなくdev.openstreetmap.orgを使用するよう切り替えます。</string>
     <string name="use_dev_url">dev.openstreetmap.orgを使用</string>
+    <string name="announcement_time_prepare">次々回案内(中距離)</string>
+    <string name="announcement_time_prepare_long">次回案内(長距離)</string>
+    <string name="shared_string_sec">秒</string>
+    <string name="announcement_time_passing">通過する</string>
+    <string name="announcement_time_approach">目標に接近</string>
+    <string name="shared_string_turn">方向転換</string>
+    <string name="announcement_time_off_route">ルートからの逸脱</string>
+    <string name="announcement_time_arrive">目的地に到着</string>
+    <string name="announcement_time_intervals">タイミングと距離の間隔</string>
+    <string name="announcement_time_title">案内タイミング</string>
+    <string name="announcement_time_descr">音声による案内タイミングは、音声形式、現在のナビゲーション速度、および標準のナビゲーション速度によって異なります。</string>
+    <string name="start_recording">記録の開始</string>
+    <string name="show_track_on_map">マップ上に経路を表示</string>
+    <string name="routing_engine_vehicle_type_wheelchair">車椅子</string>
+    <string name="routing_engine_vehicle_type_hiking">ハイキング</string>
+    <string name="routing_engine_vehicle_type_walking">徒歩</string>
+    <string name="routing_engine_vehicle_type_cycling_electric">電動自転車</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">山岳(MTB)サイクリング</string>
+    <string name="routing_engine_vehicle_type_cycling_road">ロードサイクリング</string>
+    <string name="routing_engine_vehicle_type_cycling_regular">一般的なサイクリング</string>
+    <string name="routing_engine_vehicle_type_hgv">重量物運搬車</string>
+    <string name="routing_engine_vehicle_type_small_truck">小型トラック</string>
+    <string name="routing_engine_vehicle_type_truck">トラック</string>
+    <string name="routing_engine_vehicle_type_scooter">スクーター</string>
+    <string name="routing_engine_vehicle_type_racingbike">レーシングバイク</string>
+    <string name="routing_engine_vehicle_type_mtb">マウンテンバイク</string>
+    <string name="message_server_error">サーバーエラー: %1$s</string>
+    <string name="message_name_is_already_exists">この名前はすでに存在します</string>
+    <string name="delete_online_routing_engine">このオンラインルーティングエンジンを削除しますか？</string>
+    <string name="context_menu_read_full">全文を読む</string>
+    <string name="context_menu_edit_descr">説明の編集</string>
+    <string name="delete_waypoints">経由地点を削除</string>
+    <string name="copy_to_map_markers">マップマーカーにコピー</string>
+    <string name="copy_to_map_favorites">お気に入りにコピー</string>
+    <string name="upload_photo">アップロード中</string>
+    <string name="upload_photo_completed">アップロードが完了しました</string>
+    <string name="uploading_count">%2$d個中%1$d個をアップロード中</string>
+    <string name="select_segments">セグメントの選択</string>
+    <string name="select_segments_description">%1$sには複数のセグメントが含まれているため、ナビゲーションに必要な部分を選択する必要があります。</string>
+    <string name="segments_count">%1$dセグメント</string>
+    <string name="uploaded_count">%2$d個中%1$d個をアップロードしました</string>
+    <string name="toast_select_edits_for_upload">アップロードする編集を選択</string>
+    <string name="hillshade_slope_contour_lines">陰影起伏図 / 勾配 / 等高線</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviewsは、レストラン、ホテル、美術館、中途経由地点などの公共の場所に関するコミュニティが運営するプロジェクトです。写真、レビュー、他のシステムへのリンク、OpenStreetMap、Wikipediaへのリンクなど、それらに関するすべての公開情報を収集しています。
+\n
+\nOpenPlaceReviewデータは全て公開されており、誰でもアクセス可能です。http://openplacereviews.org/data
+\n
+\n詳細については下記サイトをご覧ください。http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">test.openplacereviews.orgを使用</string>
+    <string name="login_open_place_reviews">OpenPlaceReviewsにログイン</string>
+    <string name="activity_type_water_name">水</string>
+    <string name="activity_type_winter_name">冬</string>
+    <string name="activity_type_snowmobile_name">スノーモービル</string>
+    <string name="activity_type_riding_name">乗馬</string>
+    <string name="activity_type_racing_name">レーシング</string>
+    <string name="activity_type_mountainbike_name">マウンテンバイク</string>
+    <string name="activity_type_cycling_name">自転車</string>
+    <string name="activity_type_hiking_name">ハイキング</string>
+    <string name="activity_type_running_name">ランニング</string>
+    <string name="activity_type_walking_name">徒歩</string>
+    <string name="activity_type_offroad_name">未舗装道路</string>
+    <string name="activity_type_motorbike_name">オートバイ</string>
+    <string name="routing_attr_short_way_description">最適化されたなるべく短いルート (省エネ)</string>
+    <string name="activity_type_car_name">車</string>
+    <string name="temporary_conditional_routing_descr">マップ上で現在有効になっている道路の制限を使用します</string>
+    <string name="routing_attr_driving_style_description">運転の目的を選択することで、より短くより速くより安全なルートを取得します</string>
+    <string name="snap_to_road_descr">現在地アイコンが現在のナビゲーションルートに保持されます</string>
+    <string name="map_orientation_threshold_descr">速度がしきい値未満の場合は、マップビューを回転させないでください</string>
+    <string name="restart">再起動</string>
+    <string name="shared_strings_all_regions">すべての地域</string>
+    <string name="delete_number_files_question">%1$d個のファイルを削除しますか？</string>
+    <string name="track_recording_stop_without_saving">保存せずに終了</string>
+    <string name="track_recording_description">記録を停止してもよろしいですか？
+\n保存しない場合データはすべて失われます。</string>
+    <string name="track_recording_save_and_stop">記録を保存して終了</string>
+    <string name="track_recording_title">記録を停止しました</string>
+    <string name="on_pause">一時停止中</string>
+    <string name="app_restart_required">一部の設定を適用するには、アプリケーションの再起動が必要です。</string>
+    <string name="routing_attr_height_obstacles_description">ルート検索時になるべく急な上り坂を回避するようにします。</string>
+    <string name="quick_action_coordinates_widget_descr">マップ上で座標ウィジェットの表示/非表示を切り替えます。</string>
+    <string name="map_widget_distance_by_tap">タップで距離</string>
+    <string name="latest_openstreetmap_update">利用可能な最新OpenStreetMapの更新:</string>
+    <string name="updated">更新: %s</string>
+    <string name="last_time_checked">最後にチェック時間: %s</string>
+    <string name="update_frequency">更新間隔</string>
+    <string name="live_update_frequency_week_variant">マップの更新は毎週チェックされます。次回は%2$sの%1$sです。</string>
+    <string name="live_update_frequency_day_variant">マップの更新は毎日チェックされます。次回は%2$sの%1$sです。</string>
+    <string name="live_update_frequency_hour_variant">マップの更新は1時間ごとにチェックされます。次回は%2$sの%1$sです。</string>
+    <string name="delete_updates">更新の削除</string>
+    <string name="live_update_delete_updates_msg">%sのライブアップデートをすべて削除してもよろしいですか？</string>
+    <string name="purchases">購入</string>
+    <string name="select_category_descr">カテゴリを選択するか、新しいカテゴリを追加します</string>
+    <string name="track_recording_will_be_continued">記録を継続します。</string>
+    <string name="copy_poi_name">POI名をコピー</string>
+    <string name="quick_action_show_hide_title">表示/非表示</string>
+    <string name="shared_string_interval">間隔</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">自然保護区、保護地域、国立公園の境界を非表示にします</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">自然保護区の境界</string>
+    <string name="track_has_no_altitude">経路には標高データは含まれていません。</string>
+    <string name="track_has_no_speed">経路には速度データは含まれていません。</string>
+    <string name="select_another_colorization">別タイプのカラーを選択してください。</string>
 </resources>

OsmAnd/res/values-nb/phrases.xml

@@ -1622,4 +1622,67 @@
     <string name="poi_video_telephone">Video</string>
     <string name="poi_volcano_status">Status</string>
     <string name="poi_volcano_type">Type</string>
+    <string name="poi_historic_civilization_greek_egyptian">Sivilisasjon: gresk-egyptisk (332 f.Kr. – 30 f.Kr.)</string>
+    <string name="poi_historic_civilization_ancient_egyptian">Sivilisasjon: Det gamle Egypt (inntil 332 f.Kr.)</string>
+    <string name="poi_historic_civilization_imperial_chinese">Sivilisasjon: Det kinesiske keiserriket (221 f.Kr. – 1911 e.Kr.)</string>
+    <string name="poi_historic_stone">Historisk stein</string>
+    <string name="poi_historic_era_neolithic">Historisk periode: neolittisk tid (yngre steinalder)</string>
+    <string name="poi_historic_era_mesolithic">Historisk periode: mesolittisk tid</string>
+    <string name="poi_historic_era_paleolithic">Historisk periode: paleolittisk tid (2,6 millioner – 10000 år før nåtid)</string>
+    <string name="poi_historic_period_ptolemaic_egypt">Historisk periode: Det ptolemeiske Egypt (305 f.Kr. – 30 f.Kr.)</string>
+    <string name="poi_historic_period_hellenistic_greece">Historisk periode: Det hellenistiske Hellas</string>
+    <string name="poi_historic_period_roman_republic">Historisk periode: Den romerske republikk (508 f.Kr. – 27 f.Kr.)</string>
+    <string name="poi_historic_civilization_ancient_roman">Sivilisasjon: Den romerske antikken (753 f.Kr. – 284 e.Kr.)</string>
+    <string name="poi_historic_period_iron_age">Historisk periode: jernalder</string>
+    <string name="poi_historic_period_archaic_greece">Historisk periode: Det arkaiske Hellas</string>
+    <string name="poi_historic_period_classical_greece">Historisk periode: Det klassiske Hellas (5. – 4. århundre f.Kr.)</string>
+    <string name="poi_historic_period_bronze_age">Historisk periode: bronsealder</string>
+    <string name="poi_historic_period_stone_bronze_undetermined">Historisk periode: steinalder / bronsealder (ubestemt)</string>
+    <string name="poi_historic_civilization_minoan">Sivilisasjon: minoisk</string>
+    <string name="poi_historic_civilization_western_roman">Sivilisasjon: vestromersk (285 – 476)</string>
+    <string name="poi_historic_civilization_celtic">Sivilisasjon: keltisk</string>
+    <string name="poi_historic_civilization_byzantine">Sivilisasjon: bysantinsk (285 – 1453)</string>
+    <string name="poi_historic_civilization_roman">Sivilisasjon: romersk</string>
+    <string name="poi_historic_civilization_ancient_greek">Sivilisasjon: Den greske antikken</string>
+    <string name="poi_historic_civilization_prehistoric">Sivilisasjon: forhistorisk tid</string>
+    <string name="poi_historic_manor">Historisk herregård</string>
+    <string name="poi_historic_yes">Historisk objekt</string>
+    <string name="poi_material_limestone">Materiale: kalkstein</string>
+    <string name="poi_material_granite_stone">Materiale: granittstein</string>
+    <string name="poi_material_sandstone">Materiale: sandstein</string>
+    <string name="poi_material_stone">Materiale: stein</string>
+    <string name="poi_social_facility_shelter">Husly</string>
+    <string name="poi_route_subway_ref">T-bane</string>
+    <string name="poi_route_ferry_ref">Ferge</string>
+    <string name="poi_route_bus_ref">Buss</string>
+    <string name="poi_surface_snow">Overflate: snø</string>
+    <string name="poi_surface_salt">Overflate: salt</string>
+    <string name="poi_surface_ice">Overflate: is</string>
+    <string name="poi_surface_mud">Overflate: gjørme</string>
+    <string name="poi_surface_dirt">Overflate: jord</string>
+    <string name="poi_surface_ground">Overflate: jord</string>
+    <string name="poi_surface_grass">Overflate: gress</string>
+    <string name="poi_surface_sand">Overflate: sand</string>
+    <string name="poi_surface_compacted">Overflate: komprimert</string>
+    <string name="poi_surface_fine_gravel">Overflate: fin grus</string>
+    <string name="poi_surface_gravel">Overflate: grus</string>
+    <string name="poi_surface_wood">Overflate: tre</string>
+    <string name="poi_surface_metal">Overflate: metall</string>
+    <string name="poi_surface_stone">Overflate: stein</string>
+    <string name="poi_surface_pebblestone">Overflate: rullestein (liten)</string>
+    <string name="poi_surface_paving_stones">Overflate: belegningsstein</string>
+    <string name="poi_surface_cobblestone">Overflate: kuppelstein</string>
+    <string name="poi_surface_sett">Overflate: brostein</string>
+    <string name="poi_surface_concrete">Overflate: betong</string>
+    <string name="poi_surface_asphalt">Overflate: asfalt</string>
+    <string name="poi_surface_paved">Overflate: fast dekke</string>
+    <string name="poi_surface_unpaved">Overflate: uten fast dekke</string>
+    <string name="poi_shelter_type_lean_to">Gapahuk</string>
+    <string name="poi_resource_stone">Stein</string>
+    <string name="poi_resource_sandstone">Sandstein</string>
+    <string name="poi_resource_limestone">Kalkstein</string>
+    <string name="poi_memorial_stone">Stein</string>
+    <string name="poi_barrier_entrance">Passasje i en mur eller et gjerde</string>
+    <string name="poi_shelter">Ly</string>
+    <string name="poi_boundary_stone">Grensestein</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -167,7 +167,7 @@
     <string name="use_fluorescent_overlays">Fluorescerende overlegg</string>
     <string name="use_fluorescent_overlays_descr">Bruk fluorescerende farger til å vise spor og ruter.</string>
     <string name="offline_edition">Frakoblet redigering</string>
-    <string name="offline_edition_descr">Bruk alltid frakoblet redigering.</string>
+    <string name="offline_edition_descr">Hvis redigering uten nett er aktivert, lagres endringer lokalt først og lastes opp på forespørsel, ellers vil endringer bli lastet opp umiddelbart.</string>
     <string name="free_version_message">Du kan laste ned eller oppdatere %1$s kart.</string>
     <string name="free_version_title">Gratisversjon</string>
     <string name="poi_context_menu_showdescription">Vis interessepunkt-beskrivelse.</string>
@@ -401,7 +401,7 @@
     <string name="search_offline_address">Offline-søk</string>
     <string name="search_online_address">Nettbasert søk</string>
     <string name="max_level_download_tile">Maks. nettbasert zoom</string>
-    <string name="max_level_download_tile_descr">Ikke bla gjennom nettbaserte kartfliser for zoomnivåer utover dette.</string>
+    <string name="max_level_download_tile_descr">Ikke bla gjennom nettbaserte kart for zoomnivåer utover dette.</string>
     <string name="route_general_information">Total distanse %1$s, reisetid %2$d t %3$d min.</string>
     <string name="router_service_descr">Nettbasert eller frakoblet navigeringstjeneste.</string>
     <string name="router_service">Navigeringstjeneste</string>
@@ -699,7 +699,7 @@
     <string name="save_global_track_interval">Generelt loggeintervall</string>
     <string name="int_hour">t</string>
     <string name="duration">Varighet</string>
-    <string name="distance">Avstand</string>
+    <string name="distance">Distanse</string>
     <string name="index_tours">Turer</string>
     <string name="shared_string_all">Alle</string>
     <string name="shared_string_more">Mer…</string>
@@ -796,7 +796,7 @@
     <string name="loading_cities">Laster byer…</string>
     <string name="invalid_locations">Ugyldige koordinater</string>
     <string name="go_back_to_osmand">Tilbake til kartet</string>
-    <string name="osb_comment_dialog_success">Kommentar er lagt til</string>
+    <string name="osb_comment_dialog_success">Kommentar lagt til</string>
     <string name="no_buildings_found">Ingen bygninger funnet.</string>
     <string name="loading_streets_buildings">Laster gater/bygninger…</string>
     <string name="fav_point_dublicate_message">Favorittnavn endret til \"%1$s\" for å unngå duplisering.</string>
@@ -924,7 +924,7 @@
     <string name="copying_osmand_files">Kopierer OsmAnd-datafiler…</string>
     <string name="route_descr_destination">Reisemål</string>
     <string name="gpx_file_name">GPX-filnavn</string>
-    <string name="osmand_distance_planning_plugin_name">Distansekalkulator &amp; planleggingsverktøy</string>
+    <string name="osmand_distance_planning_plugin_name">Distansekalkulator og planleggingsverktøy</string>
     <string name="layer_hillshade">Relieffskyggelag</string>
     <string name="download_hillshade_maps">Relieffskygger</string>
     <string name="local_indexes_cat_av">Audio/Video-data</string>
@@ -1339,7 +1339,7 @@
     <string name="osn_comment_dialog_title">Legg til kommentar</string>
     <string name="navigation_item_description">Navigeringsoppsett.</string>
     <string name="free_downloads_used_description">Viser hvor mange gratis nedlastinger som er igjen.</string>
-    <string name="route_distance">Avstand:</string>
+    <string name="route_distance">Distanse:</string>
     <string name="route_duration">Tid:</string>
     <string name="shared_string_sound">Lyd</string>
     <string name="available_maps">Tilgjengelige kart</string>
@@ -1492,7 +1492,7 @@
     <string name="wait_current_task_finished">Vent til gjeldende oppgave er ferdig</string>
     <string name="recording_delete_confirm">Slett dette elementet\?</string>
     <string name="osmand_parking_delete">Slett parkeringsplassmarkør</string>
-    <string name="local_openstreetmap_delete">Slett endring</string>
+    <string name="local_openstreetmap_delete">Slett redigering</string>
     <string name="poi_dialog_reopen">Gjenåpne</string>
     <string name="do_you_like_osmand">Liker du OsmAnd\?</string>
     <string name="building_number">Bygningsnummer</string>
@@ -1520,7 +1520,7 @@
     <string name="lang_kn">Kannada</string>
     <string name="app_mode_bus">Buss</string>
     <string name="app_mode_train">Tog</string>
-    <string name="voice_data_unavailable">Valgte taledata er ikke tilgjengelig</string>
+    <string name="voice_data_unavailable">Valgte talemeldingspakke er ikke tilgjengelig</string>
     <string name="voice_data_corrupted">Spesifisert taledata er ødelagt</string>
     <string name="voice_data_not_supported">Taledataversjon som ikke støttes</string>
     <string name="background_router_service_descr">Sporer posisjonen din mens skjermen er slått av.</string>
@@ -1878,7 +1878,7 @@
     <string name="context_menu_item_add_parking_point">Marker som parkeringsplass</string>
     <string name="route_roundabout">Rundkjøring: Ta avkjøring %1$d og fortsett</string>
     <string name="support_new_features">Støtt nye funksjoner</string>
-    <string name="max_speed">Maksimumshastighet</string>
+    <string name="max_speed">Maksimumsfart</string>
     <string name="shared_string_start_time">Starttid</string>
     <string name="shared_string_end_time">Sluttid</string>
     <string name="shared_string_color">Farge</string>
@@ -2011,7 +2011,6 @@
     <string name="add_new_folder">Legg til ny mappe</string>
     <string name="shared_string_gpx_track">Spor</string>
     <string name="routing_attr_height_obstacles_name">Bruk høydedata</string>
-
     <string name="quick_action_bug_message">Melding</string>
     <string name="shared_string_permissions">Tillatelser</string>
     <string name="import_gpx_failed_descr">Kunne ikke importere filen. Kontroller at OsmAnd har tillatelse til å lese den.</string>
@@ -2174,7 +2173,7 @@
     <string name="validate_gpx_upload_name_pwd">Angi ditt OSM-brukernavn og passord for å laste opp GPX-filer.</string>
     <string name="support_new_features_descr">Doner for å se nye funksjoner implementert i programmet.</string>
     <string name="local_openstreetmap_uploadall">Last opp alle</string>
-    <string name="local_openstreetmap_upload">Last opp endring til OSM</string>
+    <string name="local_openstreetmap_upload">Last opp redigering til OSM</string>
     <string name="local_openstreetmap_descr_title">Asynkron OSM-redigering:</string>
     <string name="live_monitoring_interval_descr">Oppgi det nettbaserte sporingsintervallet.</string>
     <string name="live_monitoring_interval">Nettbasert sporingsintervall</string>
@@ -2240,7 +2239,7 @@
     <string name="quick_action_add_parking">Legg til parkeringsplass</string>
     <string name="quick_action_edit_action">Rediger handling</string>
     <string name="quick_actions_delete">Slett handling</string>
-    <string name="quick_favorites_name_preset">Navneforvalg</string>
+    <string name="quick_favorites_name_preset">Forhåndsinnstilt navn</string>
     <string name="quick_action_add_marker_descr">En knapp for å legge til en kartmarkør i skjermsenteret.</string>
     <string name="quick_action_add_gpx_descr">En knapp for å legge til et GPX-rutepunkt i midten av skjermen.</string>
     <string name="quick_action_take_audio_note_descr">En knapp for å legge til et lydnotat i midten av skjermen.</string>
@@ -2830,7 +2829,7 @@
     <string name="routeInfo_roadClass_name">Veitype</string>
     <string name="routeInfo_surface_name">Overflate</string>
     <string name="routeInfo_smoothness_name">Jevnhet</string>
-    <string name="routeInfo_steepness_name">Stigning</string>
+    <string name="routeInfo_steepness_name">Bratthet</string>
     <string name="add_home">Legg til bosted</string>
     <string name="add_work">Legg til arbeidssted</string>
     <string name="work_button">Arbeid</string>
@@ -2866,9 +2865,9 @@
     <string name="rendering_attr_surface_paved_name">Fast dekke</string>
     <string name="rendering_attr_surface_concrete_name">Betong</string>
     <string name="rendering_attr_surface_sett_name">Brostein</string>
-    <string name="rendering_attr_surface_cobblestone_name">Naturlig brostein</string>
-    <string name="rendering_attr_surface_paving_stones_name">Steinbelagt</string>
-    <string name="rendering_attr_surface_pebblestone_name">Rullestein</string>
+    <string name="rendering_attr_surface_cobblestone_name">Kuppelstein</string>
+    <string name="rendering_attr_surface_paving_stones_name">Belegningsstein</string>
+    <string name="rendering_attr_surface_pebblestone_name">Rullestein (liten)</string>
     <string name="rendering_attr_surface_stone_name">Stein</string>
     <string name="rendering_attr_surface_metal_name">Metall</string>
     <string name="rendering_attr_surface_wood_name">Tre</string>
@@ -2908,8 +2907,8 @@
     <string name="shared_string_milliradians">Milliradianer</string>
     <string name="angular_measeurement">Vinkel-måleenheter</string>
     <string name="angular_measeurement_descr">Endre hva asimut måles i.</string>
-    <string name="routing_attr_avoid_sett_name">Ingen rustikk brostein eller brostein</string>
-    <string name="routing_attr_avoid_sett_description">Unngår rustikk brostein og brostein</string>
+    <string name="routing_attr_avoid_sett_name">Ingen kuppelstein eller brostein</string>
+    <string name="routing_attr_avoid_sett_description">Unngår kuppelstein og brostein</string>
     <string name="routing_attr_avoid_tram_name">Ingen trikk</string>
     <string name="routing_attr_avoid_tram_description">Unngår trikk</string>
     <string name="routing_attr_avoid_bus_name">Ingen buss</string>
@@ -2946,7 +2945,7 @@
     <string name="choose_data_to_share">Velg typen data du vil dele:</string>
     <string name="downloaded_maps">Nedlastede kart</string>
     <string name="visited_screens">Besøkte skjermer</string>
-    <string name="collected_data_descr">Definer hvilken data du ønsker å dele med OsmAnd.</string>
+    <string name="collected_data_descr">Bestem hvilke data OsmAnd kan dele.</string>
     <string name="downloaded_maps_collect_descr">Hjelp oss å forstå hvilke land- og regionkart som er mest populære.</string>
     <string name="visited_screens_collect_descr">Hjelp oss å forstå hvilke OsmAnd-funksjoner som er mest populære.</string>
     <string name="privacy_and_security_change_descr">Trykk \"Tillat\" hvis du er enig med vår %1$s</string>
@@ -3146,7 +3145,8 @@
     <string name="shared_string_other">Annet</string>
     <string name="shared_preference">Delt</string>
     <string name="layer_osm_edits">OSM-redigeringer</string>
-    <string name="new_route_calculated_dist_dbg">Rute: Distanse %1$s, rutingstid %2$s \nUtregning: %3$.1f sec, %4$d veier, %5$d flis)</string>
+    <string name="new_route_calculated_dist_dbg">Rute: Distanse %1$s, rutetid %2$s
+\nBeregning: %3$.1f sek., %4$d veier, %5$d fliser)</string>
     <string name="contour_lines_and_hillshade">Koter og relieffskygge</string>
     <string name="update_all_maps">Oppdater alle kart</string>
     <string name="update_all_maps_q">Er du sikker på at du vil oppdatere alle (%1$d) kart\?</string>
@@ -3833,7 +3833,7 @@
     <string name="shared_string_resources">Ressurser</string>
     <string name="profile_by_default_description">Velg profilen som skal brukes når programmet starter.</string>
     <string name="shared_string_last_used">Sist brukt</string>
-    <string name="routing_attr_allow_streams_name">Tillat bekker og avløp</string>
+    <string name="routing_attr_allow_streams_name">Tillat bekker og dreneringsgrøfter</string>
     <string name="routing_attr_allow_intermittent_name">Tillat periodiske vannveier</string>
     <string name="routing_attr_allow_intermittent_description">Tillat periodiske vannveier</string>
     <string name="shared_string_vehicle">Kjøretøy</string>
@@ -3855,7 +3855,7 @@
     <string name="change_folder">Endre mappe</string>
     <string name="select_data_to_export">Velg data å eksportere til filen.</string>
     <string name="export_not_enough_space_descr">Din enhet har kun %1$s ledig. Frigjør litt plass eller velg bort noen elementer fra eksporten.</string>
-    <string name="select_groups_for_import">ffffffffff|</string>
+    <string name="select_groups_for_import">Velg grupper som skal importeres.</string>
     <string name="reverse_all_points">Reverser alle punkter</string>
     <string name="routing_engine_vehicle_type_small_truck">Liten lastebil</string>
     <string name="routing_engine_vehicle_type_truck">Lastebil</string>
@@ -3875,18 +3875,18 @@
     <string name="announcement_time_prepare">Forberedelse</string>
     <string name="announcement_time_arrive">Ankom målet</string>
     <string name="shared_string_turn">Sving</string>
-    <string name="announcement_time_intervals">Tid og avstansintervaller</string>
-    <string name="announcement_time_descr">kunngjøringstid for forskjellige stemmeforespørsler avhenger av forespørselstype, nåværende navigasjonshastighet og forvalgt navigasjonshastighet.</string>
+    <string name="announcement_time_intervals">Tid og avstandsintervaller</string>
+    <string name="announcement_time_descr">Kunngjøringstid for forskjellige talemeldinger avhenger av meldingstype, gjeldende navigasjonshastighet og standard-navigasjonshastighet.</string>
     <string name="routing_engine_vehicle_type_hiking">Turgåing</string>
-    <string name="routing_engine_vehicle_type_walking">Fotgjengeri</string>
+    <string name="routing_engine_vehicle_type_walking">Gåing</string>
     <string name="shared_string_sec">sek</string>
     <string name="announcement_time_title">Kunngjøringstid</string>
     <string name="start_recording">Start opptak</string>
     <string name="show_track_on_map">Vis spor på kart</string>
     <string name="routing_engine_vehicle_type_wheelchair">Rullestol</string>
     <string name="routing_engine_vehicle_type_cycling_electric">El-sykkel</string>
-    <string name="routing_engine_vehicle_type_cycling_mountain">Terrengsykkel</string>
-    <string name="routing_engine_vehicle_type_racingbike">Temposykkel</string>
+    <string name="routing_engine_vehicle_type_cycling_mountain">Terrengsykling</string>
+    <string name="routing_engine_vehicle_type_racingbike">Racersykkel</string>
     <string name="routing_engine_vehicle_type_cycling_road">Landeveissykling</string>
     <string name="routing_engine_vehicle_type_cycling_regular">Vanlig sykling</string>
     <string name="message_server_error">Tjenerfeil: %1$s</string>
@@ -3896,7 +3896,7 @@
     <string name="routing_engine_vehicle_type_hgv">Stor lastebil</string>
     <string name="delete_online_routing_engine">Slett denne nettbaserte rutingsmotoren\?</string>
     <string name="context_menu_read_full">Les hele</string>
-    <string name="delete_waypoints">Slett rutepunkt</string>
+    <string name="delete_waypoints">Slett rutepunkter</string>
     <string name="app_mode_gap">Luke</string>
     <string name="login_open_street_map">Logg inn på OpenStreetMap</string>
     <string name="user_login">Logg inn</string>
@@ -3905,4 +3905,38 @@
     <string name="context_menu_edit_descr">Rediger beskrivelse</string>
     <string name="copy_to_map_markers">Kopier til kartmarkører</string>
     <string name="copy_to_map_favorites">Kopier til favoritter</string>
+    <string name="uploading_count">Laster opp %1$d av %2$d</string>
+    <string name="select_segments">Velg segmenter</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="opr_use_dev_url">Bruk test.openplacereviews.org</string>
+    <string name="activity_type_water_name">Vann</string>
+    <string name="activity_type_winter_name">Vinter</string>
+    <string name="activity_type_snowmobile_name">Snøskuter</string>
+    <string name="activity_type_mountainbike_name">Terrengsykkel</string>
+    <string name="activity_type_cycling_name">Sykling</string>
+    <string name="activity_type_motorbike_name">Motorsykkel</string>
+    <string name="activity_type_car_name">Bil</string>
+    <string name="delete_number_files_question">Slett %1$d filer\?</string>
+    <string name="updated">Oppdatert: %s</string>
+    <string name="delete_updates">Slett oppdateringer</string>
+    <string name="purchases">Kjøp</string>
+    <string name="select_category_descr">Velg kategori eller legg til en ny</string>
+    <string name="track_recording_will_be_continued">Opptaket vil fortsette.</string>
+    <string name="copy_poi_name">Kopier interessepunktnavn</string>
+    <string name="quick_action_show_hide_title">Vis/skjul</string>
+    <string name="shared_string_interval">Intervall</string>
+    <string name="track_has_no_altitude">Sporet inneholder ikke høydedata.</string>
+    <string name="track_has_no_speed">Sporet inneholder ikke hastighetsdata.</string>
+    <string name="select_another_colorization">Velg en annen type fargelegging.</string>
+    <string name="shared_strings_all_regions">Alle regioner</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Skjul grenser for naturreservat, beskyttede områder og nasjonalparker</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Naturgrenser</string>
+    <string name="hillshade_slope_contour_lines">Relieffskygge / Bakkehelling / Koter</string>
+    <string name="activity_type_riding_name">Ridning</string>
+    <string name="activity_type_hiking_name">Turgåing</string>
+    <string name="activity_type_running_name">Løping</string>
+    <string name="activity_type_walking_name">Gåing</string>
+    <string name="routing_attr_short_way_description">Optimalisert kortere rute (energisparende)</string>
+    <string name="snap_to_road_descr">Aktuelle posisjonsikon vil bli festet til gjeldende navigeringsrute</string>
+    <string name="routing_attr_height_obstacles_description">Ruting kan unngå kraftige oppoverbakker.</string>
 </resources>

OsmAnd/res/values-nl/strings.xml

@@ -47,7 +47,7 @@
     <string name="south_south_west">zuid-zuidwest</string>
     <string name="south_west">zuidwest</string>
     <string name="west_south_west">west-zuidwest</string>
-    <string name="west">west</string>
+    <string name="west">westen</string>
     <string name="west_north_west">west-noordwest</string>
     <string name="north_west">noordwest</string>
     <string name="front">Rechtuit</string>
@@ -495,7 +495,7 @@
     <string name="follow">Start route begeleiding</string>
     <string name="recalculate_route_to_your_location">Soort vervoer:</string>
     <string name="mark_final_location_first">Kies eerst een bestemming</string>
-    <string name="get_directions">Route</string>
+    <string name="get_directions">Routebeschrijving</string>
     <string name="opening_hours">Openingstijden</string>
     <string name="opening_changeset">Wijzigingenset openen…</string>
     <string name="closing_changeset">Wijzigingenset sluiten…</string>
@@ -1341,7 +1341,7 @@
     <string name="proxy_pref_descr">Stel een proxy voor Internetcommunicatie in.</string>
     <string name="settings_privacy">Privacy</string>
     <string name="shared_string_gpx_points">Punten</string>
-    <string name="navigation_over_track">Navigatie langs GPX-track starten?</string>
+    <string name="navigation_over_track">Navigatie langs GPX-track starten\?</string>
     <string name="avoid_roads_msg">Je kan een alternatieve route vinden door aan te geven welke wegen niet gebruikt mogen worden</string>
     <string name="save_track_to_gpx_globally_headline">GPX-tracks opnemen op aanvraag</string>
     <string name="enable_proxy_title">HTTP-proxy aanzetten</string>
@@ -1432,7 +1432,7 @@
     <string name="shared_string_control_start">Start</string>
     <string name="shared_string_control_stop">Stop</string>
     <string name="shared_string_import">Importeren</string>
-    <string name="shared_string_export">Exporteer naar OSM</string>
+    <string name="shared_string_export">Exporteer</string>
     <string name="shared_string_more">Meer…</string>
     <string name="shared_string_more_actions">Meer acties</string>
     <string name="shared_string_do_not_show_again">Toon niet meer</string>
@@ -1912,7 +1912,7 @@
     <string name="rendering_value_thin_name">Dun</string>
     <string name="rendering_value_medium_name">Gemiddeld</string>
     <string name="rendering_value_bold_name">Vet</string>
-    <string name="map_mode">Dag-Nacht stijl</string>
+    <string name="map_mode">Dag/Nacht stijl</string>
     <string name="access_default_color">Standaardkleur</string>
     <string name="access_category_choice">Kies categorie</string>
     <string name="access_hint_enter_name">Voer naam in</string>
@@ -2173,7 +2173,6 @@
     <string name="shared_string_time_moving">Tijd in beweging</string>
     <string name="routing_attr_driving_style_name">Rijstijl</string>
     <string name="routing_attr_height_obstacles_name">Hoogtegegevens gebruiken</string>
-
     <string name="shared_string_gpx_track">Track</string>
     <string name="right_side_navigation">Rechts rijdend</string>
     <string name="driving_region_automatic">Automatisch</string>
@@ -2678,7 +2677,7 @@
     <string name="nautical_render_descr">Zeekaartstijl. Toont boeien, vuurtorens, rivieren, vaargeulen en -markeringen, havens, bakens, dieptelijnen.</string>
     <string name="ski_map_render_descr">Skistijl. Toont pistes, skiliften en andere ski-gerelateerde elementen. Overige kaartelementen worden verduisterd.</string>
     <string name="light_rs_render_descr">Eenvoudige stijl voor autonavigatie. Zachte nachtmodus, hoogtelijnen, contrasterende wegen in oranje stijl, verduistert overige kaartelementen.</string>
-    <string name="topo_render_descr">Voor wandelaars, trektochten en fietsenrs in de natuur. Buiten goed leesbaar. Contrasterende wegen en natuurlijke objecten, verschillende routetypen, geavanceerde hoogtelijn opties, extra details. Aanpassing van de oppervlakte-integriteit onderscheidt de kwaliteit van de weg. Geen nachtmodus.</string>
+    <string name="topo_render_descr">Voor wandelaars, trektochten en fietsen in de natuur. Buiten goed leesbaar. Contrasterende wegen en natuurlijke objecten, verschillende routetypen, geavanceerde hoogtelijn opties, extra details. Aanpassing van de oppervlakte-integriteit onderscheidt de kwaliteit van de weg. Geen nachtmodus.</string>
     <string name="mapnik_render_descr">Oude \'Mapnik\'-standaardstijl. Kleuren vergelijkbaar met \'Mapnik\'.</string>
     <string name="touring_view_render_descr">Stijl met hoog contrast en maximaal detail. Deze bevat alle opties van de standaardstijl van OsmAnd, met zoveel mogelijk details, specifiek wegen, paden en andere reismogelijkheden. Geen verschil tussen “wegenkaart”-wegtypes. Geschikt voor dag, nacht en outdoor gebruik.</string>
     <string name="default_render_descr">Universele stijl. Vereenvoudigde weergave dichtbevolkte steden. Hoogtelijnen, routes, oppervlakkwaliteit, toegangsrestricties, wegnummers, weergave van paden volgens de SAC-schaal, wildwatersportelementen.</string>
@@ -3138,8 +3137,8 @@
     <string name="visited_screens_collect_descr">Help ons begrijpen welke OsmAnd functies het populairst zijn.</string>
     <string name="privacy_and_security_change_descr">Toets \"Toestaan\" als u akkoord gaat met onze %1$s</string>
     <string name="app_mode_shuttle_bus">Shuttlebus</string>
-    <string name="show_compass_ruler">Toon kompas wijzer</string>
-    <string name="hide_compass_ruler">Verberg kompas wijzer</string>
+    <string name="show_compass_ruler">Toon kompasliniaal</string>
+    <string name="hide_compass_ruler">Verberg kompasliniaal</string>
     <string name="settings_routing_mode_string">Modus: %s</string>
     <string name="settings_derived_routing_mode_string">Gebruikers modus, afgeleid van: %s</string>
     <string name="select_base_profile_dialog_message">Baseer uw aangepaste profiel op één van de standaard profielen, dit bepaalt de algemene opzet zoals standaard zichtbaarheid van widgets en eenheden van snelheid en afstand. Dit zijn de standaard profielen samen met voorbeelden van aangepaste profielen die uitgebreid kunnen worden:</string>
@@ -3359,7 +3358,7 @@
     <string name="shared_string_routing">Routering</string>
     <string name="shared_string_include_data">Bijkomende gegevens insluiten</string>
     <string name="import_profile_dialog_description">Het geïmporteerde profiel bevat aanvullende gegevens. Tik \"Importeren\" om enkel de profielgegevens te importeren of kies aanvullende gegevens om te importeren.</string>
-    <string name="export_profile_dialog_description">Je kan bijkomende gegevens om mee met het profiel te exporteren.</string>
+    <string name="export_profile_dialog_description">Je kan bijkomende gegevens toevoegen om mee met het profiel te exporteren.</string>
     <string name="shared_string_app_default_w_val">App Standaardwaarde (%s)</string>
     <string name="no_recalculation_setting">Niet herberekenen</string>
     <string name="route_recalculation_dist_title">Minimale afstand om route te herbereken</string>
@@ -3431,7 +3430,7 @@
     <string name="routing_attr_length_name">Maximale lengte</string>
     <string name="shared_string_bearing">Richting</string>
     <string name="item_deleted">%1$s verwijderd</string>
-    <string name="speed_cameras_restart_descr">Een herstart is noodzakelijk om de gegevens van snelheidscamera’s volledig te verwijderen.</string>
+    <string name="speed_cameras_restart_descr">Herstart de app om de gegevens van snelheidscamera’s te verwijderen.</string>
     <string name="shared_string_uninstall_and_restart">Verwijderen en Herstarten</string>
     <string name="speed_cameras_removed_descr">Dit apparaat bevat geen informatie over snelheidscamera’s.</string>
     <string name="app_mode_inline_skates">Inline skates</string>
@@ -3540,8 +3539,8 @@
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="search_poi_types">POI-types zoeken</string>
     <string name="quick_action_transport_descr">Knop om OV-informatie al dan niet te tonen op de kaart.</string>
-    <string name="add_edit_favorite">Favoriet toevoegen / bewerken</string>
-    <string name="create_edit_poi">POI toevoegen / bewerken</string>
+    <string name="add_edit_favorite">Favoriet toevoegen of bewerken</string>
+    <string name="create_edit_poi">POI toevoegen of bewerken</string>
     <string name="parking_positions">Parkeerlocaties</string>
     <string name="reset_deafult_order">Standaardvolgorde van de ekementen herstellen</string>
     <string name="back_to_editing">Terugkeren naar wijzigen</string>
@@ -3562,7 +3561,7 @@
     <string name="turn_screen_on_navigation_instructions_descr">Scherm aanzetten bij elke routeaanwijzing.</string>
     <string name="turn_screen_on_navigation_instructions">Routeaanwijzingen</string>
     <string name="turn_screen_on_power_button_disabled">Uitgeschakeld. De instelling ‘Timeout na wakker worden’ moet ingesteld zijn op ‘Scherm aanlaten’.</string>
-    <string name="turn_screen_on_power_button_descr">Door op de aan/uit knop te drukken gaat het scherm aan met OsmAnd op de voorgrond van het vergrendelde scherm.</string>
+    <string name="turn_screen_on_power_button_descr">Door op de aan/uit knop te drukken gaat het scherm aan met OsmAnd op de voorgrond van het vergrendelingsscherm.</string>
     <string name="turn_screen_on_power_button">Aan/uit-knop</string>
     <string name="turn_screen_on_proximity_sensor">Nabijheidssensor</string>
     <string name="turn_screen_on_wake_time_descr">Selecteer de schermtimeout na wakker worden. (Kies “%1$s” om geen timeout te gebruiken.)</string>
@@ -3579,7 +3578,7 @@
     <string name="storage_format">Opslagformaat</string>
     <string name="map_source_zoom_levels">Stel een minimum en maximum zoomniveau in om de online kaart te tonen of te laden.</string>
     <string name="shared_string_delete_all_q">Alles wissen\?</string>
-    <string name="export_import_quick_actions_with_profiles_promo">Sneltoetsen kunnen geëxporteerd of geïmporteerd worden met app-profielen.</string>
+    <string name="export_import_quick_actions_with_profiles_promo">Snelle acties kunnen geëxporteerd of geïmporteerd worden met app-profielen.</string>
     <string name="delete_all_actions_message_q">Weet je zeker dat je %d sneltoetsen onherroepelijk wil verwijderen\?</string>
     <string name="speed_cameras_legal_descr">In sommige landen of regio’s is het gebruik van toepassingen om te waarschuwen voor snelheidscamera’s in strijd met de wet.
 \n
@@ -3608,12 +3607,12 @@
     <string name="tiles_storage_descr">Kies hoe gedownloade rasterkaartsegmenten worden opgeslagen.</string>
     <string name="profiles_for_action_not_found">Geen overeenkomende profielen gevonden.</string>
     <string name="screen_timeout">Time-out van het scherm</string>
-    <string name="use_volume_buttons_as_zoom_descr">Regel het zoomniveau, van de kaart, met de volumeknop op het apparaat.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Regel het zoomniveau van de kaart met de volumeknop op het apparaat.</string>
     <string name="use_volume_buttons_as_zoom">Gebruik volumeknoppen om in en uit te zoomen</string>
-    <string name="plugin_wikipedia_description">Verkrijg informatie over POIs uit Wikipedia. Het is je offline reisgidsje - schakel de Wikipedia-plug-in in en geniet van artikelen over de bezienswaardigheden in je omgeving.</string>
+    <string name="plugin_wikipedia_description">Verkrijg informatie over POIs uit Wikipedia, een offline reisgids met artikelen over de bezienswaardigheden in je omgeving.</string>
     <string name="lenght_limit_description">Geef de voertuiglengte op, er zijn mogelijk routebeperkingen voor lange voertuigen.</string>
-    <string name="quick_action_remove_next_destination_descr">Het volgende routepunt wordt verwijderd. Als dit de eindbestemming was, stopt de navigatie.</string>
-    <string name="quick_action_remove_next_destination">Het volgende routepunt verwijderen</string>
+    <string name="quick_action_remove_next_destination_descr">Verwijdert het volgende routepunt. Als dit de eindbestemming was stopt de navigatie.</string>
+    <string name="quick_action_remove_next_destination">Het dichstbijzijnde routepunt verwijderen</string>
     <string name="please_provide_point_name_error">Kies een naam voor het punt</string>
     <string name="search_download_wikipedia_maps">Wikipedia-kaarten downloaden</string>
     <string name="app_mode_motor_scooter">Motorscooter</string>
@@ -3626,16 +3625,16 @@
     <string name="save_global_track_interval_descr">Specificeer het registratie-interval voor de algemene trackregistratie (ingeschakeld via de track-widget op de kaart).</string>
     <string name="gpx_monitoring_stop">Pauzeer track opname</string>
     <string name="gpx_monitoring_start">Hervat track opnemen</string>
-    <string name="street_level_imagery">Beelden op srraatniveau</string>
-    <string name="select_track_width">Selecteer dikte</string>
+    <string name="street_level_imagery">Beelden op straatniveau</string>
+    <string name="select_track_width">Selecteer breedte</string>
     <string name="track_show_start_finish_icons">Toon start en aankomst pictogrammen</string>
-    <string name="gpx_direction_arrows">Richtingaanwijzers</string>
-    <string name="add_hidden_group_info">Het toegevoegde punt zal niet zichtbaar zijn op de kaart, aangezien de geselecteerde groep verborgen is, je kan het vinden in \"%s\".</string>
+    <string name="gpx_direction_arrows">Richtingspijlen</string>
+    <string name="add_hidden_group_info">Het toegevoegde punt zal niet zichtbaar zijn op de kaart omdat de geselecteerde groep verborgen is, je kan het vinden in \"%s\".</string>
     <string name="system_default_theme">Standaard</string>
     <string name="route_between_points">Route tussen punten</string>
     <string name="route_between_points_warning_desc">Vervolgens, zet uw track vast op de dichtstbijzijnde toegestane weg met een van uw navigatieprofielen om deze optie te gebruiken.</string>
-    <string name="message_need_calculate_route_before_show_graph">%1$s gegevens alleen beschikbaar op wegen, u moet een route berekenen met behulp van \"Route tussen punten\" om deze gegevens te krijgen.</string>
-    <string name="route_between_points_desc">Selecteer hoe de punten verbonden worden, via een rechte lijn, of een route berekenen tussen de punten zoals hieronder aangegeven.</string>
+    <string name="message_need_calculate_route_before_show_graph">%1$s gegevens alleen beschikbaar op wegen, u moet een route berekenen met behulp van \"Route tussen punten\" om grafieken te zien.</string>
+    <string name="route_between_points_desc">Kies hoe de punten verbonden worden: via een rechte lijn, of een route berekenen tussen de punten zoals hieronder aangegeven.</string>
     <string name="route_between_points_next_segment_button_desc">Alleen het volgende segment wordt opnieuw berekend met het geselecteerde profiel.</string>
     <string name="next_segment">Volgende segment</string>
     <string name="all_next_segments">Alle volgende segmenten</string>
@@ -3647,11 +3646,11 @@
     <string name="save_as_new_track">Bewaar als nieuwe track</string>
     <string name="release_3_7">Nieuwe offline pistekaarten
 \n
-\n • Volledige aanpassing van favorieten en GPX-waypoints - aangepaste kleuren, pictogrammen, vormen
+\n • Volledige aanpassingsmogelijkheid van favorieten en GPX-waypoints - aangepaste kleuren, pictogrammen, vormen
 \n
-\n • Pas de volgorde van items aan in \"Contextmenu\", \"Configureer kaart\" en \"........\"
+\n • Mogelijkheid om de volgorde van items aan in \"Contextmenu\", \"Configureer kaart\" en \"Tekenaar\" te veranderen
 \n
-\n •Wikipedia als een afzonderlijke laag in Kaart configureren, selecteer alleen de benodigde talen
+\n • Wikipedia als een afzonderlijke laag in Kaart configureren, selecteer alleen de benodigde talen
 \n
 \n • Creëer uw eigen POI-filter / kaarten met totale flexibiliteit
 \n
@@ -3659,27 +3658,27 @@
 \n
 \n • Volledige GPX-routes van navigatieondersteunende rijstroken en volledige afslaginstructies
 \n
-\n •Verbeterde UI-formaten op tablets
+\n • Verbeterde UI-formaten op tablets
 \n
-\n •Herstel bugs met RTL
+\n • Herstel bugs met RTL
 \n
 \n</string>
     <string name="add_to_a_track">Voeg toe aan een track</string>
     <string name="add_segment_to_the_track">Voeg toe aan een trackbestand</string>
     <string name="simplified_track">Vereenvoudigde track</string>
-    <string name="simplified_track_description">Alleen de routelijn wordt opgeslagen, de waypoints worden verwijderd.</string>
+    <string name="simplified_track_description">Alleen de routetrack wordt opgeslagen, de waypoints worden verwijderd.</string>
     <string name="shared_string_done">Bewaar</string>
     <string name="reverse_route">Route omkeren</string>
     <string name="route_between_points_add_track_desc">Selecteer een track waaraan je een nieuw segment wil toevoegen.</string>
     <string name="plan_route_select_track_file_for_open">Selecteer een trackbestand om te openen.</string>
-    <string name="plan_route_exit_dialog_descr">Weet u zeker dat u alle wijzigingen in de geplande route wilt annuleren door deze te sluiten\?</string>
+    <string name="plan_route_exit_dialog_descr">Weet u zeker dat u alle wijzigingen in de geplande route wilt annuleren\?</string>
     <string name="plan_route_trim_before">Alles wegknippen voor dit punt</string>
     <string name="plan_route_trim_after">Alles wegknippen na dit punt</string>
     <string name="plan_route_change_route_type_before">Wijzig het routetype voor</string>
     <string name="plan_route_change_route_type_after">Wijzig het routetype na</string>
-    <string name="release_3_8">• Bijgewerkt Plan een route functie: maakt het mogelijk om verschillende navigatietypes per segment te gebruiken en tracks op te nemen
+    <string name="release_3_8">• Bijgewerkte Plan een route functie: maakt het mogelijk om verschillende navigatietypes per segment te gebruiken en tracks te gebruiken
 \n
-\n • Nieuw menu voor tracks: selecteer kleur, dikte, weergeven van richtingspijlen, start / finish-pictogrammen.
+\n • Nieuw weergavemenu voor tracks: selecteer kleur, dikte, weergeven van richtingspijlen, start / finish-pictogrammen.
 \n
 \n • Verbeterde zichtbaarheid van fietsknooppunten.
 \n
@@ -3702,7 +3701,7 @@
     <string name="message_graph_will_be_available_after_recalculation">Wacht totdat route herberekend is.
 \nNa herberekening is de grafiek zichtbaar.</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
-    <string name="import_track_descr">Kies een trackbestand om te volgen of importeer het, vanaf uw apparaat.</string>
+    <string name="import_track_descr">Kies een trackbestand om te volgen of importeer het vanaf uw apparaat.</string>
     <string name="app_mode_gap">Onderbreking</string>
     <string name="shared_string_custom">Aangepast</string>
     <string name="perform_oauth_authorization_description">Voer een OAuth-login uit om osm edit functies te gebruiken</string>
@@ -3749,8 +3748,8 @@
 \n
 \n</string>
     <string name="what_is_new">Wat is er nieuw</string>
-    <string name="snowmobile_render_descr">Voor sneeuwscooter, rijden met speciale wegen en tracks.</string>
-    <string name="set_working_days_to_continue">Stel aantal werkdagen in om door te gaan</string>
+    <string name="snowmobile_render_descr">Voor sneeuwscooter, rijden op speciale wegen en tracks.</string>
+    <string name="set_working_days_to_continue">Stel werkdagen in om door te gaan</string>
     <string name="gpx_split_interval_descr">Selecteer het interval waarmee markeringen met afstand of tijd op de track worden weergegeven.</string>
     <string name="gpx_split_interval_none_descr">Selecteer de gewenste splitsingsoptie: op tijd of op afstand.</string>
     <string name="track_coloring_solid">Vaste</string>
@@ -3769,15 +3768,15 @@
     <string name="follow_track_descr">Kies een trackbestand om te volgen</string>
     <string name="select_another_track">Selecteer een andere track</string>
     <string name="navigate_to_track_descr">Navigeer vanaf mijn positie naar de track</string>
-    <string name="start_of_the_track">Track starten</string>
+    <string name="start_of_the_track">Begin van de track</string>
     <string name="nearest_point">Dichtstbijzijnde punt</string>
     <string name="attach_to_the_roads">Aan wegen koppelen</string>
     <string name="delete_address">Adres verwijderen</string>
-    <string name="add_address">Adres ingeven</string>
-    <string name="access_hint_enter_address">Adres ingeven</string>
+    <string name="add_address">Geef adres in</string>
+    <string name="access_hint_enter_address">Geef adres in</string>
     <string name="shared_string_file_name">Bestandsnaam</string>
     <string name="number_of_gpx_files_selected_pattern">%s trackbestanden geselecteerd</string>
-    <string name="disable_recording_once_app_killed_descrp">Zal trackregistratie onderbreken wanneer de app wordt uitgeschakeld (via recente apps). (OsmAnd-achtergrondindicatie verdwijnt uit de Android-berichtenbalk.)</string>
+    <string name="disable_recording_once_app_killed_descrp">Trackregistratie wordt onderbroken als de app wordt uitgeschakeld (via recente apps). (OsmAnd-achtergrondindicatie verdwijnt uit de Android-berichtenbalk.)</string>
     <string name="previous_segment">Vorig segment</string>
     <string name="all_previous_segments">Alle voorgaande segmenten</string>
     <string name="only_selected_segment_recalc">Alleen het geselecteerde segment wordt opnieuw berekend met het geselecteerde profiel.</string>
@@ -3787,7 +3786,7 @@
     <string name="one_point_error">Voeg ten minste twee punten toe.</string>
     <string name="shared_string_redo">Opnieuw doen</string>
     <string name="sort_last_modified">Laatst gewijzigd</string>
-    <string name="sort_name_descending">Naam: A – Z</string>
+    <string name="sort_name_descending">Naam: Z - A</string>
     <string name="sort_name_ascending">Naam: A – Z</string>
     <string name="start_finish_icons">Start/stop iconen</string>
     <string name="contour_lines_thanks">Bedankt voor het kopen van \'Contourlijnen\'</string>
@@ -3802,7 +3801,7 @@
     <string name="development">Ontwikkeling</string>
     <string name="use_live_public_transport">OsmAnd Live gegevens</string>
     <string name="use_live_routing">OsmAnd Live gegevens</string>
-    <string name="complex_routing_descr">Twee stappen routeberekening voor autonavigatie.</string>
+    <string name="complex_routing_descr">Twee-staps routeberekening voor autonavigatie.</string>
     <string name="use_native_pt">Eigen ontwikkeling van het openbaar vervoer</string>
     <string name="use_native_pt_desc">Schakel over naar Java (veilige) routeberekening voor het openbaar vervoer</string>
     <string name="perform_oauth_authorization">Inloggen via OAuth</string>
@@ -3898,7 +3897,7 @@
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="mgrs_format_descr">OsmAnd gebruikt MGRS, die sterk lijkt op het UTM-NATO-formaat.</string>
-    <string name="shared_string_resources">Resources</string>
+    <string name="shared_string_resources">Middelen</string>
     <string name="shared_string_search_history">Zoekgeschiedenis</string>
     <string name="app_mode_kayak">Kajak</string>
     <string name="app_mode_motorboat">Motorboot</string>
@@ -3926,7 +3925,7 @@
     <string name="routing_attr_allow_intermittent_name">Laat regelmatig droogvallende waterwegen toe</string>
     <string name="shared_string_enter_param">Geef een parameter</string>
     <string name="keep_it_empty_if_not">Laat leeg indien niet</string>
-    <string name="analyze_by_intervals">Analyseren met intervallen</string>
+    <string name="analyze_by_intervals">Analyseer intervallen</string>
     <string name="upload_to_openstreetmap">Uploaden naar OpenStreetMap</string>
     <string name="edit_track">GPX-track bewerken</string>
     <string name="rename_track">GPX-track hernoemen</string>
@@ -3938,7 +3937,7 @@
     <string name="announcement_time_prepare">Vooraankondiging</string>
     <string name="announcement_time_off_route">Afwijking van de route</string>
     <string name="announcement_time_arrive">Aankomst op bestemming</string>
-    <string name="shared_string_turn">Bocht</string>
+    <string name="shared_string_turn">Afslag</string>
     <string name="announcement_time_intervals">Tijd- en afstandsintervallen</string>
     <string name="announcement_time_descr">De aankondigingstijd van verschillende aankondigen hangt af van type en huidige snelheid.</string>
     <string name="announcement_time_title">Aankondigingstijd</string>
@@ -3970,4 +3969,67 @@
     <string name="uploading_count">Aan het opladen %1$d van %2$d</string>
     <string name="uploaded_count">Opgeladen %1$d van %2$d</string>
     <string name="toast_select_edits_for_upload">Selecteer de op te laden wijzigingen</string>
+    <string name="track_recording_description">Weet u zeker dat u de opname wilt stoppen\?
+\n(Alle niet opgeslagen gegevens gaan verloren.).</string>
+    <string name="select_segments">Selecteer segmenten</string>
+    <string name="select_segments_description">%1$s bevat meer dan één segment, je moet het noodzakelijke deel selecteren om te navigeren.</string>
+    <string name="segments_count">Segment %1$d</string>
+    <string name="hillshade_slope_contour_lines">Hillshade / Helling / Contourlijnen</string>
+    <string name="open_place_reviews_plugin_description">OpenPlaceReviews is een gemeenschaps gestuurd project over openbare plaatsen zoals restaurants, hotels, musea, way-points. Het verzamelt alle openbare informatie over hen, zoals foto\'s, recensies, links naar andere systemen die OpenStreetMap, Wikipedia linken.
+\n
+\nAlle OpenPlaceReview-gegevens zijn open en voor iedereen beschikbaar: http://openplacereviews.org/data.
+\n
+\nU kunt meer lezen op: http://openplacereviews.org</string>
+    <string name="open_place_reviews">OpenPlaceReviews</string>
+    <string name="opr_use_dev_url">Gebruik test.openplacereviews.org</string>
+    <string name="login_open_place_reviews">Inloggen op OpenPlaceReviews</string>
+    <string name="activity_type_water_name">Water</string>
+    <string name="activity_type_winter_name">Winter</string>
+    <string name="activity_type_snowmobile_name">Sneeuwscooter</string>
+    <string name="activity_type_riding_name">Rijden</string>
+    <string name="activity_type_racing_name">Racen</string>
+    <string name="activity_type_mountainbike_name">Mountainbike</string>
+    <string name="activity_type_cycling_name">Fietsen</string>
+    <string name="activity_type_hiking_name">Trektocht</string>
+    <string name="activity_type_running_name">Joggen</string>
+    <string name="activity_type_walking_name">Wandelen</string>
+    <string name="activity_type_offroad_name">Off-road</string>
+    <string name="activity_type_motorbike_name">Bromfiets</string>
+    <string name="activity_type_car_name">Auto\'s</string>
+    <string name="temporary_conditional_routing_descr">Gebruik de wegen beperkingen die nu actief zijn op de kaart</string>
+    <string name="routing_attr_short_way_description">Geoptimaliseerde kortere route (energiebesparing)</string>
+    <string name="routing_attr_driving_style_description">Selecteer een tussenpunt om een kortere, snellere of veiligere route te krijgen</string>
+    <string name="snap_to_road_descr">Het huidige locatiepictogram wordt vastgeklikt aan de huidige navigatieroute</string>
+    <string name="map_orientation_threshold_descr">Draai de kaartweergave niet als de snelheid lager is dan een drempelwaarde</string>
+    <string name="restart">Herstart</string>
+    <string name="shared_strings_all_regions">Alle regio\'s</string>
+    <string name="delete_number_files_question">Wis %1$d bestanden\?</string>
+    <string name="track_recording_stop_without_saving">Stop zonder opslaan</string>
+    <string name="track_recording_save_and_stop">Bewaar en stop de opname</string>
+    <string name="track_recording_title">Trackopname gestopt</string>
+    <string name="on_pause">Pauze</string>
+    <string name="app_restart_required">Herstarten van de applicatie is vereist om bepaalde instellingen toe te passen.</string>
+    <string name="routing_attr_height_obstacles_description">Routebepaling kan sterke hellingen vermijden.</string>
+    <string name="quick_action_coordinates_widget_descr">Een schuifschakelaar om de coördinaten-widget op de kaart weer te geven of te verbergen.</string>
+    <string name="map_widget_distance_by_tap">Afstand bij het tikken</string>
+    <string name="latest_openstreetmap_update">Nieuwste OpenStreetMap update beschikbaar:</string>
+    <string name="updated">Geüpdatet: %s</string>
+    <string name="last_time_checked">Laatste keer gecontroleerd: %s</string>
+    <string name="update_frequency">Update frequentie</string>
+    <string name="live_update_frequency_week_variant">Kaartupdates worden elke week gecontroleerd. Volgende keer %1$s over %2$s.</string>
+    <string name="live_update_frequency_day_variant">Kaartupdates worden elke dag gecontroleerd. Volgende keer %1$s over %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Kaartupdates worden elk uur gecontroleerd. Volgende keer %1$s over %2$s.</string>
+    <string name="delete_updates">Wis alle updates</string>
+    <string name="live_update_delete_updates_msg">Weet u zeker dat u alle %s live updates wilt verwijderen\?</string>
+    <string name="purchases">Aankopen</string>
+    <string name="select_category_descr">Selecteer een categorie of voeg een nieuwe toe</string>
+    <string name="track_recording_will_be_continued">De opname wordt voortgezet.</string>
+    <string name="copy_poi_name">Kopieer POI-naam</string>
+    <string name="quick_action_show_hide_title">Tonen/verbergen</string>
+    <string name="shared_string_interval">Interval</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Verberg natuurreservaten, beschermde gebieden en grenzen van nationale parken</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Natuurlijke grenzen</string>
+    <string name="track_has_no_altitude">De track bevat geen hoogtegegevens.</string>
+    <string name="track_has_no_speed">De track bevat geen snelheidsgegevens.</string>
+    <string name="select_another_colorization">Selecteer een ander inkleuring.</string>
 </resources>

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

@@ -3891,4 +3891,7 @@
     <string name="poi_gladed_yes">Satisfeito: sim</string>
     <string name="poi_piste_name">Nome da pista</string>
     <string name="poi_piste_ski_jump">Salto de esqui</string>
+    <string name="poi_conference_centre">Centro de conferências</string>
+    <string name="poi_local_ref">Geodesia</string>
+    <string name="poi_geodesist">Geodesia</string>
 </resources>

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

@@ -2204,7 +2204,6 @@
     <string name="route_altitude">Altitude da rota</string>
     <string name="routing_attr_relief_smoothness_factor_name">Selecionar a flutuação de altimetria</string>
     <string name="routing_attr_height_obstacles_name">Usar dados altimétricos</string>
-
     <string name="rendering_attr_depthContours_description">Mostrar curvas e pontos batimétricos.</string>
     <string name="rendering_attr_depthContours_name">Batimetria náutica</string>
     <string name="rendering_attr_contourDensity_description">Densidade das curvas de nível</string>
@@ -2802,7 +2801,7 @@
     <string name="show_along_the_route">Mostrar ao longo da rota</string>
     <string name="simulate_navigation">Simular navegação</string>
     <string name="choose_track_file_to_follow">Escolha o arquivo de trilha para seguir</string>
-    <string name="voice_announcements">Avisos por voz</string>
+    <string name="voice_announcements">Instruções de voz</string>
     <string name="intermediate_destinations">Destinos intermediários</string>
     <string name="arrive_at_time">Chega às %1$s</string>
     <string name="lang_gn_py">Guarani</string>
@@ -3159,7 +3158,7 @@
     <string name="shared_string_other">Outros</string>
     <string name="voice_announces_info">Anúncios de voz ocorrem apenas durante a navegação.</string>
     <string name="voice_announces_descr">Instruções e anúncios de navegação</string>
-    <string name="voice_announces">Avisos por voz</string>
+    <string name="voice_announces">Instruções de voz</string>
     <string name="route_parameters_descr">Configurar parâmetros de rota</string>
     <string name="route_parameters">Parâmetros de rota</string>
     <string name="application_profile_changed">Perfil do aplicativo alterado para \"%s\"</string>
@@ -4000,4 +3999,45 @@
     <string name="activity_type_walking_name">A pé</string>
     <string name="activity_type_offroad_name">Fora de estrada</string>
     <string name="activity_type_car_name">Carro</string>
+    <string name="select_segments">Selecionar os segmentos</string>
+    <string name="select_segments_description">%1$s contém mais de um segmento, você precisa selecionar a parte necessária para a navegação.</string>
+    <string name="temporary_conditional_routing_descr">Use as restrições de estrada que estão ativas agora no mapa</string>
+    <string name="routing_attr_short_way_description">Rota mais curta otimizada (economia de energia)</string>
+    <string name="routing_attr_driving_style_description">Selecione o propósito de condução para obter um trajeto mais curto, mais rápido ou mais seguro</string>
+    <string name="snap_to_road_descr">O ícone de localização atual será ajustado à rota de navegação atual</string>
+    <string name="map_orientation_threshold_descr">Não gire a visualização do mapa se a velocidade for inferior a um limite</string>
+    <string name="restart">Reiniciar</string>
+    <string name="shared_strings_all_regions">Todas as regiões</string>
+    <string name="delete_number_files_question">Excluir %1$d arquivos\?</string>
+    <string name="track_recording_stop_without_saving">Pare sem salvar</string>
+    <string name="track_recording_save_and_stop">Salvar e parar a gravação</string>
+    <string name="track_recording_title">Gravação de trilha interrompida</string>
+    <string name="track_recording_description">Tem certeza de que deseja interromper a gravação\?
+\nTodos os dados não salvos serão perdidos.</string>
+    <string name="on_pause">Em pausa</string>
+    <string name="app_restart_required">É necessário reiniciar o aplicativo para aplicar algumas configurações.</string>
+    <string name="routing_attr_height_obstacles_description">O roteamento pode evitar subidas fortes.</string>
+    <string name="quick_action_coordinates_widget_descr">Uma alternância para mostrar ou ocultar o widget de coordenadas no mapa.</string>
+    <string name="latest_openstreetmap_update">Última atualização do OpenStreetMap disponível:</string>
+    <string name="updated">Atualizado: %s</string>
+    <string name="last_time_checked">Última vez verificado: %s</string>
+    <string name="update_frequency">Frequência de atualização</string>
+    <string name="live_update_frequency_week_variant">As atualizações do mapa serão verificadas todas as semanas. Próxima vez %1$s em %2$s.</string>
+    <string name="live_update_frequency_day_variant">As atualizações do mapa serão verificadas todos os dias. Próxima vez %1$s em %2$s.</string>
+    <string name="live_update_frequency_hour_variant">As atualizações do mapa serão verificadas a cada hora. Da próxima vez, %1$s em %2$s.</string>
+    <string name="delete_updates">Apagar atualizações</string>
+    <string name="live_update_delete_updates_msg">Tem certeza de que deseja excluir todas as atualizações ao vivo de %s\?</string>
+    <string name="purchases">Compras</string>
+    <string name="select_category_descr">Selecione a categoria ou adicione uma nova</string>
+    <string name="track_recording_will_be_continued">A gravação continuará.</string>
+    <string name="copy_poi_name">Copiar nome de POI</string>
+    <string name="quick_action_show_hide_title">Mostrar/Ocultar</string>
+    <string name="shared_string_interval">Intervalo</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Ocultar reserva natural, áreas protegidas e limites de parque nacional</string>
+    <string name="map_widget_distance_by_tap">Distância por toque</string>
+    <string name="track_has_no_altitude">A trilha não contém dados de altitude.</string>
+    <string name="track_has_no_speed">A trilha não contém dados de velocidade.</string>
+    <string name="select_another_colorization">Selecione outro tipo de colorização.</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Limites naturais</string>
+    <string name="segments_count">Segmento %1$d</string>
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -467,7 +467,7 @@
     <string name="poi_information">Информация</string>
     <string name="poi_clock">Часы</string>
     <string name="poi_travel_agent">Турагентство;Туристическое агентство</string>
-    <string name="poi_viewpoint">Место с хорошим видом;Обзорная площадка</string>
+    <string name="poi_viewpoint">Обзорная площадка;Место с хорошим видом</string>
     <string name="poi_camp_site">Место для лагеря</string>
     <string name="poi_caravan_site">Ночлег</string>
     <string name="poi_picnic_site">Место для пикника</string>
@@ -1464,7 +1464,7 @@
     <string name="poi_memorial_plaque">Доска</string>
     <string name="poi_memorial_statue">Статуя</string>
     <string name="poi_memorial_stone">Камень</string>
-    <string name="poi_memorial_stele">Стелла</string>
+    <string name="poi_memorial_stele">Стела</string>
     <string name="poi_memorial_bust">Бюст</string>
     <string name="poi_memorial_blue_plaque">Синяя табличка</string>
     <string name="poi_memorial_jizo">Дзидзо</string>
@@ -2785,7 +2785,7 @@
     <string name="poi_organic_no">Отсутствуют</string>
     <string name="poi_organic_only">Исключительно</string>
     <string name="poi_traffic_mirror">Дорожное зеркало</string>
-    <string name="poi_diplomatic_filter">Вид</string>
+    <string name="poi_diplomatic_filter">Дипломатическое учреждение</string>
     <string name="poi_diplomatic_consulate">Консульство</string>
     <string name="poi_diplomatic_consulate_general">Генеральное консульство</string>
     <string name="poi_diplomatic_honorary_consulate">Почётное консульство</string>

OsmAnd/res/values-ru/strings.xml

@@ -139,7 +139,6 @@
     <string name="routing_attr_driving_style_name">Стиль езды</string>
     <string name="routing_attr_relief_smoothness_factor_name">Колебания высоты ландшафта</string>
     <string name="routing_attr_height_obstacles_name">Использовать данные о высотах</string>
-
     <string name="quick_action_duplicates">Действие переименовано в %1$s, чтобы избежать дублирования.</string>
     <string name="quick_action_duplicate">Обнаружен дубликат имени</string>
     <string name="quick_action_showhide_favorites_descr">Переключатель, чтобы показать или скрыть избранные точки на карте.</string>
@@ -3438,7 +3437,7 @@
     <string name="restore_all_profile_settings">Восстановить все настройки профиля\?</string>
     <string name="saving_new_profile">Сохранение нового профиля</string>
     <string name="profile_backup_failed">Не удалось создать резервную копию профиля.</string>
-    <string name="clear_recorded_data_warning">Очистить записанные данные\?</string>
+    <string name="clear_recorded_data_warning">Вы уверены, что хотите очистить записанные данные\?</string>
     <string name="monitoring_min_speed_descr_side_effect">Побочный эффект: в треке будут отсутствовать все участки, где не соблюдён критерий минимальной скорости (например где вы толкаете велосипед вверх по крутому склону). Также не будет информации о периодах покоя, например во время отдыха. Это влияет на любой анализ или последующую обработку, например при попытке определить общую продолжительность поездки, время в движении или среднюю скорость.</string>
     <string name="monitoring_min_accuracy_descr_side_effect">Побочный эффект: в результате фильтрации по точности, точки могут быть полностью пропущены, например, под мостами, под деревьями, между высокими зданиями или при определённых погодных условиях.</string>
     <string name="monitoring_min_accuracy_descr_remark">Примечание: при включении GPS непосредственно перед записью точность определения первой точки может быть снижена, поэтому мы рассматриваем добавление секундной задержки перед записью точки (либо записи лучшей из трёх последовательных точек и т. д.), но пока это не реализовано.</string>
@@ -3725,7 +3724,7 @@
     <string name="route_between_points_warning_desc">Далее необходимо выбрать профиль навигации для определения порогового расстояния и привязки маршрута к ближайшей разрешённой дороге.</string>
     <string name="route_between_points_desc">Выберите, как соединять точки: прямой линией или строить маршрут по заданному профилю.</string>
     <string name="in_case_of_reverse_direction">При обратном направлении</string>
-    <string name="plan_route_exit_dialog_descr">Все изменения будут утеряны.</string>
+    <string name="plan_route_exit_dialog_descr">Вы уверены, что хотите отменить все изменения в запланированном маршруте\?</string>
     <string name="street_level_imagery">Уличная фотосъёмка</string>
     <string name="shared_string_save_as_gpx">Сохранить как новый файл трека</string>
     <string name="add_segment_to_the_track">Добавить в файл трека</string>
@@ -3903,7 +3902,7 @@
 \n
 \n• Добавлен OAuth метод аутентификации для OpenStreetMap, улучшен интерфейс диалоговых OSM.
 \n
-\n • Поддержка пользовательских цветов для избранного и путевых точек трека.
+\n• Поддержка пользовательских цветов для избранных и путевых точек.
 \n
 \n</string>
     <string name="copy_address">Скопировать адрес</string>
@@ -3999,4 +3998,49 @@
 \n
 \nВы можете узнать больше на: http://openplacereviews.org</string>
     <string name="activity_type_racing_name">Гонки</string>
+    <string name="app_restart_required">Для применения некоторых настроек необходимо перезапустить приложение.</string>
+    <string name="map_widget_distance_by_tap">Расстояние по нажатию</string>
+    <string name="latest_openstreetmap_update">Последнее доступное обновление OpenStreetMap:</string>
+    <string name="updated">Обновлено: %s</string>
+    <string name="last_time_checked">Последний раз проверено: %s</string>
+    <string name="update_frequency">Частота обновления</string>
+    <string name="live_update_frequency_week_variant">Обновления карт будут проверяться каждую неделю. В следующий раз %1$s в %2$s.</string>
+    <string name="live_update_frequency_day_variant">Обновления карт будут проверяться каждый день. Следующий раз %1$s в %2$s.</string>
+    <string name="live_update_frequency_hour_variant">Обновления карт будут проверяться каждый час. Следующий раз %1$s в %2$s.</string>
+    <string name="delete_updates">Удалить обновления</string>
+    <string name="live_update_delete_updates_msg">Вы уверены, что хотите удалить все live обновления для %s\?</string>
+    <string name="purchases">Покупки</string>
+    <string name="quick_action_show_hide_title">Показать/скрыть</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_name">Природные границы</string>
+    <string name="track_has_no_altitude">Трек не содержит данных о высоте.</string>
+    <string name="track_has_no_speed">Трек не содержит данных о скорости.</string>
+    <string name="select_another_colorization">Выберите другой тип окраски.</string>
+    <string name="snap_to_road_descr">Значок текущего местоположения будет привязан к маршруту навигации</string>
+    <string name="track_recording_will_be_continued">Запись будет продолжена.</string>
+    <string name="select_segments">Выберите сегменты</string>
+    <string name="select_segments_description">%1$s содержит более одного сегмента, необходимо выбрать нужную часть для навигации.</string>
+    <string name="segments_count">Сегмент %1$d</string>
+    <string name="temporary_conditional_routing_descr">Использовать дорожные ограничения, которые сейчас активны на карте</string>
+    <string name="routing_attr_short_way_description">Оптимизированный более короткий маршрут (экономия топлива/энергии)</string>
+    <string name="map_orientation_threshold_descr">Не менять ориентацию карты, если скорость меньше порогового значения</string>
+    <string name="restart">Перезапустить</string>
+    <string name="shared_strings_all_regions">Все регионы</string>
+    <string name="track_recording_stop_without_saving">Остановить без сохранения</string>
+    <string name="track_recording_save_and_stop">Сохранить и остановить запись</string>
+    <string name="track_recording_title">Запись трека остановлена</string>
+    <string name="track_recording_description">Вы уверены, что хотите остановить запись\?
+\nВсе несохраненные данные будут потеряны.</string>
+    <string name="on_pause">На паузе</string>
+    <string name="routing_attr_height_obstacles_description">Позволяет избегать больших подъемов при навигации.</string>
+    <string name="quick_action_coordinates_widget_descr">Переключатель для отображения или скрытия виджета координат.</string>
+    <string name="select_category_descr">Выберите категорию или добавьте новую</string>
+    <string name="copy_poi_name">Копировать имя POI</string>
+    <string name="shared_string_interval">Интервал</string>
+    <string name="rendering_attr_noNatureReserveBoundaries_description">Скрыть природный заповедник, особо охраняемые природные территории и границы национального парка</string>
+    <string name="gpx_upload_trackable_visibility_descr">«Отслеживаемый» означает, что трек не будет виден в любых общедоступных списках, но обработанные точки c отметками времени из него будут доступны через public GPS API (при этом трек не будет ассоциирован с вами). Другие пользователи смогут лишь загружать обработанные точки из вашего трека.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">«Идентифицируемый» означает, что трек будет виден всем в разделе треки пользователя, загрузившего трек и в общем списке треков, доступном на странице GPS-треки. Другие пользователи смогут загрузить данные трека и в свойствах трека будет указано имя пользователя, загрузившего трек. Отметки времени точек трека доступны через public GPS API будут ссылаться на страницу с вашим оригинальным треком.</string>
+    <string name="gpx_upload_public_visibility_descr">«Общедоступный» означает, что трек будет виден всем в разделе треки пользователя, загрузившего трек и в общем списке треков, доступном на странице GPS-треки. Отметки времени точек трека не доступны через public GPS API. Однако, другие пользователи по-прежнему могут загрузить файл трека из общего списка треков и данные трека будут иметь все отметки времени.</string>
+    <string name="gpx_upload_private_visibility_descr">«Частный» означает, что трек не будет виден в любых общедоступных списках, но точки из него будут доступны через public GPS API без отметок времени.</string>
+    <string name="routing_attr_driving_style_description">Выберите цель, чтобы проложить к ней короткий, быстрый или безопасный маршрут</string>
+    <string name="delete_number_files_question">Удалить %1$d файлов\?</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3891,4 +3891,7 @@
     <string name="poi_gladed_yes">Cun àrbores: eja</string>
     <string name="poi_piste_name">Nùmene de sa pista</string>
     <string name="poi_piste_ski_jump">Brincu cun sos iscì</string>
+    <string name="poi_local_ref">Riferimentu locale</string>
+    <string name="poi_geodesist">Geodesista</string>
+    <string name="poi_conference_centre">Tzentru pro cunferèntzias</string>
 </resources>