Merge pull request #10254 from osmandapp/master

update test branch

OsmAnd-java/src/main/java/com/google/protobuf/ByteString.java

@@ -800,7 +800,7 @@ public abstract class ByteString implements Iterable<Byte> {
         // Copy the information we need into local variables so as to hold
         // the lock for as short a time as possible.
         cachedFlushBuffers =
-            flushedBuffers.toArray(new ByteString[flushedBuffers.size()]);
+            flushedBuffers.toArray(new ByteString[0]);
         cachedBuffer = buffer;
         cachedBufferPos = bufferPos;
       }

OsmAnd-java/src/main/java/com/google/protobuf/FieldSet.java

@@ -242,8 +242,7 @@ final class FieldSet<FieldDescriptorType extends
 
       // Wrap the contents in a new list so that the caller cannot change
       // the list's contents after setting it.
-      final List newList = new ArrayList();
-      newList.addAll((List) value);
+      final List newList = new ArrayList((List) value);
       for (final Object element : newList) {
         verifyType(descriptor.getLiteType(), element);
       }

OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/JtsAdapter.java

@@ -345,7 +345,6 @@ public final class JtsAdapter {
             for(int i = 0; i < geom.getNumGeometries(); ++i) {
 
                 final Polygon nextPoly = (Polygon) geom.getGeometryN(i);
-                final List<Integer> nextPolyGeom = new ArrayList<>();
                 boolean valid = true;
 
                 // Add exterior ring
@@ -362,7 +361,7 @@ public final class JtsAdapter {
                     CoordinateArrays.reverse(exteriorRing.getCoordinates());
                 }
 
-                nextPolyGeom.addAll(linesToGeomCmds(exteriorRing, mvtClosePath, cursor, 2));
+                final List<Integer> nextPolyGeom = new ArrayList<>(linesToGeomCmds(exteriorRing, mvtClosePath, cursor, 2));
 
 
                 // Add interior rings

OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/MvtReader.java

@@ -322,7 +322,7 @@ public final class MvtReader {
             geoms.add(geomFactory.createLineString(nextCoordSeq));
         }
 
-        return geoms.size() == 1 ? geoms.get(0) : geomFactory.createMultiLineString(geoms.toArray(new LineString[geoms.size()]));
+        return geoms.size() == 1 ? geoms.get(0) : geomFactory.createMultiLineString(geoms.toArray(new LineString[0]));
     }
 
     /**
@@ -450,7 +450,7 @@ public final class MvtReader {
             return polygons.get(0);
 
         } else {
-            return geomFactory.createMultiPolygon(polygons.toArray(new Polygon[polygons.size()]));
+            return geomFactory.createMultiPolygon(polygons.toArray(new Polygon[0]));
         }
     }
 
@@ -512,7 +512,7 @@ public final class MvtReader {
 
                 if (area > 0d) {
                     if (outerPoly != null) {
-                        polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
+                        polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[0])));
                         holes.clear();
                     }
 
@@ -533,7 +533,7 @@ public final class MvtReader {
 
             if (outerPoly != null) {
                 holes.toArray();
-                polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
+                polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[0])));
             }
 
             return polygons;
@@ -569,7 +569,7 @@ public final class MvtReader {
 
                 if (outerPoly == null || (outerArea < 0 == area < 0)) {
                     if (outerPoly != null) {
-                        polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
+                        polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[0])));
                         holes.clear();
                     }
 
@@ -590,7 +590,7 @@ public final class MvtReader {
 
             if (outerPoly != null) {
                 holes.toArray();
-                polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[holes.size()])));
+                polygons.add(geomFactory.createPolygon(outerPoly, holes.toArray(new LinearRing[0])));
             }
 
             return polygons;

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

@@ -1247,7 +1247,7 @@ public class GPXUtilities {
 					}
 				}
 			}
-			g.prepareInformation(fileTimestamp, splitSegments.toArray(new SplitSegment[splitSegments.size()]));
+			g.prepareInformation(fileTimestamp, splitSegments.toArray(new SplitSegment[0]));
 			return g;
 		}
 

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

@@ -68,7 +68,7 @@ public class TspHeldKarp {
 					}
 					break;
 				}
-				System.err.printf(".");
+				System.err.print(".");
 				PriorityQueue<Node> children = new PriorityQueue<Node>(11, new NodeComparator());
 				children.add(exclude(currentNode, i, currentNode.parent[i]));
 				for (int j = 0; j < n; j++) {

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

@@ -2501,8 +2501,9 @@ public class BinaryMapIndexReader {
 				}
 			}
 		}
-		for (MapObject e : resMap.keySet()) {
-			Street s = resMap.get(e);
+		for (Entry<MapObject, Street> entry : resMap.entrySet()) {
+			MapObject e = entry.getKey();
+			Street s = entry.getValue();
 			if (e instanceof Building && MapUtils.getDistance(e.getLocation(), lat, lon) < 40) {
 				Building b = (Building) e;
 				System.out.println(b.getName() + "   " + s);

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

@@ -241,9 +241,7 @@ public class CachedOsmandIndexes {
 				cblock.type = mr.getType();
 				mi.cities.add(cblock);
 			}
-			for(String s : index.getAdditionalTagsList()) {
-				mi.attributeTagsTable.add(s);
-			}
+			mi.attributeTagsTable.addAll(index.getAdditionalTagsList());
 			reader.addressIndexes.add(mi);
 			reader.indexes.add(mi);
 		}

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

@@ -329,7 +329,7 @@ public class RouteDataObject {
 	public String getDestinationName(String lang, boolean transliterate, boolean direction){
 		//Issue #3289: Treat destination:ref like a destination, not like a ref
 		String destRef = ((getDestinationRef(direction) == null) || getDestinationRef(direction).equals(getRef(lang, transliterate, direction))) ? "" : getDestinationRef(direction);
-		String destRef1 = ("".equals(destRef)) ? "" : destRef + ", ";
+		String destRef1 = Algorithms.isEmpty(destRef) ? "" : destRef + ", ";
 
 		if(names != null) {
 			int[] kt = names.keys();
@@ -373,7 +373,7 @@ public class RouteDataObject {
 				return destRef1 + ((transliterate) ? TransliterationHelper.transliterate(destinationDefault) : destinationDefault);
 			}
 		}
-		return "".equals(destRef) ? null : destRef;
+		return Algorithms.isEmpty(destRef) ? null : destRef;
 	}
 
 	public int getPoint31XTile(int i) {

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

@@ -61,9 +61,9 @@ public class Multipolygon {
 					innerLinearRings.add(innerRing.toLinearRing());
 				}
 			}
-			polygons.add(geometryFactory.createPolygon(outerRing.toLinearRing(), innerLinearRings.toArray(new LinearRing[innerLinearRings.size()])));
+			polygons.add(geometryFactory.createPolygon(outerRing.toLinearRing(), innerLinearRings.toArray(new LinearRing[0])));
 		}
-		return geometryFactory.createMultiPolygon(polygons.toArray(new Polygon[polygons.size()]));
+		return geometryFactory.createMultiPolygon(polygons.toArray(new Polygon[0]));
 	}
 
 	public long getId() {

OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java

@@ -140,7 +140,7 @@ public class TileSourceManager {
 					}
 				}
 			}
-			return randoms.toArray(new String[randoms.size()]);
+			return randoms.toArray(new String[0]);
 		}
 
 		public void setMinZoom(int minZoom) {
@@ -518,8 +518,8 @@ public class TileSourceManager {
 		}
 		if (override || !metainfo.exists()) {
 			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(metainfo)));
-			for (String key : properties.keySet()) {
-				writer.write("[" + key + "]\n" + properties.get(key) + "\n");
+			for (Map.Entry<String, String> entry : properties.entrySet()) {
+				writer.write("[" + entry.getKey() + "]\n" + entry.getValue() + "\n");
 			}
 			writer.close();
 		}

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

@@ -96,8 +96,9 @@ public abstract class MapRenderingTypes {
 		Map<String, String> common = new HashMap<String, String>();
 		String ATTACHED_KEY = "seamark:attached";
 		String type = "";
-		for (String s : tags.keySet()) {
-			String value = tags.get(s);
+		for (Entry<String, String> entry : tags.entrySet()) {
+			String s = entry.getKey();
+			String value = entry.getValue();
 			if (s.equals("seamark:type")) {
 				type = value;
 				common.put(ATTACHED_KEY, openSeaType(value));

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

@@ -33,9 +33,10 @@ public class EntityParser {
 		if (mo.getEnName(false).length() == 0) {
 			mo.setEnName(tags.get(OSMTagKey.NAME_EN.getValue()));
 		}
-		for (String ts : tags.keySet()) {
+		for (Map.Entry<String, String> entry : tags.entrySet()) {
+			String ts = entry.getKey();
 			if (ts.startsWith("name:") && !ts.equals(OSMTagKey.NAME_EN.getValue())) {
-				mo.setName(ts.substring(("name:").length()), tags.get(ts));
+				mo.setName(ts.substring(("name:").length()), entry.getValue());
 			}
 		}
 		if (mo.getName().length() == 0) {

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

@@ -63,8 +63,8 @@ public class NetworkUtils {
 		URL url;
 		try {
 			boolean firstPrm =!urlText.contains("?");
-			for (String key : additionalMapData.keySet()) {
-				urlText += (firstPrm ? "?" : "&") + key + "=" + URLEncoder.encode(additionalMapData.get(key), "UTF-8");
+			for (Map.Entry<String, String> entry : additionalMapData.entrySet()) {
+				urlText += (firstPrm ? "?" : "&") + entry.getKey() + "=" + URLEncoder.encode(entry.getValue(), "UTF-8");
 				firstPrm = false;
 			}
 			log.info("Start uploading file to " + urlText + " " +fileToUpload.getName());

OsmAnd-java/src/main/java/net/osmand/osm/oauth/OsmOAuthAuthorizationClient.java

@@ -25,16 +25,16 @@ public class OsmOAuthAuthorizationClient {
     private final OsmAndJDKHttpClient httpClient;
     public final static Log log = PlatformUtil.getLog(OsmOAuthAuthorizationClient.class);
 
-    public OsmOAuthAuthorizationClient(String key, String secret) {
+    public OsmOAuthAuthorizationClient(String key, String secret, DefaultApi10a api) {
         httpClient = new OsmAndJDKHttpClient(JDKHttpClientConfig.defaultConfig());
         service = new ServiceBuilder(key)
                 .apiSecret(secret)
                 .httpClient(httpClient)
                 .callback("osmand-oauth://example.com/oauth")
-                .build(new OsmApi());
+                .build(api);
     }
 
-    static class OsmApi extends DefaultApi10a {
+    public static class OsmApi extends DefaultApi10a {
         @Override
         public OAuth1SignatureType getSignatureType() {
             return OAuth1SignatureType.QUERY_STRING;
@@ -56,6 +56,28 @@ public class OsmOAuthAuthorizationClient {
         }
     }
 
+    public static class OsmDevApi extends DefaultApi10a {
+        @Override
+        public OAuth1SignatureType getSignatureType() {
+            return OAuth1SignatureType.QUERY_STRING;
+        }
+
+        @Override
+        public String getRequestTokenEndpoint() {
+            return "https://master.apis.dev.openstreetmap.org/oauth/request_token";
+        }
+
+        @Override
+        public String getAccessTokenEndpoint() {
+            return "https://master.apis.dev.openstreetmap.org/oauth/access_token";
+        }
+
+        @Override
+        protected String getAuthorizationBaseUrl() {
+            return "https://master.apis.dev.openstreetmap.org/oauth/authorize";
+        }
+    }
+
     public OsmAndJDKHttpClient getHttpClient() {
         return httpClient;
     }

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

@@ -70,7 +70,7 @@ public class RenderingRule {
 				i++;
 			}
 		}
-		properties = props.toArray(new RenderingRuleProperty[props.size()]);
+		properties = props.toArray(new RenderingRuleProperty[0]);
 	}
 	
 	private int getPropertyIndex(String property){

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

@@ -318,7 +318,7 @@ public class RenderingRuleStorageProperties {
 	}
 	
 	public RenderingRuleProperty[] getPoperties() {
-		return rules.toArray(new RenderingRuleProperty[rules.size()]);
+		return rules.toArray(new RenderingRuleProperty[0]);
 	}
 	
 	public List<RenderingRuleProperty> getCustomRules() {

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

@@ -432,8 +432,7 @@ public class RenderingRulesStorage {
 				for(RenderingRule ch : caseChildren) {
 					List<RenderingRule> apply = applyRules;
 					if(!renderingRule.getIfChildren().isEmpty()) {
-						apply = new ArrayList<RenderingRule>();
-						apply.addAll(renderingRule.getIfChildren());
+						apply = new ArrayList<>(renderingRule.getIfChildren());
 						if(applyRules != null) {
 							apply.addAll(applyRules);
 						}
@@ -492,10 +491,10 @@ public class RenderingRulesStorage {
 	}
 	
 	public String[] getRenderingAttributeNames() {
-		return renderingAttributes.keySet().toArray(new String[renderingAttributes.size()]);
+		return renderingAttributes.keySet().toArray(new String[0]);
 	}
 	public RenderingRule[] getRenderingAttributeValues() {
-		return renderingAttributes.values().toArray(new RenderingRule[renderingAttributes.size()]);
+		return renderingAttributes.values().toArray(new RenderingRule[0]);
 	}
 	
 	public RenderingRule[] getRules(int state){

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

@@ -152,9 +152,9 @@ public class RenderingRulesStoragePrinter {
 		for (int i = 0; i < 15; i++) {
 			out.println("" + indent + ti + "RenderingRule rule" + i + " = null;");
 		}
-		for (String s : storage.renderingAttributes.keySet()) {
-			generateRenderingRule(storage, out, indent + ti, "rule", 0, storage.renderingAttributes.get(s));
-			out.println("" + indent + ti + "storage.renderingAttributes.put(" + javaString(s) + ", rule0);");
+		for (Entry<String, RenderingRule> entry : storage.renderingAttributes.entrySet()) {
+			generateRenderingRule(storage, out, indent + ti, "rule", 0, entry.getValue());
+			out.println("" + indent + ti + "storage.renderingAttributes.put(" + javaString(entry.getKey()) + ", rule0);");
 		}
 		out.println(""+indent +"}");
 	}
@@ -221,7 +221,7 @@ public class RenderingRulesStoragePrinter {
 				mp+=", ";
 			}
 		}
-		if(mp.equals("")) {
+		if(mp.isEmpty()) {
 			mp = "java.util.Collections.EMPTY_MAP";
 		} else {
 			mp = "createMap(" +mp +")";
@@ -242,9 +242,9 @@ public class RenderingRulesStoragePrinter {
 
 	private void printJavaInitConstants(RenderingRulesStorage storage, PrintStream out, String indent, String ti) {
 		out.println("\n" + indent + "public void initConstants() {");
-		for (String s : storage.renderingConstants.keySet()) {
-			out.println("" + indent + ti + "storage.renderingConstants.put(" + javaString(s) + ", "
-					+ javaString(storage.renderingConstants.get(s)) + ");");
+		for (Entry<String, String> entry : storage.renderingConstants.entrySet()) {
+			out.println("" + indent + ti + "storage.renderingConstants.put(" + javaString(entry.getKey()) + ", "
+					+ javaString(entry.getValue()) + ");");
 		}
 		out.println(""+indent +"}");
 	}

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

@@ -80,7 +80,7 @@ public class RenderingRulesTransformer {
 		for (int i = 0; i < nl.getLength();) {
 			Element app = (Element) nl.item(i);
 			String pt = app.getAttribute("pattern");
-			if (!pt.equals("")) {
+			if (!pt.isEmpty()) {
 				if (!patterns.containsKey(pt)) {
 					throw new IllegalStateException("Pattern '" + pt + "' is not defined");
 				}

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

@@ -754,21 +754,21 @@ public class GeneralRouter implements VehicleRouter {
 		}
 		
 		public RouteAttributeEvalRule[] getRules() {
-			return rules.toArray(new RouteAttributeEvalRule[rules.size()]);
+			return rules.toArray(new RouteAttributeEvalRule[0]);
 		}
 		
 		public String[] getParamKeys() {
 			if(paramContext == null) {
 				return new String[0];
 			}
-			return paramContext.vars.keySet().toArray(new String[paramContext.vars.size()]);
+			return paramContext.vars.keySet().toArray(new String[0]);
 		}
 		
 		public String[] getParamValues() {
 			if(paramContext == null) {
 				return new String[0];
 			}
-			return paramContext.vars.values().toArray(new String[paramContext.vars.size()]);
+			return paramContext.vars.values().toArray(new String[0]);
 		}
 		
 		private Object evaluate(RouteDataObject ro) {
@@ -988,19 +988,19 @@ public class GeneralRouter implements VehicleRouter {
 		
 		
 		public RouteAttributeExpression[] getExpressions() {
-			return expressions.toArray(new RouteAttributeExpression[expressions.size()]);
+			return expressions.toArray(new RouteAttributeExpression[0]);
 		}
 		
 		public String[] getParameters() {
-			return parameters.toArray(new String[parameters.size()]);
+			return parameters.toArray(new String[0]);
 		}
 		
 		public String[] getTagValueCondDefTag() {
-			return tagValueCondDefTag.toArray(new String[tagValueCondDefTag.size()]);
+			return tagValueCondDefTag.toArray(new String[0]);
 		}
 		
 		public String[] getTagValueCondDefValue() {
-			return tagValueCondDefValue.toArray(new String[tagValueCondDefValue.size()]);
+			return tagValueCondDefValue.toArray(new String[0]);
 		}
 		
 		public boolean[] getTagValueCondDefNot() {

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

@@ -918,7 +918,7 @@ public class RoutePlannerFrontEnd {
 
 	private List<RouteSegmentResult> runNativeRouting(final RoutingContext ctx, RouteSegment recalculationEnd) throws IOException {
 		refreshProgressDistance(ctx);
-		RouteRegion[] regions = ctx.reverseMap.keySet().toArray(new BinaryMapRouteReaderAdapter.RouteRegion[ctx.reverseMap.size()]);
+		RouteRegion[] regions = ctx.reverseMap.keySet().toArray(new RouteRegion[0]);
 		ctx.checkOldRoutingFiles(ctx.startX, ctx.startY);
 		ctx.checkOldRoutingFiles(ctx.targetX, ctx.targetY);
 

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

@@ -1717,7 +1717,7 @@ public class RouteResultPreparation {
 				}
 			}
 		}
-		Integer[] array = possibleTurns.toArray(new Integer[possibleTurns.size()]);
+		Integer[] array = possibleTurns.toArray(new Integer[0]);
 		Arrays.sort(array, new Comparator<Integer>() {
 
 			@Override

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

@@ -802,7 +802,7 @@ public class RoutingContext {
 	}
 	
 	public BinaryMapIndexReader[] getMaps() {
-		return map.keySet().toArray(new BinaryMapIndexReader[map.size()]);
+		return map.keySet().toArray(new BinaryMapIndexReader[0]);
 	}
 
 	public int getVisitedSegments() {

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

@@ -325,9 +325,7 @@ public class TransportStopsRouteReader {
 			// merge first part
 			if (commonStopFirst < commonStopSecond
 					|| (commonStopFirst == commonStopSecond && firstSegment.get(0).isMissingStop())) {
-				for (int i = 0; i <= commonStopFirst; i++) {
-					firstSegment.remove(0);
-				}
+				firstSegment.subList(0, commonStopFirst + 1).clear();
 				for (int i = commonStopSecond; i >= 0; i--) {
 					firstSegment.add(0, segmentToMerge.get(i));
 				}

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

@@ -720,7 +720,7 @@ public class SearchPhrase {
                 if (result.containsKey(currRegionName)) {
                     result.get(currRegionName).add(r);
                 } else {
-                    result.put(currRegionName, new ArrayList<>(Arrays.asList(r)));
+                    result.put(currRegionName, new ArrayList<>(Collections.singletonList(r)));
                 }
                 it.remove();
             }

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

@@ -62,7 +62,7 @@ public class GeoPointParserUtil {
 
 	private static Map<String, String> getQueryParameters(String query) {
 		final LinkedHashMap<String, String> map = new LinkedHashMap<String, String>();
-		if (query != null && !query.equals("")) {
+		if (query != null && !query.isEmpty()) {
 			String[] params = query.split("[&/]");
 			for (String p : params) {
 				String[] keyValue = p.split("=");
@@ -803,10 +803,10 @@ public class GeoPointParserUtil {
 				if (map.size() > 0)
 					uriString += "?";
 				int i = 0;
-				for (String key : map.keySet()) {
+				for (Map.Entry<String, String> entry : map.entrySet()) {
 					if (i > 0)
 						uriString += "&";
-					uriString += key + "=" + map.get(key);
+					uriString += entry.getKey() + "=" + entry.getValue();
 					i++;
 				}
 				return uriString;

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

@@ -6,6 +6,7 @@ import java.text.DateFormatSymbols;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -1812,7 +1813,7 @@ public class OpeningHoursParser {
 		TokenType currentParse = TokenType.TOKEN_UNKNOWN;
 		TokenType currentParseParent = TokenType.TOKEN_UNKNOWN;
 		List<Token[]> listOfPairs = new ArrayList<>();
-		Set<TokenType> presentTokens = new HashSet<>();
+		Set<TokenType> presentTokens = EnumSet.noneOf(TokenType.class);
 		Token[] currentPair = new Token[2];
 		listOfPairs.add(currentPair);
 		Token prevToken = null;

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

@@ -267,4 +267,8 @@
     <string name="last_response_date">Последњи одговор: %1$</string>
     <string name="last_update_from_telegram_date">Последње ажурирање из Телеграма: %1$</string>
     <string name="shared_string_error_short">Грешка</string>
+    <string name="shared_string_export">Извези</string>
+    <string name="logcat_buffer">Logcat бафер</string>
+    <string name="logcat_buffer_descr">Проверите и поделите детаљне записе апликације</string>
+    <string name="send_report">Пошаљи извештај</string>
 </resources>

OsmAnd/build.gradle

@@ -198,8 +198,6 @@ android {
 	buildTypes {
 		debug {
 			buildConfigField "String", "OPR_BASE_URL", "\"https://test.openplacereviews.org/\""
-			buildConfigField "String", "OSM_OAUTH_CONSUMER_KEY", "\"Ti2qq3fo4i4Wmuox3SiWRIGq3obZisBHnxmcM05y\""
-			buildConfigField "String", "OSM_OAUTH_CONSUMER_SECRET", "\"lxulb3HYoMmd2cC4xxNe1dyfRMAY8dS0eNihJ0DM\""
 			signingConfig signingConfigs.development
 			debuggable false
 			jniDebuggable false
@@ -207,8 +205,6 @@ android {
 		}
 		release {
 			buildConfigField "String", "OPR_BASE_URL", "\"https://test.openplacereviews.org/\""
-			buildConfigField "String", "OSM_OAUTH_CONSUMER_KEY", "\"Ti2qq3fo4i4Wmuox3SiWRIGq3obZisBHnxmcM05y\""
-			buildConfigField "String", "OSM_OAUTH_CONSUMER_SECRET", "\"lxulb3HYoMmd2cC4xxNe1dyfRMAY8dS0eNihJ0DM\""
 			signingConfig signingConfigs.publishing
 		}
 	}

OsmAnd/res/layout/custom_radio_buttons.xml

@@ -4,7 +4,8 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/custom_radio_buttons"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/dialog_button_height"
+	android:minHeight="@dimen/dialog_button_height"
+	android:layout_height="wrap_content"
 	android:layout_marginStart="@dimen/content_padding"
 	android:layout_marginEnd="@dimen/content_padding"
 	android:background="?attr/btn_bg_border_inactive"
@@ -25,27 +26,18 @@
 			android:background="?attr/selectableItemBackground"
 			android:gravity="center"
 			android:textSize="@dimen/default_desc_text_size"
+			android:textColor="@drawable/radio_flat_text_selector_light"
 			osmand:typeface="@string/font_roboto_medium"
 			tools:text="@string/shared_string_left"/>
 
 	</FrameLayout>
 
 	<FrameLayout
-		android:id="@+id/center_button_container"
-		android:layout_width="0dp"
+		android:id="@+id/buttons_divider"
+		android:layout_width="1dp"
 		android:layout_height="match_parent"
-		android:layout_weight="1"
-		android:visibility="gone">
-
-		<net.osmand.plus.widgets.TextViewEx
-			android:id="@+id/center_button"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:background="?attr/selectableItemBackground"
-			android:gravity="center"
-			android:textSize="@dimen/default_desc_text_size"
-			osmand:typeface="@string/font_roboto_medium"
-			tools:text="@string/position_on_map_center"/>
+		android:layout_weight="0"
+		android:background="?attr/divider_color">
 
 	</FrameLayout>
 
@@ -61,8 +53,9 @@
 			android:layout_height="match_parent"
 			android:background="?attr/selectableItemBackground"
 			android:gravity="center"
-			android:textSize="@dimen/default_desc_text_size"
+			android:textColor="@drawable/radio_flat_text_selector_light"
 			osmand:typeface="@string/font_roboto_medium"
+			android:textSize="@dimen/default_desc_text_size"
 			tools:text="@string/shared_string_right"/>
 
 	</FrameLayout>

OsmAnd/res/layout/fragment_measurement_tool.xml

@@ -30,20 +30,21 @@
         <RelativeLayout
             android:id="@+id/up_down_row"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/measurement_tool_up_down_row_height"
+            android:layout_height="wrap_content"
+            android:minHeight="112dp"
             android:background="?attr/selectableItemBackground">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/main_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
-                android:layout_marginRight="@dimen/measurement_tool_text_button_padding"
+                android:layout_alignParentLeft="true"
                 android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
+                android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
+                android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
+                android:layout_marginEnd="@dimen/measurement_tool_text_button_padding"
+                android:layout_marginRight="@dimen/measurement_tool_text_button_padding"
                 android:background="@null"
                 tools:src="@drawable/ic_action_ruler" />
 
@@ -53,7 +54,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
+                android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
                 android:layout_marginEnd="@dimen/bottom_sheet_content_margin"
                 android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
                 android:layout_marginRight="@dimen/bottom_sheet_content_margin"
@@ -128,6 +129,17 @@
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
                 android:visibility="gone"
                 tools:text="@string/add_point_after"/>
+
+            <include
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/measurement_tool_button_height"
+                android:layout_below="@id/distance_to_center_text_view"
+                android:layout_marginTop="@dimen/content_padding_half"
+                android:layout_marginBottom="@dimen/measurement_tool_content_padding_medium"
+                android:layout_marginStart="@dimen/content_padding"
+                android:layout_marginEnd="@dimen/content_padding"
+                layout="@layout/custom_radio_buttons" />
+
         </RelativeLayout>
 
         <LinearLayout
@@ -137,8 +149,6 @@
             android:orientation="vertical"
             android:visibility="gone" >
 
-            <include layout="@layout/custom_radio_buttons" />
-
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/content_padding_small" />
@@ -150,6 +160,11 @@
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider" />
+
         <LinearLayout
             android:id="@+id/measure_mode_controls"
             android:layout_width="match_parent"

OsmAnd/res/values-ca/strings.xml

@@ -89,7 +89,7 @@
     <string name="map_online_data_descr">Utilitza mapes en línia (les tessel·les es baixen i es desen a la tarja de memòria).</string>
     <string name="shared_string_online_maps">Mapes en línia</string>
     <string name="online_map_settings_descr">Seleccioneu les fonts de mapes de tessel·les en línia o a la memòria cau.</string>
-    <string name="osmand_accessibility_description">"Fa disponible directament des OsmAnd  les característiques d\'accessibilitat del dispositiu. Us permet, per exemple,  ajustar la velocitat de la veu sintetitzada, configurar la navegació amb cursors, utilitzant un ratolí de bola per controlar el zoom o rebre notificacions amb veu sintetitzada, per exemple per anunciar automàticament la vostra posició."</string>
+    <string name="osmand_accessibility_description">Fa disponible directament des OsmAnd les característiques d\'accessibilitat del dispositiu. Us permet, per exemple, ajustar la velocitat de la veu sintetitzada, configurar la navegació amb cursors, utilitzant un ratolí de bola per controlar el zoom o rebre notificacions amb veu sintetitzada, per exemple per anunciar automàticament la vostra posició.</string>
     <string name="plugins_screen">Gestor de connectors</string>
     <string name="poi_search_desc">Cerca de PDI (punt d\'interès)</string>
     <string name="prefs_plugins">Gestor de connectors</string>
@@ -351,44 +351,27 @@
     <string name="application_dir">Carpeta d\'emmagatzematge de dades</string>
     <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions)
 \n
-\n 
 \nOsmAnd és una aplicació de navegació feta amb programari de codi obert amb accés a una gran varietat de dades globals d\'OSM. Totes les dades dels mapes (siguin mapes vectorials o de tessel·les), es poden desar a la targeta de memòria del telèfon pel seu en desconnexió. També calcula rutes, amb connexió o sense, incloent l\'orientació per veu.
 \n
-\n 
 \nAlgunes de les característiques principals:
-\n
 \n- Funcionament complet en desconnexió (desa localment els mapes vectorials i de tessel·les baixats)
-\n
 \n- Mapes vectorials compactes de tot el món per usar en desconnexió
-\n
 \n- Baixada de mapes nacionals o regionals directament des de l\'aplicació
-\n
 \n- Diverses capes de mapes alhora, com traces GPX o de navegació, punts d\'interès, Preferits, parades de transport públic, etc. amb nivell d\'opacitat personalitzada
-\n
 \n- Cerca, fora de línia, d\'adreces i llocs
-\n
 \n- Càlcul de rutes fora de línia fins per distàncies d\'abast mitjà.
-\n
 \n- Modalitats opcionals de cotxe, bicicleta i vianant
-\n
 \n- Canvi automàtic de vista diürna a nocturna
-\n
 \n- Escala del mapa en funció de la velocitat
-\n
 \n- Orientació del mapa segons la brúixola o la direcció del moviment
-\n
 \n- Indicació de carril, velocitat màxima permesa, veus enregistrades i/o sintetitzades
 \n
-\n 
 \nLimitacions d\'aquesta versió gratuïta de OsmAnd:
-\n
 \n- Limitació en el nombre de mapes baixats
-\n
 \n- No hi ha accés als PDIs de la Viquipèdia sense connexió
 \n
-\n 
 \nOsmAnd es desenvolupa activament i el nostre projecte i el seu progrés continu depenen de donacions pel desenvolupament i proves de noves funcions. Si us plau, considereu la compra d\'OsmAnd+ o patrocinar una nova característica concreta, o fer una donació genèrica a la pàgina https\\\\osmand.net.</string>
-    <string name="osmand_plus_long_description_1000_chars">"OsmAnd+ (OSM Automated Navigation Directions) 
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions) 
 \n
 \nL\'OsmAnd+ és un programari de navegació de codi obert amb accés a una gran varietat de dades globals de OSM. Totes les dades de mapes (mapes de tessel·les o vectorials) poden emmagatzemar-se a la targeta de memòria del telèfon pel seu ús sense connexió. També proporciona la funcionalitat de càlcul de rutes sigui amb connexió o sense, incloent orientació per veu. 
 \n
@@ -408,7 +391,7 @@
 \n- Escala automàtica del mapa segons la velocitat 
 \n- Orientació del mapa segons la brúixola o la direcció del moviment 
 \n- Indicacions de carril, velocitat màxima permesa, veus enregistrades i sintetitzades
-\n"</string>
+\n</string>
     <string name="rendering_attr_contourLines_description">Seleccioneu el nivell mínim de zoom per mostrar el mapa si està disponible. Caldrà el fitxer SRTM separat:</string>
     <string name="osmand_development_plugin_description">Aquest connector mostra la configuració de característiques per al desenvolupament i depuració com la verificació o simulació de rutes, el rendiment del renderitzat o les indicacions de veu. Aquestes configuracions s\'adrecen a desenvolupadors i no són d\'utilitat per a un usuari normal.</string>
     <string name="accessibility_default">En consonància amb la configuració del sistema Android</string>
@@ -578,7 +561,7 @@
     <string name="map_overlay">Mapa superposat</string>
     <string name="choose_auto_follow_route_descr">Temps de sincronització del mapa seguint la nova posició.</string>
     <string name="map_underlay">Mapa de fons</string>
-    <string name="map_underlay_descr">Escolliu mapa de fons.</string>
+    <string name="map_underlay_descr">Escolliu mapa de fons</string>
     <string name="map_overlay_descr">Escolliu el mapa superposat</string>
     <string name="preferred_locale_descr">Llengua de visualització de l\'aplicació (s\'actualitzarà quan reinicieu OsmAnd).</string>
     <string name="foot">ft</string>
@@ -605,7 +588,7 @@
     <string name="map_orientation_default">El mateix que el dispositiu</string>
     <string name="add_new_rule">Afegir nova regla</string>
     <string name="update_poi_no_offline_poi_index">No hi ha dades PDI fora de linía per a aquesta area</string>
-    <string name="update_poi_error_local">"No s\'ha pogut  actualitzar la llista local de PDIs"</string>
+    <string name="update_poi_error_local">No s\'ha pogut actualitzar la llista local de PDIs.</string>
     <string name="max_level_download_tile">Max. zooms en linía</string>
     <string name="router_service">Servei de navegació</string>
     <string name="downloading_list_indexes">Baixant llista de les regions disponibles…</string>
@@ -641,7 +624,7 @@
     <string name="poi_edit_title">Edita el PDI</string>
     <string name="poi_remove_title">Elimina el PDI</string>
     <string name="poi_create_title">Crea un PDI</string>
-    <string name="first_time_msg">"Gràcies per utilitzar l\'OsmAnd. Baixeu informació regional fora de línia a través de \'Configuració\' → \'Gestió de fitxers de mapes\' per veure mapes, situar adreces, buscar els PDIs,  trobar transports públics i més."</string>
+    <string name="first_time_msg">Gràcies per utilitzar l\'OsmAnd. Baixeu informació regional fora de línia a través de \'Configuració\' → \'Gestió de fitxers de mapes\' per veure mapes, situar adreces, buscar els PDIs, trobar transports públics i més.</string>
     <string name="basemap_was_selected_to_download">El mapa mundial de fons necessari per les funcionalitats bàsiques està a la cua de baixades.</string>
     <string name="osmand_background_plugin_description">Mostra paràmetres per activar el seguiment i la navegació en procés de fons mitjançant l\'activació periòdica del dispositiu GPS (amb la pantalla apagada).</string>
     <string name="accessibility_preferences_descr">Preferències relatives a l\'accessibilitat.</string>
@@ -690,7 +673,7 @@
     <string name="voice_is_not_available_title">Seleccioneu un paquet de guiatge de veu</string>
     <string name="daynight_descr">Ajusteu el criteri de commutació entre el mode nocturn i el diürn.</string>
     <string name="maps_could_not_be_downloaded">Aquest mapa podria no haver-se baixat</string>
-    <string name="rendering_exception">No s\'ha pogut dibuixar l\'àrea triada</string>
+    <string name="rendering_exception">No s\'ha pogut dibuixar l\'àrea triada.</string>
     <string name="show_point_options">Utilitza la ubicació…</string>
     <string name="renderer_load_sucess">El renderitzador s\'ha carregat</string>
     <string name="fav_points_not_exist">No hi ha punts Preferits</string>
@@ -701,8 +684,8 @@
     <string name="poi_filter_public_transport">Transport públic</string>
     <string name="poi_filter_emergency">Emergències</string>
     <string name="poi_filter_restaurants">Restaurants</string>
-    <string name="osm_editing_plugin_description">"Permet fer contribucions a OSM com la creació o modificació de PDIs d\'OSM,  obrir o comentar anotacions OSM i aportar fitxers enregistrats GPX amb OsmAnd en subministrar el vostre usuari i contrasenya.  OpenStreetMap.org és un projecte gestionat per una comunitat, de domini públic i de cartografia global."</string>
-    <string name="tts_language_not_supported">"La llengua seleccionada no està suportada per el motor de TTS (text a veu) d\'Android instal·lat, s\'usarà la llengua del TTS per defecte. Voleu buscar un altre motor TTS  a la botiga\?"</string>
+    <string name="osm_editing_plugin_description">Permet fer contribucions a OSM com la creació o modificació de PDIs d\'OSM, obrir o comentar anotacions OSM i aportar fitxers enregistrats GPX amb OsmAnd en subministrar el vostre usuari i contrasenya. OpenStreetMap.org és un projecte gestionat per una comunitat, de domini públic i de cartografia global.</string>
+    <string name="tts_language_not_supported">La llengua seleccionada no està suportada per el motor de TTS (text a veu) d\'Android instal·lat, s\'usarà la llengua del TTS per defecte. Voleu buscar un altre motor TTS a la botiga\?</string>
     <string name="send_location_way_choose_title">Comparteix l\'ubicació usant</string>
     <string name="old_map_index_is_not_supported">Format de mapa «{0}» obsolet, no s\'admet</string>
     <string name="select_max_zoom_preload_area">Màxim zoom en precàrrega</string>
@@ -711,7 +694,7 @@
     <string name="transport_searching_route">Resultats de transport ({0} al destí):</string>
     <string name="voice_data_unavailable">La llibreria seleccionada de missatges de veu no està disponible</string>
     <string name="search_poi_location">Esperant el senyal…</string>
-    <string name="opening_hours_not_supported">No es pot canviar el format d\'horaris d\'obertura</string>
+    <string name="opening_hours_not_supported">No es pot canviar el format d\'horaris d\'obertura.</string>
     <string name="transport_to_go_after">prioritza distancia</string>
     <string name="hello">Aplicació de navegació OsmAnd</string>
     <string name="osmand_rastermaps_plugin_description">Accediu a diferents tipus de mapa (anomenats de tessel·les o de bits), des de les tessel·les predefinides d\'OSM (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.
@@ -793,7 +776,7 @@
     <string name="mark_point">Objectiu</string>
     <string name="edit_filter_delete_message">El filtre \'%1$s\' s\'ha eliminat</string>
     <string name="update_poi_success">Les dades dels PDI s\'han actualitzat (se n\'han carregat {0})</string>
-    <string name="update_poi_error_loading">No s\'han pogut carregar dades del servidor</string>
+    <string name="update_poi_error_loading">No s\'han pogut carregar dades del servidor.</string>
     <string name="update_poi_is_not_available_for_zoom">Acostar el zoom us permet actualitzar els PDIs</string>
     <string name="context_menu_item_update_map_confirm">Voleu actualitzar les dades locals des d\'Internet?</string>
     <string name="search_history_building">Edificis: {0}, {1}, {2}</string>
@@ -814,7 +797,7 @@
     <string name="edit_filter_delete_dialog_title">Voleu eliminar aquest filtre\?</string>
     <string name="no_route">Sense ruta</string>
     <string name="voice_stream_voice_call">Àudio de trucada telefònica (interrupció de la música Bluetooth del cotxe)</string>
-    <string name="enable_plugin_monitoring_services">"Habiliteu el connector \"Enregistrament de ruta\"  per utilitzar els serveis de registre d\'ubicació (enregistrament GPX, seguiment en directe)"</string>
+    <string name="enable_plugin_monitoring_services">Habiliteu el connector \"Enregistrament de ruta\" per utilitzar els serveis de registre d\'ubicació (enregistrament GPX, seguiment en directe)</string>
     <string name="gps_not_available">Habiliteu el GPS a les preferències</string>
     <string name="zxing_barcode_scanner_not_found">L\'aplicació ZXing Barcode Scanner no està instal·lada. La voleu cercar a Google Play?</string>
     <string name="rendering_attr_roadColors_name">Esquema de color de carreteres</string>
@@ -875,7 +858,7 @@
     <string name="index_srtm_parts">peces</string>
     <string name="index_srtm_ele">Línies de nivell</string>
     <string name="srtm_plugin_name">Corbes de nivell</string>
-    <string name="download_roads_only_item">"Carreteres "</string>
+    <string name="download_roads_only_item">Carreteres</string>
     <string name="download_regular_maps">Mapes estàndards</string>
     <string name="rendering_attr_noAdminboundaries_description">No mostris els límits administratius regionals (nivells 5 a 9).</string>
     <string name="map_widget_max_speed">Límit de velocitat</string>
@@ -918,7 +901,7 @@
     <string name="background_service_wait_int">Espera màxima per corregir</string>
     <string name="local_indexes_cat_av">Dades d\'àudio/vídeo</string>
     <string name="stop_routing_confirm">Esteu segur què voleu aturar la navegació?</string>
-    <string name="clear_dest_confirm">"N\'esteu segur que voleu eliminar la vostra destinació  (i les vostres fites)?"</string>
+    <string name="clear_dest_confirm">N\'esteu segur que voleu eliminar la vostra destinació (i les vostres fites)\?</string>
     <string name="recording_context_menu_show">Mostra</string>
     <string name="recording_photo_description">Fotografia %1$s %2$s</string>
     <string name="av_def_action_picture">Fes una fotografia</string>
@@ -1091,9 +1074,9 @@
     <string name="map_widget_fps_info">Info depuració FPS</string>
     <string name="intermediate_items_sort_return">Ordre optimitzat de les fites de la ruta fins a la destinació.</string>
     <string name="osmand_distance_planning_plugin_description">Creació d\'itineraris prement el mapa o utilitzant o modificant fitxers GPX existents, per planificar un trajecte i mesurar la distància entre punts. El resultat es pot desar com un fitxer GPX que podreu usar més endavant com una referència.</string>
-    <string name="android_19_location_disabled">"Des de la versió 4.4 d\'Android (KitKat) no podeu baixar i actualitzar els mapes en l\'antiga carpeta (%s). Voleu copiar tots els fitxers de l\'OsmAnd a la nova destinació? 
+    <string name="android_19_location_disabled">Des de la versió 4.4 d\'Android (KitKat) no podeu baixar i actualitzar els mapes en l\'antiga carpeta (%s). Voleu copiar tots els fitxers de l\'OsmAnd a la nova destinació\?
 \n Nota 1: Els vostres fitxers obsolets quedaran intactes (els podeu esborrar manualment).
-\n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir fitxers entre l\'OsmAnd i l\'OsmAnd+."</string>
+\n Nota 2: En el nou lloc d\'emmagatzemament no serà possible compartir fitxers entre l\'OsmAnd i l\'OsmAnd+.</string>
     <string name="copying_osmand_one_file_descr">S\'està copiant el fitxer (%s) a la nova destinació…</string>
     <string name="copying_osmand_files_descr">S\'estan copiant els fitxers de dades de l\'OsmAnd a la nova destinació (%s)…</string>
     <string name="copying_osmand_files">S\'estan copiant fitxers de dades de l\'OsmAnd…</string>
@@ -1304,7 +1287,7 @@
     <string name="arrival_distance_factor_at_last">Als darrers metres</string>
     <string name="rendering_attr_coloredBuildings_name">Edificis amb colors codificats per tipus</string>
     <string name="av_camera_pic_size">Mida d\'imatge de la càmera</string>
-    <string name="av_camera_pic_size_descr">Estableix la mida de la imatge de la càmera.</string>
+    <string name="av_camera_pic_size_descr">Estableix la mida de la imatge de la càmera</string>
     <string name="rendering_value_browse_map_name">Mapa esquemàtic</string>
     <string name="rendering_value_car_name">Cotxe</string>
     <string name="rendering_value_bicycle_name">Bicicleta</string>
@@ -1319,7 +1302,6 @@
     <string name="shared_string_all">Tot</string>
     <string name="record_plugin_description">Aquest connector activa la funcionalitat d\'enregistrar i desar els vostres trajectes, sigui prement sobre el mapa el giny de gravació GPX, o sigui desant-los tots en un fitxer GPX automàticament.
 \n
-\n
 \nLes rutes enregistrades es poden compartir amb els vostres amics o aportar-les per ser utilitzades a OSM. Els atletes poden utilitzar els seus registres per monitoritzar els seus entrenaments. Es pot fer una anàlisi bàsica de les rutes directament a OsmAnd com la durada de cada volta, velocitat mitjana, etc., i, per descomptat, es poden analitzar amb eines especialitzades de tercers.</string>
     <string name="record_plugin_name">Enregistrament de trajectes</string>
     <string name="int_hour">h</string>
@@ -1373,7 +1355,7 @@
     <string name="rendering_category_hide">Amaga</string>
     <string name="wake_on_voice">Activa la pantalla</string>
     <string name="wake_on_voice_descr">Activa la pantalla del dispositiu (si no ho està) en aproximar-se a un gir.</string>
-    <string name="lock_screen_request_explanation">"%1$s necessita  aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."</string>
+    <string name="lock_screen_request_explanation">%1$s necessita aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia.</string>
     <string name="shared_string_never">Mai</string>
     <string name="home_button">Inici</string>
     <string name="search_for">Cerca per</string>
@@ -1521,10 +1503,10 @@
     <string name="shared_string_do_not_use">No utilitzeu</string>
     <string name="shared_string_address">Adreça</string>
     <string name="plugin_nautical_descr">Aquest connector completa el mapa OsmAnd i la seva navegació en produir mapes nàutics per cabotatge, regates i altres tipus de esports d\'aigua.
-
-Un complement de mapa específic per OsmAnd us proporcionarà tot tipus de senyals nàutiques i símbols gràfics, per navegació interior o propera a la costa. La descripció de cada senyal de navegació us donarà els detalls que calguin per identificar-les i del seu significat (categoria, forma, color, seqüència, referència, etc.).
-
-Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aquest connector o canviar a com es desitgi &lt;&lt;Estil del Mapa&gt;&gt; dins &lt;&lt;Configuració del Mapa&gt;&gt;. </string>
+\n
+\nUn complement de mapa específic per OsmAnd us proporcionarà tot tipus de senyals nàutiques i símbols gràfics, per navegació interior o propera a la costa. La descripció de cada senyal de navegació us donarà els detalls que calguin per identificar-les i del seu significat (categoria, forma, color, seqüència, referència, etc.).
+\n
+\nPer retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aquest connector o canviar a com es desitgi &lt;&lt;Estil del Mapa&gt;&gt; dins &lt;&lt;Configuració del Mapa&gt;&gt;.</string>
     <string name="plugin_ski_descr">Aquest connector per l\'OsmAnd us proporciona els detalls de les pistes d\'esquí en baixada, de travessa i alpí així com de telefèrics i remuntadors a tot el món. Les rutes i pistes es mostren amb el codi de colors que els correspon segons la seva dificultat i amb un estil de mapa especial «Hivern» que s\'associa a un paisatge nevat. 
 \n 
 \nEn activar aquests canvis de visualització l\'estil del mapa canvia a «Hivern i esquí», i es mostren totes les característiques del paisatge a l\'hivern. Aquesta vista es pot revertir tant en activar-la altra cop com en canviar-la a «Estil del mapa» dins «Configuració del mapa».</string>
@@ -1712,7 +1694,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="favorite_category_dublicate_message">Utilitzeu un nom de categoria que encara no existeixi.</string>
     <string name="favorite_category_name">Nom de categoria</string>
     <string name="favorite_category_add_new_title">Afegeix una nova categoria</string>
-    <string name="confirm_download_roadmaps">"El mapa restringit a carreteres no cal, donat que ja teniu el mapa estàndard (complet).  Que baixi igualment?"</string>
+    <string name="confirm_download_roadmaps">El mapa restringit a carreteres no cal, donat que ja teniu el mapa estàndard (complet). Que baixi igualment\?</string>
     <string name="value_downloaded_of_max">%1$.1f de %2$.1f MB</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Actualitzeu tot (%1$s MB)</string>
@@ -1729,7 +1711,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="map_downloaded_descr">El mapa de %1$s està a punt per ser utilitzat.</string>
     <string name="go_to_map">Mostra el mapa</string>
     <string name="world_map_download_descr">El mapa base mundial (d\'abast mundial i poc detall) no es troba o està caducat. Considereu baixar-lo per una tenir una perspectiva global.</string>
-    <string name="show_on_start_description">Si es desactiva s\'engega amb la pantalla del mapa.</string>
+    <string name="show_on_start_description">«Desactivat» inicia el mapa directament.</string>
     <string name="enter_country_name">Indiqueu el nom del país</string>
     <string name="shared_string_upload">Pujada</string>
     <string name="osm_edit_created_poi">S\'ha creat un PDI a OSM</string>
@@ -1929,11 +1911,10 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="active_markers">Marcadors actius</string>
     <string name="map_markers">Marcadors de mapa</string>
     <string name="map_marker">Marcador de mapa</string>
-    <string name="file_name_containes_illegal_char">El nom de fitxer inclou un caràcter il·legal</string>
+    <string name="file_name_containes_illegal_char">Caràcter il·legal en el nom del fitxer</string>
     <string name="no_map_markers_found">Afegiu els marcadors de mapa amb el mapa</string>
     <string name="osm_live_header">Aquesta subscripció permet actualitzacions horàries de tots els mapes del món.
 \nPart dels ingressos es retornen a la comunitat OSM en retribuir cada contribució OSM.
-\n
 \nSi aprecieu OsmAnd i OSM i els voleu recolzar mentre l\'utilitzeu, aquesta és la via perfecta per fer-ho.</string>
     <string name="upload_osm_note_description">Pugeu la vostra nota OSM anònimament o utilitzant el vostre perfil OpenStreetMap.org.</string>
     <string name="add_time_span">Afegeix un lapse de temps</string>
@@ -2020,7 +2001,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="no_inet_connection_desc_map">És necessari per baixar mapes.</string>
     <string name="search_location">Cercant la localització…</string>
     <string name="storage_free_space">Espai lliure</string>
-    <string name="storage_place_description">"Magatzem de dades d\'OsmAnd (per mapes, fitxers GPX,  etc.): %1$s."</string>
+    <string name="storage_place_description">Magatzem de dades d\'OsmAnd (per mapes, traces, etc.): %1$s.</string>
     <string name="give_permission">Autoritza</string>
     <string name="allow_access_location">Permet accedir a la localització</string>
     <string name="search_my_location">Troba la meva localització</string>
@@ -2180,11 +2161,11 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="quick_action_map_underlay_switch">S\'ha canviat el mapa de fons a \"%s\".</string>
     <string name="navigate_point_olc">Codi de localització obert</string>
     <string name="navigate_point_olc_info_invalid">OLC no vàlid
-</string>
+\n</string>
     <string name="navigate_point_olc_info_short">OLC curt
-Proporcioneu el codi complet</string>
+\nProporcioneu el codi complet</string>
     <string name="navigate_point_olc_info_area">OLC complet vàlid
-Abasta l\'àrea: %1$s x %2$s</string>
+\nRepresenta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_page_list_descr">Un botó per paginar la llista que segueix.</string>
     <string name="auto_split_recording_title">Divisió automàtica de les gravacions un cop aturades</string>
     <string name="auto_split_recording_descr">Comença un nou segment desprès de 6 min d\'interrupció, una traça nova si es superen les 2 hores o un nou fitxer si encara dura més i ha canviat la data.</string>
@@ -2251,7 +2232,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n• L\'escala del mapa s\'ajusta a la vostra velocitat
 \n• Cerca de destinacions per adreça, tipus (p. ex.: Aparcament, restaurant, hotel, gasolinera, museu), o per les coordenades geogràfiques
 \n• Gestiona punts de pas en el vostre itinerari
-\n• Enregistreu la vostra o baixeu una traça GPX i seguiu-la</string>
+\n• Enregistreu la vostra o baixeu una traça GPX i seguiu-la
+\n</string>
     <string name="osmand_extended_description_part4">Esquí
 \nEl connector de mapes d\'esquí d\'OsmAnd us permet veure les pistes segons la seva dificultat i d\'altres informacions addicionals, com ara la ubicació dels ascensors i altres equipaments.</string>
     <string name="osmand_extended_description_part5">Ciclisme 
@@ -2265,11 +2247,13 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n• La Viquipèdia, en el vostre idioma preferit, us pot ajudar molt visitant una ciutat
 \n• Parades de transport públic (autobús, tramvia, tren), incloent-hi noms de línia, suport per la navegació en una ciutat nova
 \n• La navegació GPS en mode vianant genera la vostra ruta per on pugueu passar
-\n•Baixeu i seguiu una traça GPX o enregistreu i compartiu la vostra</string>
-    <string name="osmand_extended_description_part7">"Col·laboreu amb Openstreetmap (OSM)
+\n• Baixeu i seguiu una traça GPX o enregistreu i compartiu la vostra
+\n</string>
+    <string name="osmand_extended_description_part7">Col·laboreu amb Openstreetmap (OSM)
 \n• Informant de dades errònies
 \n• Pujant traces GPX a OSM directament des de l\'aplicació
-\n• Afegint PDIs i penjar-los a OSM directament  (o més tard si no esteu connectats)"</string>
+\n• Afegint PDIs i penjar-los a OSM directament (o més tard si no esteu connectats)
+\n</string>
     <string name="analyze_on_map">Analitza en el mapa</string>
     <string name="shared_string_visible">Visible</string>
     <string name="osmand_extended_description_part8">OsmAnd es de codi obert i s\'està desenvolupant activament. Tothom pot contribuir a l\'aplicació informant d\'errors, millorant traduccions o aportant codi de noves característiques. A més, el projecte es recolza en contribucions econòmiques per finançar la programació i les proves de noves funcionalitats. 
@@ -2329,14 +2313,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n• Compartiu la vostra ubicació perquè els vostres amics us puguin trobar
 \n• Conserveu els vostres llocs més importants a \'Preferits\'
 \n• Us permet escollir com es mostrar els noms al mapa: en anglès, la lengua local o amb ortografia fonètica
-\n• Mostra representacions especialitzades disponibles a la xarxa, imatges de satèl·lit (Bing), diferents superposicions com traces GPX d\'exploració/navegació i capes addicionals amb un grau transparència variable</string>
+\n• Mostra representacions especialitzades disponibles a la xarxa, imatges de satèl·lit (Bing), diferents superposicions com traces GPX d\'exploració/navegació i capes addicionals amb un grau transparència variable
+\n</string>
     <string name="osmand_plus_extended_description_part2">Navegació
 \n• Funciona en línia (ràpid) o sense connexió (sense càrrecs de roaming quan sigueu a l\'estranger)
 \n• Indicacions de veu a cada gir (amb missatges gravats i sintetitzats)
 \n• Orientació opcional del carril, visualització del nom de la via i el temps estimat d\'arribada
 \n• Admet punts de pas intermedis
 \n• Revisió automàtica de la ruta quan us aparteu de la ruta proposada
-\n• Cerca de llocs per adreça, tipus (per exemple: restaurant, hotel, gasolinera, museu) o coordenades geogràfiques</string>
+\n• Cerca de llocs per adreça, tipus (per exemple: restaurant, hotel, gasolinera, museu) o coordenades geogràfiques
+\n</string>
     <string name="osmand_plus_extended_description_part1">OsmAnd + (OSM Automated Navigation Directions) és una aplicació per consulta de mapes i de navegació, amb accés a les dades obertes d\'OSM, d\'abast mundial i gran qualitat. 
 \nFruïu la navegació amb indicacions visuals i de veu, mostrant PDIs (punts d\'interès), creant i gestionant traces GPX, disposant de corbes de nivell i cotes puntuals, seleccioneu la navegació per vehicle, bicicleta o com a vianant, editeu OSM i molt més. 
 \n 
@@ -2367,24 +2353,25 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n• Mapes vectorials compactes en local que s\'actualitzen un cop al mes, com a mínim 
 \n 
 \n• Opció entre dades completes d\'una regió o només la xarxa viària (Exemple: tot el Japó ocupa 700 MB però només 200 MB per a la xarxa viària)</string>
-    <string name="osmand_plus_extended_description_part5">"Característiques de seguretat
+    <string name="osmand_plus_extended_description_part5">Característiques de seguretat
 \n• Canvi automàtic entre el mode diürn/nocturn (opcional)
 \n• Indicacions del límit de velocitat i notificació d\'excés (opcional)
 \n• Escala en funció de la velocitat (opcional)
-\n• Si compartiu la vostra ubicació, els vostres amics us podran trobar"</string>
+\n• Si compartiu la vostra ubicació, els vostres amics us podran trobar
+\n</string>
     <string name="osmand_plus_extended_description_part6">Característiques per ciclistes i vianants
 \n• Visualització de vies per vianants, senderisme i carrils bici, ideal per activitats a l\'aire lliure
 \n• Representació i navegació a mida per ciclistes i vianants
 \n• Indicació opcional de les parades del transport públic (autobús, tramvia, tren), incloent-hi noms de línia
 \n• Enregistrament opcional del trajecte en un fitxer GPX local o a un servei a la xarxa
 \n• Indicació opcional de la velocitat i l\'altitud • Visualització de corbes de nivell i ombrejat de relleu (requereix connector)</string>
-    <string name="osmand_plus_extended_description_part7">"Col·laboreu directament a OSM
+    <string name="osmand_plus_extended_description_part7">Col·laboreu directament a OSM
 \n• Notifiqueu errors en les dades
 \n• Pugeu traces GPX directament a OSM des de l\'aplicació
 \n• Afegiu PDIs i pugeu-los OSM (o feu-ho més tard si no esteu connectats)
 \n• Enregistrament opcional del trajecte, també en segon pla (mentre el dispositiu està bloquejat)
 \nOsmAnd és un programari de codi obert que es desenvolupa activament. Tothom pot recolzar l\'aplicació informant d\'errors, millorant traduccions o programant noves característiques. El projecte també es fonamenta en les aportacions econòmiques per patrocinar la programació i validació de noves funcionalitats.
-\n"</string>
+\n</string>
     <string name="shared_string_overview">Visió general</string>
     <string name="animate_my_location">Anima la pròpia posició</string>
     <string name="animate_my_location_desc">Activa el desplaçament animat del mapa de \'La meva posició\' durant la navegació.</string>
@@ -2587,7 +2574,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="show_guide_line_descr">Mostra una línia de direcció entre la vostra ubicació i les dels marcadors actius.</string>
     <string name="show_arrows_descr">Mostra una o dues fletxes indicant la direcció dels marcadors actius.</string>
     <string name="distance_indication_descr">Seleccioneu com indicar la distància als marcadors actius.</string>
-    <string name="active_markers_descr">Indiqueu el nombre d\'indicadors de direcció:</string>
+    <string name="active_markers_descr">Indiqueu el nombre d\'indicadors de direcció.</string>
     <string name="shared_string_more_without_dots">Més</string>
     <string name="looking_for_tracks_with_waypoints">Cercant traces amb fites</string>
     <string name="empty_state_osm_edits">Crea o modifica objectes OSM</string>
@@ -2646,14 +2633,14 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="copy_location_name">Copia nom d\'ubicació/PDI</string>
     <string name="toast_empty_name_error">Ubicació sense nom</string>
     <string name="show_closed_notes">Mostra notes amagades</string>
-    <string name="switch_osm_notes_visibility_desc">Mostra/amaga notes OSM en el mapa.</string>
+    <string name="switch_osm_notes_visibility_desc">Mostra o amaga notes OSM en el mapa.</string>
     <string name="gpx_file_desc">GPX - adient per exportar-lo a JOSM o a altres editors d\'OSM.</string>
     <string name="osc_file_desc">OSC - adient per exportar-lo a OSM.</string>
     <string name="shared_string_gpx_file">Arxiu GPX</string>
     <string name="osc_file">Arxiu OSC</string>
     <string name="choose_file_type">Seleccioneu el tipus de fitxer</string>
     <string name="osm_edits_export_desc">Exportació com notes d\'OSM, PDIs o les dues coses.</string>
-    <string name="all_data">"Totes les  dades"</string>
+    <string name="all_data">Totes les dades</string>
     <string name="osm_notes">Notes OSM</string>
     <string name="tunnel_warning">Túnel encarat</string>
     <string name="show_tunnels">Túnels</string>
@@ -2677,7 +2664,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="west_abbreviation">O</string>
     <string name="south_abbreviation">S</string>
     <string name="north_abbreviation">N</string>
-    <string name="optional_point_name">"Nom opcional del punt "</string>
+    <string name="optional_point_name">Nom opcional del punt</string>
     <string name="transport_nearby_routes_within">Rutes properes a dins</string>
     <string name="transport_nearby_routes">A dins</string>
     <string name="enter_the_file_name">Introduïu el nom del fitxer.</string>
@@ -2755,7 +2742,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="wikipedia_offline">Viquipèdia sense connexió</string>
     <string name="contour_lines_hillshade_maps">Mapes amb corbes de nivell i ombrejat de relleu</string>
     <string name="unlock_all_features">Desbloca totes les funcions de OsmAnd</string>
-    <string name="shared_string_wikivoyage">"Viquiviatges "</string>
+    <string name="shared_string_wikivoyage">Viquiviatges</string>
     <string name="index_item_world_wikivoyage">Articles de Viquiviatges d\'arreu</string>
     <string name="open_wikipedia_link_online">Obre l\'enllaç en línia de Viquipèdia</string>
     <string name="open_wikipedia_link_online_description">L\'enllaç s\'obrirà en el vostre navegador.</string>
@@ -2865,7 +2852,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osm_live_subscriptions">Subscripcions</string>
     <string name="mapillary_menu_title_pano">Només mostra imatges de 360º</string>
     <string name="shared_string_launch">Arrenca</string>
-    <string name="run_full_osmand_msg">"Esteu utilitzant el mapa {0} mitjançant OsmAnd.  Voleu iniciar la versió sencera d\'OsmAnd \?"</string>
+    <string name="run_full_osmand_msg">Esteu utilitzant el mapa {0} mitjançant OsmAnd. Voleu iniciar la versió sencera d\'OsmAnd \?</string>
     <string name="run_full_osmand_header">Voleu iniciar OsmAnd\?</string>
     <string name="lang_gn_py">Guaraní</string>
     <string name="quick_action_switch_day_night_descr">Un botó per canviar entre els modes diürn i nocturn d\'OsmAnd.</string>
@@ -3088,7 +3075,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="third_party_routing_type">Navegació de tercers</string>
     <string name="application_profiles_descr">Seleccioneu els perfils que voleu que es mostrin a l\'aplicació.</string>
     <string name="application_profiles">Perfils d\'aplicació</string>
-    <string name="routing_attr_piste_type_downhill_name">Esquí alpí/descens</string>
+    <string name="routing_attr_piste_type_downhill_name">Esquí alpí i de descens</string>
     <string name="process_downloading_service">Servei de baixades d\'OsmAnd</string>
     <string name="shared_string_color_magenta">Magenta</string>
     <string name="shared_string_icon">Icona</string>
@@ -3157,7 +3144,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="turn_screen_on_sensor">Utilitza el sensor de proximitat</string>
     <string name="base_profile_descr_bicycle">Bicicleta de muntanya, ciclomotor, cavall</string>
     <string name="routing_profile_broutrer">BRouter (fora de línia)</string>
-    <string name="routing_attr_piste_type_nordic_name">Esquí nòrdic o de fons</string>
+    <string name="routing_attr_piste_type_nordic_name">Esquí nòrdic i de fons</string>
     <string name="routing_attr_piste_type_nordic_description">Pistes per a esquí nòrdic o de fons.</string>
     <string name="routing_attr_allow_advanced_name">Permet les rutes avançades</string>
     <string name="routing_attr_allow_advanced_description">Rutes difícils, amb obstacles perillosos i seccions amb pendents fortes.</string>
@@ -3207,8 +3194,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="shared_string_default">Per defecte</string>
     <string name="lang_oc">Occità</string>
     <string name="app_mode_pickup_truck">Camioneta descoberta</string>
-    <string name="new_route_calculated_dist_dbg">"Ruta: distància %s, durada %s 
-\nCàlcul: %.1f  s, %d vies, %d tessel·les)"</string>
+    <string name="new_route_calculated_dist_dbg">Ruta: distància %s, durada %s
+\nCàlcul: %.1f s, %d vies, %d tessel·les)</string>
     <string name="day">Dia</string>
     <string name="days_2_4">Dies</string>
     <string name="days_5">Dies</string>
@@ -3375,7 +3362,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="swap_two_places">Bescanvia %1$s i %2$s</string>
     <string name="route_start_point">Punt d\'inici</string>
     <string name="track_saved">La traça s\'ha desat</string>
-    <string name="empty_filename">No hi ha nom de fitxer</string>
+    <string name="empty_filename">Nom de fitxer buit</string>
     <string name="shared_string_revert">Reverteix</string>
     <string name="clear_confirmation_msg">Voleu netejar %1$s\?</string>
     <string name="dialogs_and_notifications_title">Diàlegs i notificacions</string>
@@ -3567,7 +3554,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="quick_action_terrain_descr">Un botó per mostrar o amagar la capa de terreny al mapa.</string>
     <string name="quick_action_terrain_show">Mostra el terreny</string>
     <string name="quick_action_terrain_hide">Amaga el terreny</string>
-    <string name="quick_action_show_hide_terrain">Mostra/amaga el relleu</string>
+    <string name="quick_action_show_hide_terrain">Mostra o amaga el relleu</string>
     <string name="shared_string_hillshade">Ombrejat del relleu</string>
     <string name="shared_string_legend">Llegenda</string>
     <string name="shared_string_zoom_levels">Nivells de zoom</string>
@@ -3741,11 +3728,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osmand_purchases_item">Compres OsmAnd</string>
     <string name="navigation_profiles_item">Perfils de navegació</string>
     <string name="quick_action_transport_hide">Amaga el transport públic</string>
-    <string name="quick_action_show_hide_transport">Mostra/amaga el transport públic</string>
+    <string name="quick_action_show_hide_transport">Mostra o amaga el transport públic</string>
     <string name="quick_action_transport_descr">Botó que mostra o oculta el transport públic al mapa.</string>
-    <string name="create_edit_poi">Crea / Edita PDI</string>
+    <string name="create_edit_poi">Crea o edita PDI</string>
     <string name="parking_positions">Posicions d’aparcament</string>
-    <string name="add_edit_favorite">Afegeix / Edita Preferits</string>
+    <string name="add_edit_favorite">Afegeix o edita preferit</string>
     <string name="reset_deafult_order">Restableix la ordenació dels elements predeterminats</string>
     <string name="back_to_editing">Torna a l\'edició</string>
     <string name="turn_screen_on_navigation_instructions_descr">A cada instrucció de navegació s\'activarà la pantalla.</string>
@@ -3835,7 +3822,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="turn_screen_on_power_button">Botó d\'activació</string>
     <string name="release_3_8">• S\'ha actualitzat la funció Planifica una ruta: permet utilitzar diferents tipus de navegació per segments i afegir traces
 \n
-\n • Nou menú Aspecte per les traces: seleccioneu color, gruix, representació de les fletxes de direcció, icones inici/fi
+\n • Nou menú Aspecte per les traces: seleccioneu color, gruix, representació de les fletxes de direcció, icones d\'inici i final
 \n
 \n • S\'ha millorat la visibilitat dels nodes ciclistes.
 \n
@@ -3858,7 +3845,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="development">Desenvolupament</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="use_native_pt_desc">Canvieu el càlcul de rutes de Transport Public a Java (segur)</string>
-    <string name="start_finish_icons">Icones d\'Inici/Final</string>
+    <string name="start_finish_icons">Icones d\'inici i final</string>
     <string name="contour_lines_thanks">Gràcies per comprar \'Corbes de nivell\'</string>
     <string name="routing_attr_avoid_footways_description">Evita els camins per a vianants</string>
     <string name="routing_attr_avoid_footways_name">Evita els camins per a vianants</string>
@@ -3868,7 +3855,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="perform_oauth_authorization_description">Inicieu la sessió mitjançant OAuth per fer servir les funcionalitats osmedit</string>
     <string name="perform_oauth_authorization">Inicieu la sessió via OAuth</string>
     <string name="clear_osm_token">Neteja el testimoni OAuth d\'OpenStreetMap</string>
-    <string name="osm_edit_logout_success">La sessió s\'ha tancat correctament</string>
+    <string name="osm_edit_logout_success">Sessió tancada</string>
     <string name="file_already_imported">El fitxer ja s\'ha importat a OsmAnd</string>
     <string name="shared_string_local_maps">Mapes locals</string>
     <string name="icon_group_special">Especial</string>
@@ -3881,4 +3868,5 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="app_mode_gap">Discontinu</string>
     <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>
 </resources>

OsmAnd/res/values-cs/phrases.xml

@@ -3850,4 +3850,10 @@
     <string name="poi_parking_rooftop">Střešní</string>
     <string name="poi_gpx_point">Bod GPX</string>
     <string name="poi_radar_tower">Radarová věž</string>
+    <string name="poi_diplomatic_embassy">Ambasáda</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Služby občanům</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Imigrační víza</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Neimigrační víza</string>
+    <string name="poi_consulate_filter">Konzulát</string>
+    <string name="poi_embassy_filter">Ambasáda</string>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -2005,7 +2005,7 @@ Délka %2$s</string>
     <string name="osmand_plus_banner_desc">Neomezené stahování map, aktualizací a modul Wikipedie.</string>
     <string name="si_mi_meters">Míle/metry</string>
     <string name="lang_hsb">Hornolužická srbština</string>
-    <string name="gpx_no_tracks_title">Nemáte zatím žádné GPX soubory</string>
+    <string name="gpx_no_tracks_title">Nemáte zatím žádné soubory stop</string>
     <string name="gpx_no_tracks_title_folder">Do složky můžete také přidat GPX soubory</string>
     <string name="gpx_add_track">Přidat další…</string>
     <string name="shared_string_appearance">Vzhled</string>
@@ -2055,10 +2055,10 @@ Délka %2$s</string>
     <string name="upload_poi">Nahrát POI</string>
     <string name="legacy_search">Starší vyhledávání</string>
     <string name="show_legacy_search">Zobrazit starší způsob vyhledávání</string>
-    <string name="routing_attr_allow_motorway_name">Povolit dálnice</string>
-    <string name="routing_attr_allow_motorway_description">Povolit jízdu po dálnicích.</string>
+    <string name="routing_attr_allow_motorway_name">Použít dálnice</string>
+    <string name="routing_attr_allow_motorway_description">Povolí jízdu po dálnicích.</string>
     <string name="wiki_around">Články Wikipedie v okolí</string>
-    <string name="search_map_hint">Hledat město nebo oblast</string>
+    <string name="search_map_hint">Město nebo oblast</string>
     <string name="show_legacy_search_desc">Přidat starší hledání do úvodního panelu.</string>
     <string name="lang_sr_latn">Srbsky (latinka)</string>
     <string name="lang_zh_hk">Čínsky (Hong Kong)</string>
@@ -2168,7 +2168,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="routing_attr_height_obstacles_description">Zohlednit převýšení terénu (data od SRTM, ASTER a EU-DEM).</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 nemůže být přesunut.</string>
+    <string name="file_can_not_be_moved">Soubor se nepodařilo přesunout.</string>
     <string name="shared_string_move">Přesunout</string>
     <string name="shared_string_gpx_tracks">Trasy</string>
     <string name="shared_string_time_moving">Doba pohybu</string>
@@ -2181,7 +2181,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="average_speed">Průměrná rychlost</string>
     <string name="add_new_folder">Přidat nový adresář</string>
     <string name="points_delete_multiple_succesful">Bod(y) smazán(y).</string>
-    <string name="points_delete_multiple">Chystáte se smazat body (%1$d). Určitě smazat?</string>
+    <string name="points_delete_multiple">Opravdu chcete smazat %1$d bodů\?</string>
     <string name="route_points_category_name">Potřebné obraty na trase</string>
     <string name="track_points_category_name">Trasové body, body zájmu, pojmenované objekty</string>
     <string name="shared_string_gpx_track">Trasa</string>
@@ -2201,34 +2201,34 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="parking_options">Možnosti parkování</string>
     <string name="full_version_thanks">Děkujeme vám za zakoupení placené verze OsmAnd.</string>
     <string name="routing_attr_relief_smoothness_factor_name">Zvolte kolísání výšky</string>
-    <string name="right_side_navigation">Jízda po pravé straně</string>
+    <string name="right_side_navigation">Pravostranný provoz</string>
     <string name="driving_region_automatic">Automaticky</string>
     <string name="restore_purchases">Obnovit nákupy</string>
     <string name="fonts_header">Mapová písma</string>
     <string name="type_address">Zadejte adresu</string>
-    <string name="type_city_town">Zadejte město</string>
+    <string name="type_city_town">Zadejte město/oblast</string>
     <string name="type_postcode">Zadejte směrovací číslo</string>
     <string name="nearest_cities">Nejbližší města</string>
     <string name="select_city">Zvolte město</string>
-    <string name="select_postcode">Zvolte směrovací číslo</string>
+    <string name="select_postcode">Hledání PSČ</string>
     <string name="quick_action_auto_zoom">Automatické přiblížení mapy</string>
-    <string name="quick_action_auto_zoom_desc">Klepnutím na toto tlačítko zapnete/vypnete automatické přibližování mapy v závislosti na vaší rychlosti.</string>
-    <string name="quick_action_auto_zoom_on">Zapnout automatické přiblížení mapy</string>
-    <string name="quick_action_auto_zoom_off">Vypnout automatické přiblížení mapy</string>
-    <string name="quick_action_add_destination">Přidat cíl</string>
+    <string name="quick_action_auto_zoom_desc">Tlačítko pro zapnutí nebo vypnutí automatického přibližování mapy podle rychlosti.</string>
+    <string name="quick_action_auto_zoom_on">Zapnout automatické přibližování</string>
+    <string name="quick_action_auto_zoom_off">Vypnout automatické přibližování</string>
+    <string name="quick_action_add_destination">Zadat cíl</string>
     <string name="quick_action_replace_destination">Nahradit cíl</string>
     <string name="quick_action_add_first_intermediate">Přidat první mezicíl</string>
     <string name="quick_action_osmbugs_show">Zobrazit OSM poznámky</string>
     <string name="quick_action_osmbugs_hide">Skrýt OSM poznámky</string>
-    <string name="quick_action_showhide_osmbugs_descr">Klepnutím na toto tlačítko zobrazíte nebo skryjete OpenStreetMap poznámky na mapě.</string>
+    <string name="quick_action_showhide_osmbugs_descr">Tlačítko pro zobrazení nebo skrytí OpenStreetMap poznámek na mapě.</string>
     <string name="sorted_by_distance">Seřazeno podle vzdálenosti</string>
-    <string name="search_favorites">Najít Oblíbené</string>
-    <string name="hillshade_menu_download_descr">Pro zobrazení vrstevnic a stínování kopců je potřeba stáhnout překryvnou mapu této oblasti.</string>
-    <string name="hillshade_purchase_header">Pro zobrazení vrstevnic a stínování kopců je třeba zakoupit a aktivovat modul \"Vrstevnice\"</string>
+    <string name="search_favorites">Hledat v Oblíbených</string>
+    <string name="hillshade_menu_download_descr">Pro zobrazení vertikálního stínování si stáhněte překryvnou mapu stínovaných svahů.</string>
+    <string name="hillshade_purchase_header">Pro zobrazení výškových stupňů si nainstalujte modul \'Vrstevnice\'.</string>
     <string name="hide_from_zoom_level">Skrýt od úrovně přiblížení</string>
     <string name="srtm_menu_download_descr">Stáhnout mapu vrstevnic tohoto regionu.</string>
     <string name="shared_string_plugin">Modul</string>
-    <string name="srtm_purchase_header">Chcete-li na mapě vidět vrstevnice, musíte koupit a nainstalovat modul \'Vrstevnice\'</string>
+    <string name="srtm_purchase_header">Pro zobrazení výškových stupňů si zakupte a nainstalujte modul \'Vrstevnice\'.</string>
     <string name="srtm_color_scheme">Barevné schéma</string>
     <string name="show_from_zoom_level">Zobrazit od úrovně přiblížení</string>
     <string name="routing_attr_allow_private_name">Povolit soukromý přístup</string>
@@ -2237,14 +2237,14 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="favorite_group_name">Název skupiny</string>
     <string name="change_color">Změnit barvu</string>
     <string name="edit_name">Upravit název</string>
-    <string name="animate_my_location">Animovat moji polohu</string>
-    <string name="animate_my_location_desc">Povolit animaci mapy \'Mé polohy\' při navigaci.</string>
+    <string name="animate_my_location">Animovat vlastní polohu</string>
+    <string name="animate_my_location_desc">Zapnout animovaný posun \'Mé polohy\' na mapě během navigace.</string>
     <string name="shared_string_overview">Přehled</string>
     <string name="select_street">Vyberte ulici</string>
     <string name="shared_string_in_name">v %1$s</string>
-    <string name="quick_action_add_destination_desc">Stisk tohoto tlačítka přidá střed obrazovky jako nový cíl navádění, z dříve nastaveného cíle se stane poslední mezicíl.</string>
-    <string name="quick_action_replace_destination_desc">Stisk tohoto tlačítka přidá střed obrazovky jako nový cíl navádění. Pokud byl dříve nastaven jiný cíl, bude nahrazen.</string>
-    <string name="quick_action_add_first_intermediate_desc">Stisk tohoto tlačítka přidá střed obrazovky jako první mezicíl.</string>
+    <string name="quick_action_add_destination_desc">Tlačítko pro nastavení středu obrazovky jako nového cíle trasy. Z dříve nastaveného cíle se stane poslední mezicíl.</string>
+    <string name="quick_action_replace_destination_desc">Tlačítko pro nastavení středu obrazovky jako nového cíle. Pokud byl dříve nastaven jiný cíl, bude nahrazen.</string>
+    <string name="quick_action_add_first_intermediate_desc">Tlačítko pro nastavení středu obrazovky jako prvního mezicíle.</string>
     <string name="no_overlay">Bez překryvné vrstvy</string>
     <string name="no_underlay">Bez podkladové vrstvy</string>
     <string name="subscribe_email_error">Chyba</string>
@@ -2267,19 +2267,19 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="increase_search_radius">Zvětšit okruh hledání</string>
     <string name="nothing_found">Nic nalezeno</string>
     <string name="nothing_found_descr">Změňte vyhledávací dotaz nebo zvětšete okruh hledání.</string>
-    <string name="quick_action_showhide_osmbugs_title">Přepnout zobrazení poznámek OSM</string>
+    <string name="quick_action_showhide_osmbugs_title">Zobrazit nebo skrýt OSM poznámky</string>
     <string name="shared_string_permissions">Oprávnění</string>
-    <string name="import_gpx_failed_descr">OsmAnd nemůže naimportovat soubor. Prosím zkontrolujte, zda má oprávnění číst soubor z tohoto umístění.</string>
+    <string name="import_gpx_failed_descr">Nepodařilo se naimportovat soubor. Prosím zkontrolujte, zda má OsmAnd oprávnění ke čtení souboru.</string>
     <string name="distance_moving">Vzdálenost opravená</string>
     <string name="mapillary_image">Obrázek Mapillary</string>
     <string name="open_mapillary">Otevřít Mapillary</string>
     <string name="shared_string_install">Instalovat</string>
     <string name="improve_coverage_mapillary">Zlepšit pokrytí fotografií s Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Nainstalujte Mapillary a přidejte jednu nebo více fotografií na toto místo v mapě.</string>
+    <string name="improve_coverage_install_mapillary_desc">Nainstalujte Mapillary a přidejte fotografie na toto místo v mapě.</string>
     <string name="online_photos">On-line fotografie</string>
     <string name="shared_string_add_photos">Přidat fotografie</string>
-    <string name="no_photos_descr">Nemáme fotografie pro toto umístění.</string>
-    <string name="mapillary_action_descr">Přispějte vlastním pohledem na toto místo přes Mapillary z úrovně ulice.</string>
+    <string name="no_photos_descr">Zde nejsou žádné fotografie.</string>
+    <string name="mapillary_action_descr">Sdílejte svůj vlastní pohled z úrovně ulice přes Mapillary.</string>
     <string name="mapillary_widget_descr">Umožňuje rychle přispět do Mapillary.</string>
     <string name="mapillary_descr">On-line fotografie z ulic pro každého. Objevte místa, spolupracujte, zachyťte svět.</string>
     <string name="plugin_mapillary_descr">Fotografie z ulic pro každého. Objevte místa, spolupracujte, zachyťte svět.</string>
@@ -2307,10 +2307,10 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="max_min">Max/Min</string>
     <string name="min_max">Min/Max</string>
     <string name="quick_action_resume_pause_navigation">Pozastavit/pokračovat v navigaci</string>
-    <string name="quick_action_resume_pause_navigation_descr">Stiskněte toto tlačítko na pozastavení, nebo pokračování navigace.</string>
+    <string name="quick_action_resume_pause_navigation_descr">Tlačítko pro pozastavení nebo pokračování navigace.</string>
     <string name="quick_action_show_navigation_finish_dialog">Zobrazit zprávu \"Navigace ukončena\"</string>
     <string name="quick_action_start_stop_navigation">Spustit/ukončit navigaci</string>
-    <string name="quick_action_start_stop_navigation_descr">Stiskněte toto tlačítko pro spuštění, nebo zastavení navigace.</string>
+    <string name="quick_action_start_stop_navigation_descr">Tlačítko pro spuštění nebo zastavení navigace.</string>
     <string name="rendering_value_translucent_pink_name">Průhledná růžová</string>
     <string name="none_point_error">Prosím přidejte alespoň jeden bod.</string>
     <string name="enter_gpx_name">Název souboru GPX:</string>
@@ -2348,7 +2348,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="show_direction">Indikace vzdálenosti</string>
     <string name="sort_by">Seřadit podle</string>
     <string name="do_not_use_animations">Bez animací</string>
-    <string name="do_not_use_animations_descr">Zakáže animace v aplikaci.</string>
+    <string name="do_not_use_animations_descr">Vypne animace mapy.</string>
     <string name="keep_showing_on_map">Stále zobrazovat na mapě</string>
     <string name="exit_without_saving">Ukončit bez uložení?</string>
     <string name="map_orientation_change_in_accordance_with_speed">Práh pro změnu orientace mapy</string>
@@ -2365,7 +2365,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="last_seven_days">Posledních 7 dní</string>
     <string name="this_year">Tento rok</string>
     <string name="use_location">Použít umístění</string>
-    <string name="add_location_as_first_point_descr">Přidat svou polohu jako startovní bod do plánu ideální trasy.</string>
+    <string name="add_location_as_first_point_descr">Přidejte svou polohu jako počáteční bod do plánu ideální trasy.</string>
     <string name="my_location">Moje poloha</string>
     <string name="shared_string_finish">Dokončit</string>
     <string name="plan_route">Naplánovat trasu</string>
@@ -2377,24 +2377,24 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="show_guide_line">Zobrazit vodicí čáry</string>
     <string name="show_arrows_on_the_map">Zobrazit šipky na mapě</string>
     <string name="remove_from_map_markers">Odebrat z mapových značek</string>
-    <string name="descendingly">sestupně</string>
-    <string name="ascendingly">vzestupně</string>
-    <string name="date_added">Datum přidání</string>
+    <string name="descendingly">Z-A</string>
+    <string name="ascendingly">A-Z</string>
+    <string name="date_added">Přidáno</string>
     <string name="order_by">Seřadit podle:</string>
     <string name="shared_string_markers">Značky</string>
     <string name="coordinates_format">Formát souřadnic</string>
     <string name="use_system_keyboard">Použít systémovou klávesnici</string>
-    <string name="fast_coordinates_input_descr">Zvolte formát souřadnicového vstupu. Můžete ho kdykoli změnit klepnutím na \'Možnosti\'.</string>
+    <string name="fast_coordinates_input_descr">Zvolte formát zadávání souřadnic. Můžete ho kdykoliv změnit klepnutím na \'Nastavení.</string>
     <string name="fast_coordinates_input">Rychlé zadávání souřadnic</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">Vyhnout brodům a ledovým cestám</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Povede trasu mimo brody a ledové cesty.</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">Žádné ledové cesty a brody</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">Vyhne se ledovým cestám a brodům.</string>
     <string name="show_passed">Zobrazit prošlé</string>
     <string name="hide_passed">Skrýt prošlé</string>
-    <string name="marker_show_distance_descr">Vyberte, jak ukazovat vzdálenost a směr k mapovým značkám na obrazovce mapy:</string>
-    <string name="osn_modify_dialog_error">Nepodařilo se změnit poznámku</string>
+    <string name="marker_show_distance_descr">Zvolte, jak se bude zobrazovat vzdálenost a směr k mapovým značkám na mapě:</string>
+    <string name="osn_modify_dialog_error">Nepodařilo se změnit poznámku.</string>
     <string name="osn_modify_dialog_title">Upravit poznámku</string>
     <string name="context_menu_item_modify_note">Upravit poznámku OSM</string>
-    <string name="make_round_trip_descr">Přidat počáteční bod také jako cíl pro vytvoření okruhu.</string>
+    <string name="make_round_trip_descr">Přidat kopii počátečního bodu jako cíl.</string>
     <string name="make_round_trip">Vytvořit okružní trasu</string>
     <string name="import_gpx_file_description">Může být importováno jako Oblíbené nebo jako GPX soubor.</string>
     <string name="import_as_gpx">Importovat jako soubor GPX</string>
@@ -2431,7 +2431,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="show_guide_line_descr">Zobrazit vodicí čáry od vaší polohy k aktivním značkám.</string>
     <string name="show_arrows_descr">Zobrazit jednu nebo dvě šipky označující směr k aktivním značkám.</string>
     <string name="distance_indication_descr">Zvolte způsob zobrazení vzdálenosti k aktivním značkám.</string>
-    <string name="active_markers_descr">Zvolte, kolik ukazatelů směru se má zobrazit.</string>
+    <string name="active_markers_descr">Zadejte počet ukazatelů směru.</string>
     <string name="digits_quantity">Počet desetinných míst</string>
     <string name="shared_string_right">Vpravo</string>
     <string name="shared_string_left">Vlevo</string>
@@ -2442,19 +2442,19 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="tap_on_map_to_hide_interface_descr">Klepnutí na mapu přepne ovládací tlačítka a nástroje.</string>
     <string name="tap_on_map_to_hide_interface">Režim celé obrazovky</string>
     <string name="mark_passed">Označit prošlé</string>
-    <string name="empty_state_osm_edits_descr">Vytvořit nebo upravit OSM POI, otevřít nebo okomentovat OSM poznámky a přispět zaznamenanými GPX soubory.</string>
+    <string name="empty_state_osm_edits_descr">Vytvořit nebo upravit body zájmu OSM, otevřít nebo okomentovat OSM poznámky a přispět zaznamenanými GPX soubory.</string>
     <string name="shared_string_deleted">Odstraněné</string>
     <string name="shared_string_edited">Upravené</string>
     <string name="shared_string_added">Přidané</string>
     <string name="marker_activated">Značka %s aktivována.</string>
     <string name="one_tap_active_descr">Klepněte na značku na mapě pro její přesunutí na první místo v aktivních značkách bez otevření kontextové nabídky.</string>
     <string name="empty_state_av_notes">Dělejte si poznámky!</string>
-    <string name="empty_state_av_notes_desc">Přidejte audio, video nebo fotografickou poznámku pro každý bod na mapě, pomocí nástroje nebo kontextového menu.</string>
-    <string name="notes_by_date">Poznámky podle datumu</string>
+    <string name="empty_state_av_notes_desc">Přidejte audio, video nebo fotografické poznámky pro libovolný bod na mapě, pomocí nástroje nebo kontextového menu.</string>
+    <string name="notes_by_date">Multimediální poznámky podle data</string>
     <string name="by_date">Podle datumu</string>
     <string name="by_type">Podle typu</string>
     <string name="empty_state_markers_active_desc">Klepnutím nebo přidržením označte \'Místa\', pak klepněte na tlačítko značky s vlajkou.</string>
-    <string name="modify_the_search_query">Upravit vyhledávací dotaz.</string>
+    <string name="modify_the_search_query">Změňte vyhledávací dotaz.</string>
     <string name="one_tap_active">Funkce \"Jedním stiskem\" je aktivní</string>
     <string name="rendering_attr_hidePOILabels_name">Popisky bodů</string>
     <string name="shared_string_without_name">Bez názvu</string>
@@ -2482,13 +2482,13 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="osm_recipient_stat">Počet úprav %1$s, součet %2$s mBTC</string>
     <string name="lang_lo">Laosky</string>
     <string name="show_closed_notes">Zobrazit zavřené poznámky</string>
-    <string name="switch_osm_notes_visibility_desc">Zobrazit/Skrýt OpenStreetMap poznámky na mapě.</string>
+    <string name="switch_osm_notes_visibility_desc">Zobrazit nebo skrýt OpenStreetMap poznámky na mapě.</string>
     <string name="gpx_file_desc">GPX - vhodné pro export do JOSM nebo jiných editorů OSM.</string>
-    <string name="osc_file_desc">OSC - vhodné pro export do OpenStreetMap.</string>
+    <string name="osc_file_desc">OSC - vhodné pro export do OSM.</string>
     <string name="shared_string_gpx_file">Soubor GPX</string>
     <string name="osc_file">Soubor OSC</string>
     <string name="choose_file_type">Zvolte typ souboru</string>
-    <string name="osm_edits_export_desc">Vyberte typ exportu: OSM poznámky, POI nebo obojí.</string>
+    <string name="osm_edits_export_desc">Exportujte jako OSM poznámky, body zájmu, nebo obojí.</string>
     <string name="all_data">Všechny údaje</string>
     <string name="osm_notes">OSM poznámky</string>
     <string name="enter_the_file_name">Zadejte název souboru.</string>
@@ -2524,8 +2524,8 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="optional_point_name">Volitelný název bodu</string>
     <string name="transport_nearby_routes_within">Nejbližší trasy v okruhu</string>
     <string name="transport_nearby_routes">V okruhu</string>
-    <string name="distance_farthest">Vzdálenost: nejvzdálenější jako první</string>
-    <string name="distance_nearest">Vzdálenost: nejbližší jako první</string>
+    <string name="distance_farthest">Nejvzdálenější jako první</string>
+    <string name="distance_nearest">Nejbližší jako první</string>
     <string name="rendering_attr_whiteWaterSports_name">Divoká voda</string>
     <string name="osmand_extended_description_part2">GPS navigace 
 \n• Vyberte si mezi offline režimem (bez roamingových poplatků v zahraničí) a online režimem (rychlejší) 
@@ -2658,7 +2658,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="unlock_all_features">Odemknout všechny funkce OsmAnd</string>
     <string name="purchase_dialog_title">Vyberte si předplatné</string>
     <string name="purchase_dialog_travel_description">Chcete-li dostávat offline články o cestování, je třeba koupit jednu z následujících položek:</string>
-    <string name="purchase_dialog_subtitle">Vyberte vhodnou položku:</string>
+    <string name="purchase_dialog_subtitle">Vyberte vhodnou položku</string>
     <string name="shared_string_dont">Nedělat</string>
     <string name="shared_string_do">Dělat</string>
     <string name="shared_string_only_with_wifi">Pouze na WiFi</string>
@@ -2675,7 +2675,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="download_maps_travel">Cestovní průvodce</string>
     <string name="shared_string_wikivoyage">Wikivoyage</string>
     <string name="article_removed">Článek odstraněn</string>
-    <string name="wikivoyage_search_hint">Vyhledávání: stát, město, kraj</string>
+    <string name="wikivoyage_search_hint">Hledejte stát, město nebo kraj</string>
     <string name="shared_string_read">Číst</string>
     <string name="saved_articles">Články v záložkách</string>
     <string name="shared_string_explore">Prozkoumat</string>
@@ -2693,8 +2693,8 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="download_file">Stáhnout soubor</string>
     <string name="start_editing">Začít s úpravami</string>
     <string name="get_unlimited_access">Získejte neomezený přístup</string>
-    <string name="monthly_map_updates">Aktualizace map: každý měsíc</string>
-    <string name="daily_map_updates">Aktualizace map: každou hodinu</string>
+    <string name="monthly_map_updates">Aktualizace map každý měsíc</string>
+    <string name="daily_map_updates">Aktualizace map každou hodinu</string>
     <string name="download_wikipedia_description">Stáhnout články Wikipedie pro %1$s a číst je v režimu offline.</string>
     <string name="download_wikipedia_label">Stahování dat z Wikipedie</string>
     <string name="open_in_browser_wiki">Otevřít článek online</string>
@@ -2718,9 +2718,9 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="quick_action_edit_actions">Upravit akce</string>
     <string name="get_osmand_live">Získejte OsmAnd Live pro odemknutí všech funkcí: Denní aktulizace mapových podkladů s neomezeným počtem stahování, všechny placené moduly, propojení s Wikipedia, Wikivoyage a mnoho dalšího.</string>
     <string name="thank_you_for_feedback">Děkujeme za Vaši zpětnou vazbu</string>
-    <string name="poi_cannot_be_found">Na Váš dotaz nebylo nic nalezeno.</string>
-    <string name="search_no_results_feedback">Žádný výsledek vyhledávání?
-\nDejte nám o tom vědět, ať to můžeme zlepšit</string>
+    <string name="poi_cannot_be_found">Bod nebo cesta nebyly nalezeny.</string>
+    <string name="search_no_results_feedback">Žádný výsledek vyhledávání\?
+\nPoskytněte nám zpětnou vazbu</string>
     <string name="release_3_1">• Navigace: Opravený indikátor průběhu, přidána možnost pro rychlé prohození začátku a konce trasy 
 \n 
 \n • Mapové značky: Opravena možnost zapnutí/vypnutí skupin, nově možnost skrýt značky na mapě 
@@ -2737,7 +2737,8 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n</string>
     <string name="commiting_way">Odesílání cesty…</string>
     <string name="increase_search_radius_to">Zvětšit okruh hledání na %1$s</string>
-    <string name="send_search_query_description">Bude odeslán váš dotaz pro vyhledávání: \"%1$s\" a také vaše poloha. \n
+    <string name="send_search_query_description">Váš vyhledávací dotaz a poloha budou odeslány na: \"%1$s\".
+\n
 \n Nedochází k žádnému shromažďování osobních údajů. Zaslaná data slouží pouze k vylepšení vyhledávacího algoritmu.</string>
     <string name="send_search_query">Odeslat data?</string>
     <string name="shared_string_world">Celý svět</string>
@@ -2748,7 +2749,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="coord_input_save_as_track_descr">Bylo přidáno %1$s bodů. Zadejte název a klepněte na \"Uložit\".</string>
     <string name="unirs_render_descr">Upravený základní styl pro zvýšení kontrastu pěších a cyklistických cest. Používá starší barvy Mapnik.</string>
     <string name="shared_string_bookmark">Záložka</string>
-    <string name="off_road_render_descr">Vhodný pro off-road terénní jízdu. Vhodný pro použití se zelenými satelitními snímky použitými jako podkladová vrstva. Zmenšená tloušťka hlavních cest a naopak zvětšená tloušťka polních cest, pěšin, cyklotras a dalších cest. Založeno na \"Topo\" stylu.</string>
+    <string name="off_road_render_descr">Pro off-road terénní jízdu, založený na stylu \'Topo\' a pro použití se zelenými satelitními snímky jako podkladovou vrstvou. Zmenšená tloušťka hlavních cest, zvětšená tloušťka polních cest, pěšin, cyklotras a dalších cest.</string>
     <string name="open_wikipedia_link_online">Otevřít odkaz Wikipedia na internetu</string>
     <string name="open_wikipedia_link_online_description">Odkaz bude otevřen v internetovém prohlížeči.</string>
     <string name="read_wikipedia_offline_description">Stahování Wikipedia a Wikivoyage článků pro čtení offline je dostupné pouze předplatitelům OsmAnd Live.</string>
@@ -2764,21 +2765,21 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="access_intermediate_arrival_time">Čas příjezdu do mezicíle</string>
     <string name="map_widget_intermediate_time">Do průjezdního bodu</string>
     <string name="test_voice_desrc">Klepněte na tlačítko pro vyslechnutí odpovídajícího hlasového pokynu, aby jste zjistili chybné nebo chybějící pokyny.</string>
-    <string name="nautical_render_descr">Plavební navigační styl. Klíčové vlastnosti: Bóje, majáky, plavební cesty, mořské cesty a značky, přístavy, námořní služby, plavební hloubka.</string>
-    <string name="ski_map_render_descr">Zimní režim. Klíčové vlastnosti: Vykresluje sjezdovky, lyžařské vleky a další praktické objekty pro lyžaře a snowboardisty. Nedůležité objekty jsou na mapě méně výrazné.</string>
+    <string name="nautical_render_descr">Pro námořní navigaci. Obsahuje bóje, majáky, plavební cesty, mořské cesty a značky, přístavy, námořní služby a hloubkové vrstevnice.</string>
+    <string name="ski_map_render_descr">Pro lyžování. Obsahuje sjezdovky, lyžařské vleky, běžkařské trasy atd. Nedůležité objekty jsou na mapě méně výrazné.</string>
     <string name="welcome_to_open_beta">Vítejte v otevřené beta verzi</string>
-    <string name="light_rs_render_descr">Jednoduchý a kontrastní styl pro automobilovou navigaci. Příjemný na oči v nočním režimu. Klíčové vlastnosti: Vrstevnice, kontrastní oranžové silnice, druhořadé objekty jsou méně výrazné.</string>
-    <string name="topo_render_descr">Kontrastní styl určený primárně pro pěší turistiku a cyklistiku v přírodě. Dobrá čitelnost při složitém venkovním osvětlením. Klíčové vlastnosti: kontrastní silnice a přírodních objekty, různé typy tras, vrstevnice s rozšířeným nastavením, více detailů při odpovídající úrovni zvětšení než ve výchozím stylu. Umožňuje rozlišit kvalitu povrchu vozovky. Nemá noční režim.</string>
-    <string name="mapnik_render_descr">Starý styl vykreslení jako výchozí \"Mapnik\". Klíčové vlastnosti: barvy jsou podobné \"Mapnik\" stylu.</string>
-    <string name="touring_view_render_descr">Vysoce detailní styl pro účely cestování. Obsahuje všechna nastavení z výchozího stylu a navíc zobrazuje maximum detailů, především všechny silnice, cesty a jiné způsoby cestování. Jasně rozlišuje různé typy cest, podobně jako mnohé cestovní atlasy. Vysoce kontrastní schéma pro venkovní použití, denní a noční režim.</string>
-    <string name="default_render_descr">Obecný styl. Zjednodušené vykreslování v hustě osídlených městech. Klíčové vlastnosti: vrstevnice, trasy, kvalita povrchu cest, omezení přístupu, čísla cest, značení dle SAC, objekty pro vodní sporty.</string>
+    <string name="light_rs_render_descr">Jednoduchý styl pro automobilovou navigaci. Příjemný noční režim, vrstevnice, kontrastní oranžové silnice, druhořadé objekty jsou méně výrazné.</string>
+    <string name="topo_render_descr">Pro pěší turistiku a cyklistiku v přírodě. Dobře čitelný venku. Kontrastní silnice a přírodních objekty, různé typy tras, vrstevnice s rozšířeným nastavením, více detailů. Umožňuje rozlišit kvalitu povrchu vozovky. Nemá noční režim.</string>
+    <string name="mapnik_render_descr">Starý výchozí styl \'Mapnik\'. Barvy jsou podobné jako styl \'Mapnik\'.</string>
+    <string name="touring_view_render_descr">Styl pro cestování s vysokým kontrastem a maximálními detaily. Obsahuje všechna nastavení ze základního stylu OsmAnd a navíc zobrazuje maximum detailů, především silnice, cesty a jiné způsoby cestování. Jasně rozlišuje různé typy cest, podobně jako cestovní atlasy. Vhodný pro použití ve dne, v noci i venku.</string>
+    <string name="default_render_descr">Obecný styl. Čisté vykreslování hustě osídlených měst. Obsahuje vrstevnice, trasy, kvalita povrchu cest, omezení přístupu, čísla cest, značení dle SAC, objekty pro vodní sporty.</string>
     <string name="travel_card_download_descr">Stáhněte si cestovní průvodce Wikivoyage a prohlížejte články o místech po celém světě bez připojení na internet.</string>
     <string name="start_editing_card_image_text">Bezplatný cestovní průvodce, který může upravovat každý.</string>
     <string name="welcome_to_open_beta_description">Cestovní průvodci jsou nyní založené na Wikivoyage. Všechny jejich funkce můžete otestovat zdarma během beta testování. Poté budou zpřístupněny předplatitelům služby OsmAnd Live a uživatelům OsmAnd+.</string>
-    <string name="start_editing_card_description">Můžete (a měli byste) upravovat libovolný článek na Wikivoyage. Sdílejte znalosti, zkušenosti, talent a svoji pozornost</string>
+    <string name="start_editing_card_description">Můžete (a měli byste) upravovat libovolný článek na Wikivoyage. Sdílejte znalosti, zkušenosti, talent a svoji pozornost.</string>
     <string name="ask_for_location_permission">Pro pokračování prosím udělte OsmAndu oprávnění pro přístup k poloze.</string>
     <string name="rendering_value_black_name">Černá</string>
-    <string name="more_transport_on_stop_hint">Na této zastávce je další provoz.</string>
+    <string name="more_transport_on_stop_hint">Z této zastávky je možná další doprava.</string>
     <string name="release_3_2_pre">• Opraven pád při startu, ke kterému docházelo na některých zařízeních 
 \n 
 \n • Nová akce značek: zobraz značky, které již byly projety 
@@ -2794,7 +2795,7 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n• Měření vzdálenosti: tlačítko \"Měření\" přidáno do akcí v kontextovém menu 
 \n</string>
     <string name="search_street">Hledat ulici</string>
-    <string name="start_search_from_city">Nejprve vyberte město</string>
+    <string name="start_search_from_city">Nejprve zvolte město/oblast</string>
     <string name="shared_string_restore">Obnovit</string>
     <string name="keep_passed_markers_descr">Značky, přidané jako skupina oblíbených nebo GPX bodů a označené jako prošlé, zůstanou na mapě. Pokud skupina není aktivní, značky zmizí z mapy.</string>
     <string name="keep_passed_markers">Ponechat prošlé značky na mapě</string>
@@ -2813,8 +2814,8 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="osm_live_payment_renews_quarterly">Obnovuje se čtvrtletně</string>
     <string name="osm_live_payment_renews_annually">Obnovuje se ročně</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
-    <string name="osm_live_payment_header">Vyberte si frekvenci plateb, která vám vyhovuje:</string>
-    <string name="osm_live_payment_contribute_descr">Část příjmů je posílána přispěvatelům OpenStreetMap.</string>
+    <string name="osm_live_payment_header">Interval plateb:</string>
+    <string name="osm_live_payment_contribute_descr">Příspěvky pomáhají financovat tvorbu map OSM.</string>
     <string name="powered_by_osmand">OsmAnd</string>
     <string name="osm_live_subscriptions">Předplatné</string>
     <string name="mapillary_menu_title_pano">Zobrazit pouze 360° obrázky</string>
@@ -2831,9 +2832,9 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_capacity">Kapacita</string>
     <string name="shared_string_width">Šířka</string>
     <string name="shared_string_height">Výška</string>
-    <string name="add_destination_point">Přidat cíl</string>
+    <string name="add_destination_point">Zadat cíl</string>
     <string name="add_intermediate_point">Přidat mezicíl</string>
-    <string name="add_start_point">Přidat počáteční bod</string>
+    <string name="add_start_point">Zadat počáteční bod</string>
     <string name="intermediate_waypoint">Mezicíl</string>
     <string name="transfers">přestupy</string>
     <string name="on_foot">pěšky</string>
@@ -2845,7 +2846,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="show_along_the_route">Ukázat podél trasy</string>
     <string name="simulate_navigation">Simulovat navigaci</string>
     <string name="choose_track_file_to_follow">Vyberte soubor s trasou, kterou chcete následovat</string>
-    <string name="voice_announcements">Hlasová oznámení</string>
+    <string name="voice_announcements">Hlasové výzvy</string>
     <string name="intermediate_destinations">Mezicíle</string>
     <string name="arrive_at_time">Příjezd v %1$s</string>
     <string name="add_destination_query">Nejdříve prosím zadejte cíl</string>
@@ -2864,12 +2865,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="routeInfo_road_types_name">Typy silnic</string>
     <string name="exit_at">Výjezd na</string>
     <string name="shared_string_swap">Vyměnit</string>
-    <string name="quick_action_show_hide_gpx_tracks">Zobrazit/skrýt GPX trasy</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">Klepnutím na toto tlačítko akce se zobrazí nebo skryjí vybrané GPX trasy na mapě</string>
-    <string name="quick_action_gpx_tracks_hide">Skrýt GPX trasy</string>
-    <string name="quick_action_gpx_tracks_show">Zobrazit GPX trasy</string>
+    <string name="quick_action_show_hide_gpx_tracks">Zobrazit/skrýt stopy</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">Tlačítko pro zobrazení nebo skrytí vybraných stop na mapě</string>
+    <string name="quick_action_gpx_tracks_hide">Skrýt stopy</string>
+    <string name="quick_action_gpx_tracks_show">Zobrazit stopy</string>
     <string name="transfers_size">%1$d přenosů</string>
-    <string name="add_start_and_end_points">Přidat počáteční a koncový bod</string>
+    <string name="add_start_and_end_points">Přidat počáteční a cílový bod</string>
     <string name="route_add_start_point">Přidat počáteční bod</string>
     <string name="route_descr_select_start_point">Zvolit počáteční bod</string>
     <string name="rendering_attr_surface_unpaved_name">Nezpevněný</string>
@@ -2926,8 +2927,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="quick_action_day_night_mode">%s režim</string>
     <string name="avoid_pt_types">Vyhněte se typům dopravy…</string>
     <string name="shared_string_walk">Chůze</string>
-    <string name="save_poi_value_exceed_length">Maximální délka názvu značky \"%s\" je 255 znaků. 
-\nPro pokračování zkraťte.</string>
+    <string name="save_poi_value_exceed_length">Zkraťte délku názvu značky \"%s\" na méně než 255 znaků.</string>
     <string name="save_poi_value_exceed_length_title">Délka hodnoty \"%s\"</string>
     <string name="release_3_3">"• Nová obrazovka \'Pokyny\': Zobrazuje tlačítka pro cíl Domov a Práce, zkratku pro \'předchozí trasu\', seznam aktivních GPX tras a značek, historii vyhledávání
 \n 
@@ -2951,18 +2951,18 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_milliradians">Miliradiány</string>
     <string name="angular_measeurement">Úhlová jednotka</string>
     <string name="angular_measeurement_descr">Změní jednotku měření azimutu.</string>
-    <string name="routing_attr_avoid_tram_name">Vyhnout se tramvajím</string>
-    <string name="routing_attr_avoid_tram_description">Vyhnout se tramvajím</string>
-    <string name="routing_attr_avoid_bus_name">Vyhnout se autobusům</string>
-    <string name="routing_attr_avoid_bus_description">Vyhnout se autobusům a trolejbusům</string>
-    <string name="routing_attr_avoid_share_taxi_name">Vyhnout se sdíleným taxi</string>
-    <string name="routing_attr_avoid_share_taxi_description">Vyhnout se sdíleným taxi</string>
-    <string name="routing_attr_avoid_train_name">Vyhnout se vlakům</string>
-    <string name="routing_attr_avoid_train_description">Vyhnout se vlakům</string>
-    <string name="routing_attr_avoid_subway_name">Vyhnout se metru</string>
+    <string name="routing_attr_avoid_tram_name">Žádné tramvaje</string>
+    <string name="routing_attr_avoid_tram_description">Vyhne se tramvajím</string>
+    <string name="routing_attr_avoid_bus_name">Žádné autobusy</string>
+    <string name="routing_attr_avoid_bus_description">Vyhne se autobusům a trolejbusům</string>
+    <string name="routing_attr_avoid_share_taxi_name">Žádná sdílená taxi</string>
+    <string name="routing_attr_avoid_share_taxi_description">Vyhne se sdíleným taxi</string>
+    <string name="routing_attr_avoid_train_name">Žádné vlaky</string>
+    <string name="routing_attr_avoid_train_description">Vyhne se vlakům</string>
+    <string name="routing_attr_avoid_subway_name">Žádné metro</string>
     <string name="routing_attr_avoid_subway_description">Vyhnout se metru a lehké železniční dopravě</string>
-    <string name="routing_attr_avoid_ferry_name">Vyhnout se trajektům</string>
-    <string name="routing_attr_avoid_ferry_description">Vyhnout se trajektům</string>
+    <string name="routing_attr_avoid_ferry_name">Žádné trajekty</string>
+    <string name="routing_attr_avoid_ferry_description">Vyhne se trajektům</string>
     <string name="release_3_3_7">• Zobrazování času na přestup mezi hromadnou dopravou 
 \n 
 \n • Upravené rozhraní detailů trasy 
@@ -2995,7 +2995,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="collected_data_descr">Určete, která data dovolíte aplikaci OsmAnd sdílet.</string>
     <string name="privacy_and_security_change_descr">Klepněte na „Povolit“, pokud souhlasíte s našimi %1$s</string>
     <string name="settings_privacy_and_security">Soukromí a zabezpečení</string>
-    <string name="settings_privacy_and_security_desc">Zvolte, které údaje s námi sdílíte</string>
+    <string name="settings_privacy_and_security_desc">Zvolte údaje ke sdílení</string>
     <string name="shared_string_no_thank_you">Ne, díky</string>
     <string name="shared_string_allow">Povolit</string>
     <string name="profile_name_hint">Název profilu</string>
@@ -3030,12 +3030,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="profile_alert_need_save_msg">Nejprve je třeba uložit změny profilu</string>
     <string name="profile_alert_delete_title">Odstranit profil</string>
     <string name="profile_alert_delete_msg">Opravdu chcete odstranit profil „%s“</string>
-    <string name="select_base_profile_dialog_title">Zvolte základní profil</string>
+    <string name="select_base_profile_dialog_title">Zvolte výchozí profil</string>
     <string name="select_nav_profile_dialog_title">Vyberte typ navigace</string>
     <string name="base_profile_descr_car">Auto, nákladní auto, motocykl</string>
     <string name="base_profile_descr_bicycle">Horské kolo, moped, kůň</string>
     <string name="base_profile_descr_pedestrian">Chůze, turistika, běh</string>
-    <string name="base_profile_descr_public_transport">Všechny typy hromadné dopravy</string>
+    <string name="base_profile_descr_public_transport">Typy hromadné dopravy</string>
     <string name="base_profile_descr_boat">Loď, veslování, plachtění</string>
     <string name="base_profile_descr_aircraft">Letadlo, plachtění</string>
     <string name="routing_profile_geocoding">Geokódování</string>
@@ -3071,7 +3071,7 @@ Zobrazená oblast: %1$s x %2$s</string>
 \n 
 \nSvoji volbu můžete kdykoliv změnit v Nastavení &gt; Soukromí a zabezpečení.</string>
     <string name="downloaded_maps_collect_descr">Pomozte nám pochopit, které regiony a země jsou v mapách nejpopulárnější.</string>
-    <string name="visited_screens_collect_descr">Pomozte nám pochopit, které funkce OsmAnd jsou nejpopulárnější.</string>
+    <string name="visited_screens_collect_descr">Pomůže nám zjistit popularitu funkcí OsmAnd.</string>
     <string name="osmand_routing_promo">Můžete přidat vaši vlastní upravenou verzi souboru routing.xml v ..osmand/routing</string>
     <string name="press_again_to_change_the_map_orientation">Klepněte znovu pro změnu orientace mapy</string>
     <string name="shared_string_min_speed">Min. rychlost</string>
@@ -3581,7 +3581,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="perform_oauth_authorization_description">Přihlásit se pomocí OAuth pro použití funkcí editace OSM</string>
     <string name="perform_oauth_authorization">Přihlásit pomocí OAuth</string>
     <string name="clear_osm_token">Vymazat OpenStreetMap OAuth token</string>
-    <string name="osm_edit_logout_success">Odhlášení úspěšné</string>
+    <string name="osm_edit_logout_success">Byli jste odhlášeni</string>
     <string name="file_already_imported">Soubor je již importovaný v OsmAnd</string>
     <string name="use_two_phase_routing">Použít dvoufázový algoritmus A* pro výpočet trasy</string>
     <string name="shared_string_graph">Graf</string>
@@ -3740,7 +3740,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="simulate_your_location_gpx_descr">Simulovat polohu pomocí zaznamenané stopy GPX.</string>
     <string name="what_is_new">Co je nového</string>
-    <string name="quick_action_directions_from_desc">Tlačítko pro určení středu obrazovky jako výchozího bodu a výpočet trasy do cíle nebo otevření dialogu pro výběr cíle.</string>
+    <string name="quick_action_directions_from_desc">Tlačítko pro nastavení středu obrazovky jako výchozího bodu a výpočet trasy do cíle nebo otevření dialogu pro výběr cíle.</string>
     <string name="snowmobile_render_descr">Pro jízdu na sněžném vozidle na vyhrazených cestách.</string>
     <string name="select_base_profile_dialog_message">Vlastní profil založte na jednom ze základních profilů. Ten určí základní nastavení jako viditelnost nástrojů, jednotky rychlosti a vzdálenosti. Toto jsou základní profily aplikace a návrhy vlastních profilů, na které mohou být rozšířeny:</string>
     <string name="button_rate">Ohodnotit</string>
@@ -3893,28 +3893,28 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="plugin_global_prefs_info">Tato nastavení jsou globální a platí pro všechny profily</string>
     <string name="login_open_street_map">Přihlásit se do OpenStreetMap</string>
     <string name="login_open_street_map_org">Přihlásit se do OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">Zaregistrovat se do OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">Přihlásit se do OpenStreetMap</string>
     <string name="osm_edits_view_descr">Můžete zobrazit své dosud neodeslané změny či chyby v OSM v %1$s. Odeslané body se již v OsmAnd nezobrazují.</string>
-    <string name="open_street_map_login_mode">Musíte se přihlásit, abyste mohli odesílat nová nebo změněná data.
+    <string name="open_street_map_login_mode">Přihlaste se, abyste mohli odesílat nová nebo změněná data,
 \n
-\nMůžete se přihlásit pomocí bezpečné metody OAuth, nebo pomocí jména a hesla.</string>
-    <string name="use_login_password">Použít jméno a heslo</string>
+\nbuď pomocí bezpečné metody OAuth, nebo pomocí jména a hesla.</string>
+    <string name="use_login_password">Přihlásit se pomocí jména a hesla</string>
     <string name="login_account">Účet</string>
-    <string name="user_login">Přihlašovací jméno</string>
+    <string name="user_login">Uživatelské jméno</string>
     <string name="markers_history">Historie značek</string>
     <string name="gpx_upload_public_visibility_descr">\"Veřejná\" znamená, že trasa je veřejně dostupná ve vašich GPS trasách, ve veřejných seznamech GPS tras a také ve veřejném seznamu stop s nezpracovanými časovými razítky. Data poskytnutá prostřednictvím API nebudou odkazovat na vaši stránku s trasou. Časová razítka bodů trasy nebudou dostupná prostřednictvím veřejného GPS API a body nebudou chronologicky seřazeny.</string>
     <string name="gpx_upload_private_visibility_descr">\"Soukromá\" znamená, že trasa se neobjeví v žádném veřejném seznamu a body trasy budou dostupné prostřednictvím veřejného GPS API bez časových razítek a nebudou chronologicky seřazeny.</string>
     <string name="send_files_to_openstreetmap">Odeslat soubor GPX do OpenStreetMap</string>
     <string name="enter_text_separated">Zadejte značky oddělené čárkou.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Sledovatelná znamená, že trasa se neobjeví v žádném veřejném seznamu, ale body trasy budou dostupné prostřednictvím veřejného GPS API s časovými razítky. Ostatní uživatelé si budou moci stáhnout zpracované body z vaší trasy, které ale nebude možné přímo spojit s vámi.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identifikovatelná znamená, že trasa bude veřejně dostupná ve vašich GPS trasách a veřejných seznamech GPS tras, tzn. ostatní uživatelé si budou moci stáhnout nezpracovanou trasu a propojit ji s vaším uživatelským jménem. Data poskytnutá prostřednictvím API se budou odkazovat na vaši původní stránku s trasou. Časová razítka bodů trasy budou dostupná prostřednictvím veřejného GPS API.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Sledovatelná\" znamená, že trasa se neobjeví v žádném veřejném seznamu, ale zpracované body trasy s časovými razítky (které nelze přímo spojit s vámi) budou dostupné prostřednictvím veřejného GPS API.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identifikovatelná\" znamená, že trasa bude veřejně dostupná ve vašich GPS trasách a veřejných seznamech GPS tras, tzn. ostatní uživatelé si budou moci stáhnout nezpracovanou trasu a propojit ji s vaším uživatelským jménem. Veřejná data bodů trasy s časovými razítky poskytnutá prostřednictvím GPS API se budou odkazovat na vaši původní stránku s trasou.</string>
     <string name="osm_edit_close_note">Zavřít OSM poznámku</string>
     <string name="osm_edit_comment_note">Komentovat OSM poznámku</string>
-    <string name="osm_login_descr">Můžete se přihlásit bezpečnou metodou OAuth nebo použít své přihlašovací jméno a heslo.</string>
+    <string name="osm_login_descr">Přihlaste se bezpečnou metodou OAuth nebo použijte své přihlašovací jméno a heslo.</string>
     <string name="shared_string_add_photo">Přidat fotku</string>
     <string name="register_on_openplacereviews">Zaregistrovat na
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotografie poskytuje open source projekt OpenPlaceReviews.org. Před odesláním svých fotografií se musíte zaregistrovat na webové stránce.</string>
+    <string name="register_on_openplacereviews_desc">Přihlaste se na webových stránkách open source projektu OpenPlaceReviews.org a budete moci odesílat ještě více fotografií.</string>
     <string name="register_opr_create_new_account">Vytvořit nový účet</string>
     <string name="register_opr_have_account">Už mám účet</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
@@ -3948,4 +3948,18 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_search_history">Historie vyhledávání</string>
     <string name="app_mode_kayak">Kajak</string>
     <string name="app_mode_motorboat">Motorový člun</string>
+    <string name="add_to_mapillary">Přidat do Mapillary</string>
+    <string name="add_to_opr">Přidat do OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd zobrazuje fotografie z několika zdrojů:
+\nOpenPlaceReviews - fotografie bodů zájmu
+\nMapillary - pouliční fotografie
+\nWeb / Wikimedia - fotografie bodů zájmu specifikované v OpenStreetMap datech.</string>
+    <string name="shared_string_resources">Zdroje</string>
+    <string name="approximate_file_size">Přibližná velikost souboru</string>
+    <string name="select_data_to_export">Vyberte data k exportu do souboru.</string>
+    <string name="file_size_needed_for_import">Vyžadováno pro import</string>
+    <string name="export_not_enough_space_descr">Na vašem zařízení je volných pouze %1$s. Uvolněte prosím nějaké místo nebo zrušte některé položky k exportu.</string>
+    <string name="export_not_enough_space">Není zde dostatek místa</string>
+    <string name="select_groups_for_import">Vyberte skupiny, které se mají importovat.</string>
+    <string name="select_items_for_import">Vyberte položky, které se mají importovat.</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -3264,7 +3264,7 @@
     <string name="voice_announces_info">Οι φωνητικές ανακοινώσεις να γίνονται μόνο κατά την πλοήγηση.</string>
     <string name="voice_announces_descr">Οδηγίες πλοήγησης και ανακοινώσεις</string>
     <string name="voice_announces">Φωνητικές ανακοινώσεις</string>
-    <string name="screen_alerts">Οπτικές προειδοποιήσεις</string>
+    <string name="screen_alerts">Προειδοποιήσεις οθόνης</string>
     <string name="route_parameters_descr">Ρύθμιση παραμέτρων διαδρομής</string>
     <string name="route_parameters">Παράμετροι διαδρομής</string>
     <string name="default_speed_dialog_msg">Εκτιμά τον χρόνο άφιξης αγνώστων τύπων δρόμων και περιορίζει την ταχύτητα σε όλους τους δρόμους (μπορεί να επηρεάσει τη διαδρομή)</string>

OsmAnd/res/values-eo/phrases.xml

@@ -3843,4 +3843,34 @@
     <string name="poi_parking_rooftop">tegmento</string>
     <string name="poi_gpx_point">GPX-punkto</string>
     <string name="poi_radar_tower">Radar-turo</string>
+    <string name="poi_liaison_liaison_office">oficejo</string>
+    <string name="poi_consulate_honorary_consul">honora konsulo</string>
+    <string name="poi_consulate_consulate_general">ĝenerala konsulejo</string>
+    <string name="poi_consulate_consular_office">konsula oficejo</string>
+    <string name="poi_consulate_consular_agency">konsula agentejo</string>
+    <string name="poi_consulate_yes">gvidata de konsulo</string>
+    <string name="poi_embassy_residence">rezidejo</string>
+    <string name="poi_embassy_nunciature">nunciejo</string>
+    <string name="poi_embassy_mission">misio</string>
+    <string name="poi_embassy_interests_section">sekcio de interesoj</string>
+    <string name="poi_embassy_high_commission">alta komisario</string>
+    <string name="poi_embassy_delegation">delegitaro</string>
+    <string name="poi_embassy_branch_embassy">branĉo</string>
+    <string name="poi_embassy_yes">gvidata de ambasadestro</string>
+    <string name="poi_diplomatic_liaison">kvazaŭ-ambasadejo</string>
+    <string name="poi_diplomatic_embassy">ambaadejo</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servoj por ŝtatanoj</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Vizoj enmigraj</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vizoj neenmigraj</string>
+    <string name="poi_liaison_filter">Kvazaŭ‑ambasadejo</string>
+    <string name="poi_consulate_filter">Konsulejo</string>
+    <string name="poi_embassy_filter">Ambasadejo</string>
+    <string name="poi_diplomatic_services_citizen_services_no">ne</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">jes</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">ne</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">jes</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">ne</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">jes</string>
+    <string name="poi_liaison_subnational">subŝtata/provinca oficejo</string>
+    <string name="poi_liaison_representative_office">reprezenta oficejo</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -415,7 +415,7 @@
     <string name="open_street_map_login_and_pass">Uzantnomo kaj pasvorto al OSM</string>
     <string name="application_dir">Datum-konservada dosierujo</string>
     <string name="filter_poi_hint">Filtri laŭ nomo</string>
-    <string name="search_poi_category_hint">Entajpu ion por serĉi</string>
+    <string name="search_poi_category_hint">Enigu ion por serĉi</string>
     <string name="agps_info">A-GPS informoj</string>
     <string name="rendering_attr_OSMMapperAssistant_name">Etikedoj “riparu min!”</string>
     <string name="shared_string_manage">Administri</string>
@@ -749,9 +749,9 @@
     <string name="index_item_world_altitude_correction">Korekto de altitudo</string>
     <string name="index_item_world_seamarks">Tutmondaj maraj navigadpunktoj</string>
     <string name="access_category_choice">Elektu kategorion</string>
-    <string name="access_hint_enter_name">Entajpu nomon</string>
-    <string name="access_hint_enter_category">Entajpu kategorion</string>
-    <string name="access_hint_enter_description">Entajpu priskribon.</string>
+    <string name="access_hint_enter_name">Enigu nomon</string>
+    <string name="access_hint_enter_category">Enigu kategorion</string>
+    <string name="access_hint_enter_description">Enigu priskribon.</string>
     <string name="access_default_color">Norma koloro</string>
     <string name="map_widget_magnetic_bearing">Magneta direkto</string>
     <string name="map_widget_bearing">Relativa direkto</string>
@@ -1596,7 +1596,7 @@
     <string name="renderers_descr">Elekti manieron de bildigado de vektora mapo</string>
     <string name="poi_context_menu_website">Montri retpaĝon de interesejo</string>
     <string name="poi_context_menu_call">Montri telefonon de interesejo</string>
-    <string name="download_type_to_filter">entajpu tekston por filtri</string>
+    <string name="download_type_to_filter">enigu tekston por filtri</string>
     <string name="use_high_res_maps">Alta ekrandistingivo</string>
     <string name="use_high_res_maps_descr">Ne etendi (kaj malklarigi) map‑kahelojn ĉe alt‑distingivaj ekranoj.</string>
     <string name="context_menu_item_search_transport">Serĉi transporton publikan</string>
@@ -1651,7 +1651,7 @@
     <string name="error_occurred_loading_gpx">Ne povas ŝargi GPX.</string>
     <string name="send_report">Sendi raporton</string>
     <string name="none_region_found">Ne povas trovi iujn elŝutitajn mapojn en la SD-karto.</string>
-    <string name="poi_namefinder_query_empty">Entajpu serĉatan interesejon</string>
+    <string name="poi_namefinder_query_empty">Enigu serĉatan interesejon</string>
     <string name="any_poi">Ia</string>
     <string name="thanks_yandex_traffic">Dankon al Yandex pro informoj pri trafiko.</string>
     <string name="layer_yandex_traffic">Yandex - informoj pri trafiko</string>
@@ -1805,7 +1805,7 @@
     <string name="navigate_point_format_DMS">GGG:MM:SS.S</string>
     <string name="search_address_top_text">Adreso</string>
     <string name="context_menu_item_create_poi">Krei interesejon</string>
-    <string name="add_favorite_dialog_top_text">Entajpu nomon de ŝatata ejo</string>
+    <string name="add_favorite_dialog_top_text">Enigu nomon de ŝatata ejo</string>
     <string name="add_favorite_dialog_default_favourite_name">Ŝatataj</string>
     <string name="add_favorite_dialog_favourite_added_template">Aldonis ŝatatan punkton “{0}”.</string>
     <string name="favourites_context_menu_add">Aldoni al ŝatataj</string>
@@ -1905,7 +1905,7 @@
     <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="application_dir_description">Bonvolu elekti kie vi volas konservi mapoj kaj aliaj datum-dosieroj.</string>
-    <string name="enter_country_name">Entajpu nomon de lando</string>
+    <string name="enter_country_name">Enigu nomon de lando</string>
     <string name="new_version">Nova versio</string>
     <string name="begin_with_osmand_menu_group">Unuaj paŝoj kun OsmAnd</string>
     <string name="features_menu_group">Ebloj</string>
@@ -1947,7 +1947,7 @@
     <string name="number_of_contributors">Nombro da kontribuintoj</string>
     <string name="number_of_edits">Nombro da redaktoj</string>
     <string name="reports_for">Raportoj por</string>
-    <string name="file_name_containes_illegal_char">Dosiernomo enhavas malpermesitan signon</string>
+    <string name="file_name_containes_illegal_char">Malpermesata signo en dosiernomo</string>
     <string name="items_were_selected">{0} elemento(j) elektita(j)</string>
     <string name="coords_format">Koordinat-formo</string>
     <string name="coords_format_descr">Formo de geografiaj koordinatoj.</string>
@@ -2038,7 +2038,7 @@
     <string name="subcategories">Subkategorioj</string>
     <string name="translit_names">Transliterumi nomojn</string>
     <string name="translit_name_if_miss">Transliterumi, se nomo en %1$s mankas</string>
-    <string name="search_hint">Entajpu urbon, adreson aŭ nomon de interesejo</string>
+    <string name="search_hint">Enigu urbon, adreson aŭ nomon de interesejo</string>
     <string name="rendering_value_light_brown_name">Bronzkolora hela</string>
     <string name="rendering_value_dark_brown_name">Bronzkolora malhela</string>
     <string name="rendering_attr_contourColorScheme_name">Kolor-skemo de nivelkurboj</string>
@@ -2366,12 +2366,12 @@
     <string name="quick_action_auto_zoom_on">Aktivigi aŭtomatan map-skaladon</string>
     <string name="quick_action_auto_zoom_off">Malaktivigi aŭtomatan map-skaladon</string>
     <string name="shared_string_paused">Paŭzigita</string>
-    <string name="type_city_town">Entajpu urbon aŭ lokon</string>
-    <string name="type_postcode">Entajpu poŝtkodon</string>
+    <string name="type_city_town">Enigu urbon aŭ lokon</string>
+    <string name="type_postcode">Enigu poŝtkodon</string>
     <string name="nearest_cities">Proksimaj urboj</string>
     <string name="select_city">Elekti urbon</string>
     <string name="select_postcode">Serĉi poŝtkodon</string>
-    <string name="type_address">Entajpu adreson</string>
+    <string name="type_address">Enigu adreson</string>
     <string name="select_street">Elekti straton</string>
     <string name="shared_string_in_name">en %1$s</string>
     <string name="shared_string_overview">Sumigo</string>
@@ -2415,7 +2415,7 @@
     <string name="no_photos_descr">Neniuj fotoj tie ĉi.</string>
     <string name="shared_string_install">Instali</string>
     <string name="improve_coverage_mapillary">Pliigi fotan atingon de Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Instalu Mapillary por aldoni fotojn al tiu ĉi loko sur la mapo.</string>
+    <string name="improve_coverage_install_mapillary_desc">Instalu la aplikaĵon Mapillary por aldoni fotojn al tiu ĉi loko sur la mapo.</string>
     <string name="open_mapillary">Malfermi Mapillary</string>
     <string name="mapillary_image">Mapillary-foto</string>
     <string name="distance_moving">Korektita distanco</string>
@@ -2430,7 +2430,7 @@
     <string name="mapillary_menu_date_from">de</string>
     <string name="mapillary_menu_descr_dates">Montri bildojn aldonitajn nur</string>
     <string name="mapillary_menu_title_dates">Dato</string>
-    <string name="mapillary_menu_edit_text_hint">Entajpu uzantnomon</string>
+    <string name="mapillary_menu_edit_text_hint">Enigu uzantnomon</string>
     <string name="mapillary_menu_descr_username">Montri nur bildojn aldonitajn de</string>
     <string name="mapillary_menu_title_username">Uzantnomo</string>
     <string name="mapillary_menu_filter_description">Filtri bildojn laŭ alŝutinto, laŭ dato aŭ laŭ tipo; aktivaj nur je pligrandigo.</string>
@@ -2456,7 +2456,7 @@
     <string name="retry">Reprovi</string>
     <string name="measurement_tool_action_bar">Esploru mapon kaj aldonu punktojn</string>
     <string name="none_point_error">Bonvolu aldoni almenaŭ unu punkton.</string>
-    <string name="enter_gpx_name">GPX-dosiera nomo:</string>
+    <string name="enter_gpx_name">Dosiernomo de GPX:</string>
     <string name="show_on_map_after_saving">Montri sur mapo post konservi</string>
     <string name="add_waypoint">Aldoni navigadpunkton</string>
     <string name="save_gpx_waypoint">Konservi GPX‑navigadpunkton</string>
@@ -2541,7 +2541,7 @@
     <string name="plan_route_no_markers_toast">Vi devas aldoni almenaŭ unu markon por uzi tiun ĉi eblon.</string>
     <string name="wrong_format">Malĝusta formo</string>
     <string name="wrong_input">Malĝusta enigo</string>
-    <string name="enter_new_name">Entajpu novan nomon</string>
+    <string name="enter_new_name">Enigu novan nomon</string>
     <string name="shared_string_back">Reen</string>
     <string name="shared_string_view">Montri</string>
     <string name="waypoints_added_to_map_markers">Aldonis intercelojn al mapmarkoj</string>
@@ -2634,7 +2634,7 @@
     <string name="copy_location_name">Kopii nomon de punkto</string>
     <string name="toast_empty_name_error">Sennoma ejo</string>
     <string name="show_closed_notes">Montri fermitajn rimarkojn</string>
-    <string name="switch_osm_notes_visibility_desc">Montri/kaŝi OSM‑rimarkojn sur la mapo.</string>
+    <string name="switch_osm_notes_visibility_desc">Montri aŭ kaŝi OSM‑rimarkojn sur la mapo.</string>
     <string name="gpx_file_desc">GPX - taŭga por elporti al JOSM aŭ aliaj OSM-redaktiloj.</string>
     <string name="osc_file_desc">OSC - taŭga por elporti al OSM.</string>
     <string name="shared_string_gpx_file">GPX-dosiero</string>
@@ -2652,8 +2652,8 @@
     <string name="make_as_start_point">Agordi kiel komencpunkton</string>
     <string name="map_import_error">Eraro dum enporti mapon</string>
     <string name="map_imported_successfully">Enportis mapon</string>
-    <string name="enter_the_file_name">Entajpu dosiernomon.</string>
-    <string name="enter_lon">Entajpu longitudon</string>
+    <string name="enter_the_file_name">Enigu dosiernomon.</string>
+    <string name="enter_lon">Enigu longitudon</string>
     <string name="enter_lat">Entajpu latitudon</string>
     <string name="enter_lat_and_lon">Entajpu latitudon kaj longitudon</string>
     <string name="dd_mm_ss_format">GG°MM′SS″</string>
@@ -2772,7 +2772,7 @@
     <string name="coord_input_edit_point">Redakti punkton</string>
     <string name="coord_input_add_point">Aldoni punkton</string>
     <string name="coord_input_save_as_track">Konservi kiel spuron</string>
-    <string name="coord_input_save_as_track_descr">Vi aldonis %1$s punktojn. Entajpu dosiernomon kaj frapetu “konservi”.</string>
+    <string name="coord_input_save_as_track_descr">Vi aldonis %1$s punktojn. Enigu dosiernomon kaj frapetu “konservi”.</string>
     <string name="point_deleted">Forigis la punkton %1$s</string>
     <string name="shared_string_world">Mondo</string>
     <string name="send_search_query_description">Ni sendos vian serĉ-peton: “%1$s” kun via pozicio.
@@ -3050,7 +3050,7 @@
     <string name="profile_type_base_string">Ĉefa profilo</string>
     <string name="profile_alert_need_routing_type_title">Elektu specon de navigado</string>
     <string name="profile_alert_need_routing_type_msg">Bonvolu elekti specon de navigo por la nova aplikaĵa profilo</string>
-    <string name="profile_alert_need_profile_name_title">Entajpu nomon por profilo</string>
+    <string name="profile_alert_need_profile_name_title">Enigu nomon por profilo</string>
     <string name="profile_alert_need_profile_name_msg">Unue devas enigi nomon por profilo.</string>
     <string name="profile_alert_duplicate_name_title">Nomo neebla</string>
     <string name="profile_alert_duplicate_name_msg">Jam ekzistas profilo kun la sama nomo</string>
@@ -3080,9 +3080,9 @@
     <string name="zoom_by_wunderlinq_descr">Rulumu supren/malsupren por ŝanĝi pligrandigon de mapo. Eskap-klavo revenas al al aplikaĵo WunderLINQ App.</string>
     <string name="zoom_by_wunderlinq">Stiri per WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Aldonu almenaŭ unu elementon al la listo en agordoj de “rapida ago”</string>
-    <string name="routing_attr_piste_type_downhill_name">Skiado alpa/malsuprenira</string>
+    <string name="routing_attr_piste_type_downhill_name">Skiado alpa kaj malsuprenira</string>
     <string name="routing_attr_piste_type_downhill_description">Skivojoj por skiado alpa (malsuprenira) kaj vojetoj al skitelferoj.</string>
-    <string name="routing_attr_piste_type_nordic_name">Skiado nordia/skikurada</string>
+    <string name="routing_attr_piste_type_nordic_name">Skiado nordia kaj skikurada</string>
     <string name="routing_attr_piste_type_nordic_description">Skivojoj por skiado nordia (skikurada).</string>
     <string name="routing_attr_piste_type_skitour_name">Skiado ekskursa</string>
     <string name="routing_attr_piste_type_skitour_description">Skivojoj ekskursaj.</string>
@@ -3261,7 +3261,7 @@
     <string name="download_detailed_map">Elŝutu la detalan mapon %s, por vidi tiun ĉi areon.</string>
     <string name="change_data_storage_full_description">Ĉu movi datum‑dosierojn OsmAnd al la nova loko\?
 \n%1$s → %2$s</string>
-    <string name="enter_path_to_folder">Entajpu dosier‑indikon</string>
+    <string name="enter_path_to_folder">Enigu dosierindikon</string>
     <string name="shared_string_select_folder">Dosierujo…</string>
     <string name="paste_Osmand_data_folder_path">Algluu dosier‑indikon por dosierujo de OsmAnd‑datumoj</string>
     <string name="change_osmand_data_folder_question">Ĉu ŝanĝi datum‑dosierujon OsmAnd\?</string>
@@ -3362,7 +3362,7 @@
     <string name="swap_start_and_destination">Anstataŭigi komencpunkton per celo</string>
     <string name="simulate_your_location_gpx_descr">Simuli vian pozicion uzante registritan GPX‑kurson.</string>
     <string name="track_saved">Konservis kurson</string>
-    <string name="empty_filename">Dosiernomo estas malplena</string>
+    <string name="empty_filename">Malplena dosiernomo</string>
     <string name="shared_string_revert">Malfari</string>
     <string name="quick_action_directions_from_desc">Butono por agordi la ekranan centron kiel komencpunkton. Sekve vi estos petita por agordi finpunkton aŭ ekos kalkulado de kurso.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Montri reton de nodoj de biciklaj kursoj</string>
@@ -3572,7 +3572,7 @@
     <string name="shared_string_legend">Mapklarigo</string>
     <string name="shared_string_hillshade">Nivelombrumo</string>
     <string name="n_items_of_z">%1$s el %2$s</string>
-    <string name="quick_action_show_hide_terrain">Montri/kaŝi teren‑formon</string>
+    <string name="quick_action_show_hide_terrain">Montri aŭ kaŝi teren‑formon</string>
     <string name="quick_action_terrain_hide">Kaŝi teren‑formon</string>
     <string name="quick_action_terrain_show">Montri teren‑formon</string>
     <string name="quick_action_terrain_descr">Butono por montri/kaŝi tavolon de formo de tereno sur la mapo.</string>
@@ -3690,10 +3690,10 @@
     <string name="additional_actions_descr">Vi povas ekigi tiujn agojn per frapeti la butonon “%1$s”.</string>
     <string name="quick_action_transport_hide">Kaŝi publikan transporton</string>
     <string name="quick_action_transport_show">Montri publikan transporton</string>
-    <string name="quick_action_show_hide_transport">Montri/kaŝi publikan transporton</string>
+    <string name="quick_action_show_hide_transport">Montri aŭ kaŝi publikan transporton</string>
     <string name="quick_action_transport_descr">Butono por montri/kaŝi publikan transporton sur la mapo.</string>
-    <string name="create_edit_poi">Krei/redakti interesejon</string>
-    <string name="add_edit_favorite">Aldoni/forigi ŝatatan ejojn</string>
+    <string name="create_edit_poi">Krei aŭ redakti interesejon</string>
+    <string name="add_edit_favorite">Aldoni aŭ forigi ŝatatan ejojn</string>
     <string name="parking_positions">Pozicioj de parkumado</string>
     <string name="reset_deafult_order">Restarigi implicitan ordigon de elementoj</string>
     <string name="back_to_editing">Reen al redaktado</string>
@@ -3876,7 +3876,7 @@
     <string name="shared_string_redo">Refari</string>
     <string name="release_3_8">• plibonigoj al “plani kurson”: eblo uzi diversajn specojn de navigo por ĉiu segmento aparte kaj ampleksi spurojn
 \n
-\n• nova menuo de aspekto por spuroj: eblo elekti koloron kaj dikecon, montri sagetojn de direkto kaj vidigi markojn de komenco/fino de la spuro
+\n• nova menuo de aspekto por spuroj: eblo elekti koloron kaj dikecon, montri sagetojn de direkto kaj vidigi markojn de komenco kaj fino de la spuro
 \n
 \n• plibonigita videblo de biciklaj nodoj
 \n
@@ -3890,7 +3890,7 @@
 \n
 \n</string>
     <string name="monitoring_control_start">Registri</string>
-    <string name="save_global_track_interval_descr">Elektu la intervalon de registrado por la ĝenerala registrado de spuro (aktivigata per la fenestraĵo “registri spuron” sur la mapo).</string>
+    <string name="save_global_track_interval_descr">Elektu la intervalon de registrado por la ĝenerala registrado de spuro (aktivigebla per la fenestraĵo “registri spuron” sur la mapo).</string>
     <string name="simplified_track">Simpligita spuro</string>
     <string name="simplified_track_description">Nur la linio de kurso estos konservita, la navigadpunktoj estos forigitaj.</string>
     <string name="shared_string_file_name">Dosiernomo</string>
@@ -3909,7 +3909,7 @@
 \n La abono aŭtomate renoviĝos escepte se ĝi estos nuligita antaŭ la dato de renoviĝo. La pago estos prenita por la renoviĝa periodo (monato/tri monatoj/jaro) nur je la dato de renoviĝo.
 \n
 \n Vi povas administri kaj rezigni viajn abonojn per la agordoj de AppGallery.</string>
-    <string name="start_finish_icons">Emblemoj komenco/fino</string>
+    <string name="start_finish_icons">Emblemoj de komenco kaj fino</string>
     <string name="contour_lines_thanks">Dankon al vi por aĉeti la kromprogramon “nivelkurboj”</string>
     <string name="osm_live_payment_desc_hw">Abonpago prenita por la elektita periodo. VI ĉiam povas rezigni abonon ĉe AppGallery.</string>
     <string name="routing_attr_avoid_footways_description">Eviti irejojn</string>
@@ -3921,10 +3921,10 @@
     <string name="complex_routing_descr">Du-faza difinado de kurso por aŭtomobila navigo.</string>
     <string name="use_native_pt">Indiĝena metodo de publik-transporta navigo</string>
     <string name="use_native_pt_desc">Aktivigi (sekuran) metodon por kalkuli kursojn de publika transporto uzante programlingvon Java</string>
-    <string name="perform_oauth_authorization_description">Ensaluti uzante OAuth por redakti la mapon OSM</string>
+    <string name="perform_oauth_authorization_description">Ensaluti per OAuth por redakti la mapon OSM</string>
     <string name="perform_oauth_authorization">Ensaluti per OAuth</string>
     <string name="clear_osm_token">Forigi ĵetonon OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">Sukcese elsalutinta</string>
+    <string name="osm_edit_logout_success">Elsalutinta</string>
     <string name="snowmobile_render_descr">Por veturi per motorsledo sur dediĉitaj vojoj.</string>
     <string name="file_already_imported">Dosiero jam estas enportita al OsmAnd</string>
     <string name="use_two_phase_routing">Uzi 2-fazan A* algoritmon de navigo</string>
@@ -3955,26 +3955,26 @@
     <string name="login_open_street_map">Ensaluti al OpenStreetMap</string>
     <string name="login_open_street_map_org">Ensaluti al OpenStreetMap.org</string>
     <string name="sign_in_with_open_street_map">Ensaluti per OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Vi devas ensaluti por alŝuti novajn aŭ modifitajn ŝanĝojn.
+    <string name="open_street_map_login_mode">Ensalutu por alŝuti novajn aŭ modifitajn ŝanĝojn
 \n
-\nVi povas ensaluti per la sekura metodo OAuth aŭ per enigi uzantnomon kaj pasvorton.</string>
-    <string name="use_login_password">Uzi uzantnomon kaj pasvorton</string>
+\naŭ per la sekura metodo OAuth aŭ per enigi uzantnomon kaj pasvorton.</string>
+    <string name="use_login_password">Ensaluti per uzantnomo kaj pasvorto</string>
     <string name="login_account">Konto</string>
     <string name="user_login">Uzantnomo</string>
     <string name="markers_history">Historio de markoj</string>
     <string name="send_files_to_openstreetmap">Sendi GPX‑dosieron al OpenStreetMap</string>
     <string name="enter_text_separated">Enigu etikedojn disigitajn per komo (,).</string>
-    <string name="gpx_upload_public_visibility_descr">“Publika” signifas, ke la GPX‑spuro estos publika videbla en “miaj spuroj” kaj en la publika listo de spuro (GPS‑spuroj). Datumoj liverataj per la API ne ligos al paĝo de via spuro. Tempindikoj de punktoj ne estos akireblaj per la publika API GPS, kaj la punktoj ne estos ordigitaj laŭtempe. Tamen aliaj uzantoj plue povos elŝuti la nepritraktitan spuron el la publika listo de spuroj kune kun ĉiuj ampleksitaj tempindikoj.</string>
-    <string name="gpx_upload_private_visibility_descr">“Privata” signifas, ke la GPX‑spuro montriĝos en neniu publika listo, sed ĝiaj punktoj plue estos akireblaj per la publika API GPS sen tempindikoj, sed tiuj punktoj estos ordigitaj laŭtempe.</string>
+    <string name="gpx_upload_public_visibility_descr">“Publika” signifas, ke la GPX‑spuro estos publike videbla en “miaj spuroj” kaj en la publika listo de spuroj (GPS‑spuroj) kun tempindikoj kaj en nepritraktita formo. Datumoj liverataj per la API ne ligos al paĝo de via spuro. Tempindikoj de spurpunkto ne estos akireblaj per la publika API GPS, kaj spurpunktoj ne estos laŭtempe ordigitaj.</string>
+    <string name="gpx_upload_private_visibility_descr">“Privata” signifas, ke la GPX‑spuro montriĝos en neniu publika listo, sed ĝiaj punktoj neordigitaj laŭtempe estos akireblaj per la publika API GPS sen tempindikoj.</string>
     <string name="gpx_upload_identifiable_visibility_descr">“Identigebla” signifas, ke la GPX‑spuro estos publike videbla en “miaj spuroj” kaj en la publika listo de spuroj (GPS‑spuroj), aliaj uzantoj povos elŝuti vian nepritraktitan spuron kaj ligi ĝin al via uzantnomo. Publikaj datumoj kun tempindikoj el la API GPS akireblaj per la API de spur‑punktoj indikos al originala paĝo de via spuro.</string>
     <string name="gpx_upload_trackable_visibility_descr">“Spurebla” signifas, ke la GPX‑spuro ne montriĝos en publikaj listoj, sed pritraktitaj punktoj kun tempindikoj el ĝi (kiuj ne povos esti senpere ligitaj al vi) estos elŝuteblaj per la publika API GPS.</string>
     <string name="osm_edit_close_note">Fermi OSM-rimarkon</string>
     <string name="osm_edit_comment_note">Komenti OSM-rimarkon</string>
-    <string name="osm_login_descr">Vi povas ensaluti per la sekura metodo OAuth aŭ per uzi uzantnomon kaj pasvorton.</string>
+    <string name="osm_login_descr">Ensalutii per la sekura metodo OAuth aŭ per uzi uzantnomon kaj pasvorton.</string>
     <string name="shared_string_add_photo">Aldoni foton</string>
     <string name="register_on_openplacereviews">Registri ĉe
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotoj estas liverataj de la malferm‑datuma projekto OpenPlaceReviews.org. Por alŝuti viajn fotojn, vi devas registri ĉe la retejo.</string>
+    <string name="register_on_openplacereviews_desc">Ensaluti en la paĝon de la malferm‑datuma projekto OpenPlaceReviews.org por alŝuti fotojn.</string>
     <string name="register_opr_create_new_account">Krei novan konton</string>
     <string name="register_opr_have_account">Mi jam havas konton</string>
     <string name="shared_string_search_history">Serĉi en historio</string>
@@ -3990,4 +3990,6 @@
     <string name="file_size_needed_for_import">Necesa por enporti</string>
     <string name="export_not_enough_space_descr">En via aparato estas nur %1$s da libera spaco. Liberigu iom da spaco aŭ malelektu iujn elementojn de elporto.</string>
     <string name="export_not_enough_space">Mankas spaco</string>
+    <string name="add_to_mapillary">Aldoni al Mapillary</string>
+    <string name="add_to_opr">Aldoni al OpenPlaceReviews</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -655,7 +655,7 @@
     <string name="poi_club">Club</string>
     <string name="poi_cafe_and_restaurant">Restaurant et café</string>
     <string name="poi_craft">Artisanat</string>
-    <string name="poi_filling_station">Station essence</string>
+    <string name="poi_filling_station">Station service</string>
     <string name="poi_personal_transport">Transport individuel</string>
     <string name="poi_water_supply">Alimentation en eau potable</string>
     <string name="poi_trash_disposal">Traitement des ordures ménagères</string>
@@ -3272,8 +3272,8 @@
     <string name="poi_generator_source_biomass">Source d\'énergie : biomasse</string>
     <string name="poi_rtsa_scale_nc">н/к</string>
     <string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
-    <string name="poi_rtsa_scale_1a">1А</string>
-    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
+    <string name="poi_rtsa_scale_1a">1A</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1A*</string>
     <string name="poi_rtsa_scale_1b">1Б</string>
     <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
     <string name="poi_rtsa_scale_2a">2А</string>
@@ -3844,4 +3844,8 @@
     <string name="poi_departures_board_no">Tableau des départs : non</string>
     <string name="poi_elevator">Ascenseur</string>
     <string name="poi_departures_board">Tableau des départs</string>
+    <string name="poi_liaison_filter">Liaison</string>
+    <string name="poi_consulate_filter">Consulat</string>
+    <string name="poi_embassy_filter">Ambassade</string>
+    <string name="poi_drinking_water_refill">Point d\'eau potable</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="offline_edition">Modifications hors-ligne</string>
-    <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne.</string>
+    <string name="offline_edition_descr">Si le mode d\'édition hors-ligne est activé, les modifications seront enregistrées localement puis envoyées à la demande. Sinon, les modifications seront envoyées immédiatement.</string>
     <string name="update_poi_does_not_change_indexes">Les modifications de points d\'intérêt dans l\'application sont sans effet sur les cartes téléchargées, les modifications sont enregistrées dans un fichier de votre appareil.</string>
     <string name="local_openstreetmap_uploading">Téléversement…</string>
     <string name="local_openstreetmap_were_uploaded">{0} Points d\'intérêt / Notes ont été téléversés</string>
@@ -695,8 +695,8 @@
     <string name="asap">Dès que possible</string>
     <string name="gpxup_public">Public</string>
     <string name="gpxup_identifiable">Identifiable</string>
-    <string name="gpxup_trackable">Suivi</string>
-    <string name="gpxup_private">Privé</string>
+    <string name="gpxup_trackable">Traçable</string>
+    <string name="gpxup_private">Privée</string>
     <string name="osmand_parking_event">Récupérer le véhicule au parking</string>
     <string name="osmand_parking_warning">Avertissement</string>
     <string name="osmand_parking_warning_text">Un rappel pour récupérer votre véhicule a été ajouté à votre agenda. Vous pouvez modifier ou supprimer ce rappel.</string>
@@ -3951,8 +3951,8 @@
     <string name="open_street_map_login_mode">Connectez-vous pour envoyer vos modifications,
 \n
 \nsoit avec OAuth soit avec votre identifiant et mot de passe.</string>
-    <string name="osm_login_descr">Vous pouvez vous connecter avec la méthode sécurisée OAuth ou utiliser votre identifiant et votre mot de passe.</string>
-    <string name="register_on_openplacereviews_desc">Les photos sont fournies par le projet open data OpenPlaceReviews.org. Pour envoyer vos photos, vous devez au préalable être inscrit sur ce site Web.</string>
+    <string name="osm_login_descr">Connectez-vous avec la méthode sécurisée OAuth ou utilisez votre identifiant et votre mot de passe.</string>
+    <string name="register_on_openplacereviews_desc">Connectez-vous au site web du projet OpenPlaceReviews.org pour ajouter des photos.</string>
     <string name="shared_string_search_history">Historique de recherche</string>
     <string name="app_mode_kayak">Kayak</string>
     <string name="export_not_enough_space_descr">Votre appareil n\'a que %1$s disponible. Veuillez libérer de l\'espace ou désélectionner l\'export pour certains éléments.</string>
@@ -3964,4 +3964,13 @@
     <string name="export_not_enough_space">L\'espace disponible est insuffisant</string>
     <string name="add_to_mapillary">Ajouter à Mapillary</string>
     <string name="add_to_opr">Ajouter à OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd affiche des photos de plusieurs sources :
+\nOpenPlaceReviews : photos de PI ;
+\nMapillary : photos de rue ;
+\nWeb / Wikimedia : photos de PI réféfencés dans OpenStreetMap.</string>
+    <string name="gpx_upload_private_visibility_descr"/>
+    <string name="use_dev_url_descr">Utiliser dev.openstreetmap.org plutôt que openstreetmap.org pour tester l\'envoi des notes OSM / Points d\'intérêt / GPX.</string>
+    <string name="use_dev_url">Utiliser dev.openstreetmap.org</string>
+    <string name="select_groups_for_import"></string>
+    <string name="select_items_for_import"></string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3843,4 +3843,33 @@
     <string name="poi_radar_tower">Radartorony</string>
     <string name="poi_gpx_point">GPX-pont</string>
     <string name="poi_diplomatic_services_citizen_services_filter">Állampolgári szolgáltatások</string>
+    <string name="poi_diplomatic_services_citizen_services_no">nincsenek</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">vannak</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">nincs</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">van</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">nincs</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">van</string>
+    <string name="poi_liaison_subnational">Országrész külképviselete</string>
+    <string name="poi_liaison_representative_office">Emigráns kormány nem akkreditált képviselete</string>
+    <string name="poi_liaison_liaison_office">Nem akkreditált összekötő iroda</string>
+    <string name="poi_consulate_honorary_consul">Tiszteletbeli konzul</string>
+    <string name="poi_consulate_consulate_general">Főkonzulátus</string>
+    <string name="poi_consulate_consular_office">Konzuli iroda</string>
+    <string name="poi_consulate_consular_agency">Konzuli ügynköség</string>
+    <string name="poi_consulate_yes">Konzulátus, élén konzullal</string>
+    <string name="poi_embassy_residence">Rezidencia</string>
+    <string name="poi_embassy_nunciature">Apostoli nunciatúra</string>
+    <string name="poi_embassy_mission">Állandó küldöttség</string>
+    <string name="poi_embassy_interests_section">Érdekképviseleti részleg</string>
+    <string name="poi_embassy_high_commission">Főbiztosság (brit nemzetközösségi tag nagykövetsége)</string>
+    <string name="poi_embassy_delegation">Küldöttség</string>
+    <string name="poi_embassy_branch_embassy">Nagykövetségi részleg</string>
+    <string name="poi_embassy_yes">Nagykövetség, élén nagykövettel</string>
+    <string name="poi_diplomatic_liaison">Összekötő iroda</string>
+    <string name="poi_diplomatic_embassy">Követség</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Bevándorlói vízum</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Nem bevándorlói vízum</string>
+    <string name="poi_liaison_filter">Összekötő iroda</string>
+    <string name="poi_embassy_filter">Külképviselet</string>
+    <string name="poi_consulate_filter">Konzulátus</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -3917,7 +3917,7 @@
     <string name="perform_oauth_authorization_description">Az OSM-szerkesztési funkciók használatához jelentkezzék be az OAuth segítségével</string>
     <string name="perform_oauth_authorization">Bejelentkezés OAuth segítségével</string>
     <string name="clear_osm_token">OpenStreetMap OAuth token törlése</string>
-    <string name="osm_edit_logout_success">Sikeresen kijelentkezett</string>
+    <string name="osm_edit_logout_success">Kijelentkezett</string>
     <string name="use_two_phase_routing">Kétszakaszos A* útvonaltervezési algoritmus használata</string>
     <string name="file_already_imported">A fájl már importálva van az OsmAndba</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s - %2$s</string>
@@ -3951,12 +3951,12 @@
     <string name="subscription_paused_title">Az OsmAnd Live-előfizetés szünetel</string>
     <string name="subscription_expired_title">Az OsmAnd Live-előfizetés lejárt</string>
     <string name="subscription_payment_issue_title">Probléma van az előfizetésével. A fizetési mód kijavítása érdekében kattintson a gombra a Google Play előfizetési beállításaihoz történő ugráshoz.</string>
-    <string name="user_login">Bejelentkezés</string>
+    <string name="user_login">Felhasználónév</string>
     <string name="login_account">Fiók</string>
-    <string name="use_login_password">Fióknév és jelszó használata</string>
-    <string name="open_street_map_login_mode">Az új vagy módosított szerkesztések feltöltéséhez be kell jelentkeznie.
+    <string name="use_login_password">Bejelentkezés felhasználónévvel és jelszóval</string>
+    <string name="open_street_map_login_mode">Új vagy módosított szerkesztések feltöltéséhez jelentkezzék be
 \n
-\nBejelentkezhet a biztonságos OAuth-módszerrel vagy használhatja fióknevét és jelszavát.</string>
+\naz OAuth segítségével vagy felhasználónevével és jelszavával.</string>
     <string name="sign_in_with_open_street_map">Bejelentkezés OpenStreetMap-fiókkal</string>
     <string name="login_open_street_map">Bejelentkezés az OpenStreetMapre</string>
     <string name="login_open_street_map_org">Bejelentkezés az OpenStreetMap.org-ra</string>
@@ -3966,10 +3966,22 @@
     <string name="shared_string_add_photo">Fénykép hozzáadása</string>
     <string name="register_on_openplacereviews">Regisztráció az
 \nOpenPlaceReviews.org oldalon</string>
-    <string name="register_on_openplacereviews_desc">A fényképeket a OpenPlaceReviews.org nyílt adatprojekt biztosítja. Saját fényképei feltöltéséhez be kell jelentkeznie a weboldalon.</string>
+    <string name="register_on_openplacereviews_desc">Még több fénykép feltöltéséhez jelentkezzék be az OpenPlaceReviews.org nyílt adatprojekt weboldalára.</string>
     <string name="register_opr_create_new_account">Új fiók létrehozása</string>
     <string name="register_opr_have_account">Már van fiókom</string>
     <string name="app_mode_motorboat">Motorcsónak</string>
     <string name="app_mode_kayak">Kajak</string>
     <string name="shared_string_search_history">Keresési előzmények</string>
+    <string name="shared_string_resources">Források</string>
+    <string name="add_to_mapillary">Hozzáadás a Mapillaryhez</string>
+    <string name="add_to_opr">Hozzáadása az OpenPlaceReviewshoz</string>
+    <string name="add_photos_descr">Az OsmAnd több forrásból jelenít meg fényképeket:
+\nOpenPlaceReviews – POI-fotók;
+\nMapillary – utcaszintű képek;
+\nWeb / Wikimedia – az OpenStreetMap-adatokban meghatározott POI-fotók.</string>
+    <string name="approximate_file_size">Hozzávetőleges fájlméret</string>
+    <string name="select_data_to_export">Jelölje ki a fájlba exportálandó adatokat.</string>
+    <string name="file_size_needed_for_import">Szükséges az importáláshoz</string>
+    <string name="export_not_enough_space_descr">A készülékén csak %1$s szabad hely van. Szabadítson fel valamennyi helyet, vagy szüntesse meg néhány exportálandó elem kijelölését.</string>
+    <string name="export_not_enough_space">Nincs elég hely</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -3979,4 +3979,18 @@
     <string name="gpx_upload_private_visibility_descr">\"Privato\" significa che la traccia non è visualizzabile in alcuna lista pubblica ma i suoi punti, in ordine non cronologico, sono disponibili attraverso le API GPS senza le informazioni temporali.</string>
     <string name="gpx_upload_identifiable_visibility_descr">\"Identificabile\" significa che la traccia è visualizzabile nelle Mie tracce GPS e nelle liste pubbliche, es. gli altri utenti potranno scaricare la traccia grezza e associarla con il tuo nome utente. I punti della traccia, con le loro informazioni temporali, saranno riconducibili, attraverso le API GPS, alla tua traccia originale.</string>
     <string name="gpx_upload_trackable_visibility_descr">\"Tracciabile\" significa che la traccia non è visualizzabile in alcuna lista pubblica, ma solo i suoi punti, processati, con le informazioni temporali (che non possono essere direttamente associati a te) attraverso le API GPS pubbliche.</string>
+    <string name="add_to_mapillary">Aggiungi a Mapillary</string>
+    <string name="add_to_opr">Aggiungi a OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd mostra foto da più sorgenti:
+\nOpenPlaceReviews - foto PDI;
+\nMapillary - immagini stradali;
+\nWeb / Wikimedia - foto PDI OpenStreetMap.</string>
+    <string name="shared_string_resources">Risorse</string>
+    <string name="approximate_file_size">Dimesione approssimativa del file</string>
+    <string name="select_data_to_export">Seleziona i dati da esportare nel file.</string>
+    <string name="file_size_needed_for_import">Necessario per l\'importazione</string>
+    <string name="export_not_enough_space_descr">Il tuo dispositivo ha solo %1$s liberi. Libera dello spazio i deseleziona alcune voci da esportare.</string>
+    <string name="export_not_enough_space">Non c\'è abbastanza spazio</string>
+    <string name="select_groups_for_import">Seleziona i gruppi da importare.</string>
+    <string name="select_items_for_import">Seleziona gli oggetti da importare.</string>
 </resources>

OsmAnd/res/values-lv/strings.xml

@@ -3212,7 +3212,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="route_recalculation">Maršruta pārrēķināšana</string>
     <string name="accessibility_announce">Paziņošana</string>
     <string name="login_and_pass">Lietotāja vārds un parole</string>
-    <string name="plugin_global_prefs_info">Šie iestatījumi darbosies visos profilos.</string>
+    <string name="plugin_global_prefs_info">Šie iestatījumi ir globāli un darbosies visos profilos</string>
     <string name="osm_editing">OSM rediģēšana</string>
     <string name="osm_edits_view_descr">Skatiet vēl neaugšupielādētos labojumus vai OSM kļūdas %1$s mapē. Augšupielādētie punkti vairs netiks rādīti.</string>
     <string name="app_mode_osm">OSM</string>
@@ -3278,13 +3278,13 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="icon_group_emergency">Ārkārtas</string>
     <string name="icon_group_travel">Ceļošana</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Nepieciešams pievienot vismaz divus punktus</string>
-    <string name="login_open_street_map">Ieiet OpenStreetMap</string>
-    <string name="login_open_street_map_org">Ieiet OpenStreetMap.org</string>
+    <string name="login_open_street_map">Pierakstīties OpenStreetMap</string>
+    <string name="login_open_street_map_org">Pierakstīties OpenStreetMap.org</string>
     <string name="sign_in_with_open_street_map">Pierakstīties ar OpenStreetMap</string>
     <string name="open_street_map_login_mode">Lai sūtītu labojumus vai jaunus datus, ir nepieciešams pierakstīties.
 \n
-\nJūs varat pierakstīties, lietojot drošo OAuth metodi vai ar savu lietotāja vārdu un paroli.</string>
-    <string name="use_login_password">Lietot pierakstīšanās datus</string>
+\nJūs varat pierakstīties, lietojot OAuth vai ar savu lietotāja vārdu un paroli.</string>
+    <string name="use_login_password">Pierakstīties ar lietotāja vādu un paroli</string>
     <string name="login_account">Konts</string>
     <string name="user_login">Lietotājs</string>
     <string name="manage_subscription">Pārvaldīt abonomentu</string>
@@ -3297,10 +3297,31 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="enter_text_separated">Ievadiet tagus, atdalītus ar komatu.</string>
     <string name="osm_edit_close_note">Aizvērt OSM Note</string>
     <string name="osm_edit_comment_note">Komentēt OSM Note</string>
-    <string name="osm_login_descr">Jūs varat ielogoties lietojot drošo OAuth metodi vai savu lietotāja vārdu un paroli.</string>
+    <string name="osm_login_descr">Ielogojieties lietojot drošo OAuth metodi vai savu lietotāja vārdu un paroli.</string>
     <string name="shared_string_add_photo">Pievienot foto</string>
     <string name="register_on_openplacereviews">Reģistrēties
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotogrāfijas tiek piegādātas no atvērtā koda projekta OpenPlaceReviews.org. Lai pievienotu savas fotogrāfijas, nepieciešams reģistrēties šajā interneta vietnē.</string>
+    <string name="register_on_openplacereviews_desc">Lai augšupielādētu vēl fotogrāfijas, ielogojieties atvērtā koda projekta OpenPlaceReviews.org vietnē.</string>
     <string name="register_opr_create_new_account">Izveidot jaunu kontu</string>
+    <string name="icon_group_symbols">Simboli</string>
+    <string name="icon_group_sport">Sports</string>
+    <string name="gpx_upload_private_visibility_descr">\"Privāts\" nozīmē, ka trase neparādīsies nevienā publiskā sarakstā, bet trases punkti nehronoloģiskā secībā būs pieejami caur publisko GPS API bez laika atzīmēm.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificējams\" nozīmē, ka trase būs redzama jūsu GPS trasēs un publiskajos GPS trašu sarakstos, t.i. citi lietotāji varēs lejupielādēt trasi un asociēt to ar jūsu vārdu. Publiskie trases punktu dati ar laika atzīmēm no GPS API caur trackpoints API dos referenci uz jūsu oriģinālo trases lapu.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Izsekojams\" nozīmē, ka pati trase neparādās publiskajos sarakstos, bet tikai apstrādātie trackpointi ar laika atzīmēm (nevar tikt asociēti konkrēti ar jums) caur lejupielādēm no publiskā GPS API.</string>
+    <string name="register_opr_have_account">Man jau ir konts</string>
+    <string name="shared_string_search_history">Meklēšanas vēsture</string>
+    <string name="app_mode_kayak">Kajaks</string>
+    <string name="app_mode_motorboat">Motorlaiva</string>
+    <string name="add_to_mapillary">Pievienot Mapillary</string>
+    <string name="add_to_opr">Pievienot OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd rāda attēlus no dažādiem avotiem:
+\nOpenPlaceReviews - POI bildes;
+\nMapillary - ielas līmeņa attēli;
+\nWeb / Wikimedia - POI bildes no OpenStreetMap datiem.</string>
+    <string name="shared_string_resources">Resursi</string>
+    <string name="approximate_file_size">Aptuvenais faila izmērs</string>
+    <string name="select_data_to_export">Izvēlieties datus eksportēšanai failā.</string>
+    <string name="file_size_needed_for_import">Nepieciešams importam</string>
+    <string name="export_not_enough_space_descr">Ierīcē ir tikai %1$s brīvās vietas. Lūdzu atbrīvojiet vietu vai izvēlieties mazāk detaļu eksportam.</string>
+    <string name="export_not_enough_space">Nepietiek brīvās vietas</string>
 </resources>

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

@@ -3850,4 +3850,34 @@
     <string name="poi_radar_tower">Torre de radar</string>
     <string name="poi_parking_layby">Tapume</string>
     <string name="poi_parking_rooftop">Terraço</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Não</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Sim</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Não</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Sim</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Não</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Sim</string>
+    <string name="poi_liaison_subnational">Subnacional</string>
+    <string name="poi_liaison_representative_office">Escritório de representação</string>
+    <string name="poi_liaison_liaison_office">Escritório</string>
+    <string name="poi_consulate_honorary_consul">Consul honorário</string>
+    <string name="poi_consulate_consulate_general">Consulado Geral</string>
+    <string name="poi_consulate_consular_office">Escritório consular</string>
+    <string name="poi_consulate_consular_agency">Agência consular</string>
+    <string name="poi_consulate_yes">Chefiado por um cônsul</string>
+    <string name="poi_embassy_residence">Residência</string>
+    <string name="poi_embassy_nunciature">Nunciatura</string>
+    <string name="poi_embassy_mission">Missão</string>
+    <string name="poi_embassy_interests_section">Seção de interesses</string>
+    <string name="poi_embassy_high_commission">Alto comissariado</string>
+    <string name="poi_embassy_delegation">Delegação</string>
+    <string name="poi_embassy_branch_embassy">Seção</string>
+    <string name="poi_embassy_yes">Chefiado por um embaixador</string>
+    <string name="poi_diplomatic_liaison">Ligação</string>
+    <string name="poi_diplomatic_embassy">Embaixada</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Serviços ao cidadão</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Vistos de imigrante</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vistos de não imigrante</string>
+    <string name="poi_liaison_filter">Ligação</string>
+    <string name="poi_consulate_filter">Consulado</string>
+    <string name="poi_embassy_filter">Embaixada</string>
 </resources>

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

@@ -3917,10 +3917,10 @@
     <string name="use_native_pt">Desenvolvimento de transporte público nativo</string>
     <string name="use_native_pt_desc">Mudar para cálculo de roteamento de transporte público em Java (seguro)</string>
     <string name="what_is_new">O que há de novo</string>
-    <string name="perform_oauth_authorization_description">Entre no OAuth para usar os recursos de edição do osm</string>
+    <string name="perform_oauth_authorization_description">Entrar com OAuth para usar os recursos osmedit</string>
     <string name="perform_oauth_authorization">Entrar via OAuth</string>
     <string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">Saída bem sucedida</string>
+    <string name="osm_edit_logout_success">Desconectado</string>
     <string name="file_already_imported">O arquivo já foi importado para OsmAnd</string>
     <string name="use_two_phase_routing">Use o algoritmo de roteamento 2-phase A *</string>
     <string name="snowmobile_render_descr">Para dirigir em motos de neve com estradas e trilhas exclusivas.</string>
@@ -3948,14 +3948,14 @@
     <string name="subscription_paused_title">A assinatura do OsmAnd Live foi pausada</string>
     <string name="subscription_on_hold_title">A assinatura do OsmAnd Live está em espera</string>
     <string name="app_mode_gap">Diferença</string>
-    <string name="login_open_street_map">Entrar para OpenStreetMap</string>
+    <string name="login_open_street_map">Entrar com OpenStreetMap</string>
     <string name="login_open_street_map_org">Entrar com OpenStreetMap.org</string>
-    <string name="open_street_map_login_mode">Você precisa entrar para enviar alterações novas ou modificadas.
+    <string name="open_street_map_login_mode">Entrar para carregar de alterações novas ou modificadas,
 \n
-\nVocê pode entrar usando o método OAuth seguro ou usar sua entrada e senha.</string>
-    <string name="use_login_password">Usar a entrada e senha</string>
+\ncom OAuth ou usando seu nome de usuário e senha.</string>
+    <string name="use_login_password">Entrar com nome de usuário e senha</string>
     <string name="login_account">Conta</string>
-    <string name="user_login">Entrar</string>
+    <string name="user_login">Nome de usuário</string>
     <string name="sign_in_with_open_street_map">Entrar com o OpenStreetMap</string>
     <string name="markers_history">Histórico de marcadores</string>
     <string name="send_files_to_openstreetmap">Enviar arquivo GPX para OpenStreetMap</string>
@@ -3966,14 +3966,26 @@
     <string name="gpx_upload_trackable_visibility_descr">\"Rastreável\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de trilha processados com carimbos de data/hora (que não podem ser associados a você diretamente) são feitos por meio de downloads da API GPS pública.</string>
     <string name="osm_edit_close_note">Fechar nota do OSM</string>
     <string name="osm_edit_comment_note">Comentário de nota do OSM</string>
-    <string name="osm_login_descr">Você pode entrar usando o método OAuth seguro ou usar sua entrada e senha.</string>
+    <string name="osm_login_descr">Entrar usando o método OAuth seguro ou use seu nome de usuário e senha.</string>
     <string name="shared_string_add_photo">Adicionar foto</string>
     <string name="register_on_openplacereviews">Cadastre-se em
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">As fotos são fornecidas pelo projeto de dados abertos do OpenPlaceReviews.org. Para carregar suas fotos você precisa se inscrever no site.</string>
+    <string name="register_on_openplacereviews_desc">Entrar no site do projeto de dados abertos OpenPlaceReviews.org para enviar ainda mais fotos.</string>
     <string name="register_opr_create_new_account">Criar nova conta</string>
     <string name="register_opr_have_account">Eu já tenho uma conta</string>
     <string name="shared_string_search_history">Histórico de busca</string>
     <string name="app_mode_kayak">Caiaque</string>
     <string name="app_mode_motorboat">Lancha</string>
+    <string name="add_to_mapillary">Adicionar ao Mapillary</string>
+    <string name="add_to_opr">Adicionar ao OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd mostra fotos de várias fontes:
+\nOpenPlaceReviews - fotos de POI;
+\nMapillary - imagens de nível da rua;
+\nWeb / Wikimedia - fotos de POI especificadas nos dados do OpenStreetMap.</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="approximate_file_size">Tamanho aproximado do arquivo</string>
+    <string name="select_data_to_export">Selecione os dados a serem exportados para o arquivo.</string>
+    <string name="file_size_needed_for_import">Necessário para importação</string>
+    <string name="export_not_enough_space_descr">Seu dispositivo tem apenas %1$s livre. Libere espaço ou desmarque alguns itens para exportar.</string>
+    <string name="export_not_enough_space">Não há espaço suficiente</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -3973,11 +3973,11 @@
     <string name="gpx_upload_trackable_visibility_descr">Rastreável significa que o rastreamento não aparecerá em nenhuma lista pública, mas os pontos de rastreamento a partir dele ainda estarão disponíveis através da API pública do GPS com carimbos de tempo. Outros utilizadores só poderão descarregar pontos de rastreamento processados do seu rastreamento que não podem ser associados diretamente a si.</string>
     <string name="osm_edit_close_note">Fechar nota do OSM</string>
     <string name="osm_edit_comment_note">Comentário de nota do OSM</string>
-    <string name="osm_login_descr">Pode entrar a usar o método seguro OAuth ou usar o seu login e palavra-passe.</string>
+    <string name="osm_login_descr">Faça login a usar o método seguro OAuth ou use o seu nome de utilizador e a palavra-passe.</string>
     <string name="shared_string_add_photo">Adicionar fotos</string>
     <string name="register_on_openplacereviews">Cadastre-se em
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">As fotos são fornecidas pelo projeto de dados abertos OpenPlaceReviews.org. Para enviar as suas fotos precisa cadastrar-se no site.</string>
+    <string name="register_on_openplacereviews_desc">Faça login no site do projeto de dados abertos OpenPlaceReviews.org para enviar ainda mais fotos.</string>
     <string name="register_opr_create_new_account">Criar uma conta</string>
     <string name="register_opr_have_account">Já tenho uma conta</string>
     <string name="shared_string_search_history">Histórico de pesquisa</string>
@@ -3989,4 +3989,10 @@
     <string name="file_size_needed_for_import">Necessário para a importação</string>
     <string name="export_not_enough_space_descr">O seu aparelho só tem %1$s livre. Por favor, libere algum espaço ou desmarque alguns itens para exportar.</string>
     <string name="export_not_enough_space">Não há espaço suficiente</string>
+    <string name="add_to_mapillary">Adicionar ao Mapillary</string>
+    <string name="add_to_opr">Adicionar ao OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd mostra fotos de várias fontes:
+\nOpenPlaceReviews - fotos de POI;
+\nMapillary - imagens ao nível da rua;
+\nWeb / Wikimedia - fotos de POI especificadas nos dados do OpenStreetMap.</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3861,4 +3861,19 @@
     <string name="poi_diplomatic_embassy">Ambassada</string>
     <string name="poi_consulate_filter">Consoladu</string>
     <string name="poi_embassy_filter">Ambassada</string>
+    <string name="poi_liaison_subnational">Suta-natzionale</string>
+    <string name="poi_liaison_representative_office">Ufìtziu de rapresentàntzia</string>
+    <string name="poi_consulate_honorary_consul">Cònsole onoràriu</string>
+    <string name="poi_consulate_consular_office">Ufìtziu consolare</string>
+    <string name="poi_consulate_consular_agency">Agentzia consolare</string>
+    <string name="poi_consulate_yes">Ghiadu dae unu cònsole</string>
+    <string name="poi_embassy_nunciature">Nuntziadura</string>
+    <string name="poi_embassy_interests_section">Setzione de interessos</string>
+    <string name="poi_embassy_branch_embassy">Filiale</string>
+    <string name="poi_embassy_yes">Ghiada dae un\'ambassadore</string>
+    <string name="poi_diplomatic_liaison">Ufìtziu de collegamentu</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servìtzios pro sos tzitadinos</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Vistos pro immigrantes</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vistos pro no immigrantes</string>
+    <string name="poi_liaison_filter">Ufìtziu de collegamentu</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -3990,4 +3990,6 @@
     <string name="file_size_needed_for_import">Netzessàriu pro s\'importatzione</string>
     <string name="export_not_enough_space_descr">Su dispositivu tuo tenet petzi %1$s a disponimentu. Lìbera unu pagu de memòria o boga s\'ischerta a unos cantos elementos de esportare.</string>
     <string name="export_not_enough_space">Non b\'at logu bastante</string>
+    <string name="select_groups_for_import">Ischerta sos grupos de importare.</string>
+    <string name="select_items_for_import">Ischerta sos elementos de importare.</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -3922,10 +3922,10 @@
     <string name="use_native_pt">Natívna hromadná doprava (vo vývoji)</string>
     <string name="use_native_pt_desc">Prepnúť na výpočet trasy hromadnej dopravy v Jave (bezpečné)</string>
     <string name="what_is_new">Čo je nové</string>
-    <string name="perform_oauth_authorization_description">Vykonať prihlásenie cez OAuth pre použitie funkcií upravovania OSM</string>
+    <string name="perform_oauth_authorization_description">Prihláste sa cez OAuth pre použitie funkcií upravovania OSM</string>
     <string name="perform_oauth_authorization">Prihlásiť pomocou OAuth</string>
     <string name="clear_osm_token">Vymazať token OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">Odhlásenie úspešné</string>
+    <string name="osm_edit_logout_success">Odhlásené</string>
     <string name="snowmobile_render_descr">Pre jazdu na snežnom vozidle po na to určených cestách.</string>
     <string name="file_already_imported">Súbor je už importovaný v OsmAnd</string>
     <string name="use_two_phase_routing">Použiť dvojfázový algoritmus A* na výpočet trasy</string>
@@ -3953,13 +3953,13 @@
     <string name="subscription_expired_title">Predplatné OsmAnd Live skončilo</string>
     <string name="subscription_paused_title">Predplatné OsmAnd Live je pozastavené</string>
     <string name="subscription_on_hold_title">Predplatné OsmAnd Live je zablokované</string>
-    <string name="login_open_street_map">Prihlásiť sa do OpenStreetMap</string>
-    <string name="login_open_street_map_org">Prihlásiť sa do OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">Zaregistrovať sa do OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Musíte sa prihlásiť pre odoslanie nových alebo zmenených údajov.
+    <string name="login_open_street_map">Prihlásenie pre OpenStreetMap</string>
+    <string name="login_open_street_map_org">Prihlásenie pre OpenStreetMap.org</string>
+    <string name="sign_in_with_open_street_map">Prihlásiť sa do OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Prihláste sa pre odoslanie nových alebo zmenených údajov,
 \n
-\nMôžete sa prihlásiť pomocou bezpečnej metódy OAuth alebo pomocou mena a hesla.</string>
-    <string name="use_login_password">Použiť meno a heslo</string>
+\nbuď pomocou metódy OAuth alebo pomocou mena a hesla.</string>
+    <string name="use_login_password">Prihlásiť sa menom a heslom</string>
     <string name="login_account">Účet</string>
     <string name="user_login">Prihlasovacie meno</string>
     <string name="markers_history">História značiek</string>
@@ -3967,14 +3967,28 @@
     <string name="enter_text_separated">Zadajte značky oddelené čiarkou.</string>
     <string name="osm_edit_close_note">Zatvoriť OSM poznámku</string>
     <string name="osm_edit_comment_note">Komentovať OSM poznámku</string>
-    <string name="osm_login_descr">Môžete sa prihlásiť bezpečnou metódou OAuth alebo použite meno a heslo.</string>
+    <string name="osm_login_descr">Prihláste sa bezpečnou metódou OAuth alebo použite meno a heslo.</string>
     <string name="shared_string_add_photo">Pridať foto</string>
     <string name="register_on_openplacereviews">Zaregistrovať na
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotografie sú poskytované projektom OpenPlaceReviews.org s otvorenými dátami. Na odoslanie vašich fotiek sa musíte zaregistrovať na webovej stránke.</string>
+    <string name="register_on_openplacereviews_desc">Prihláste sa na webstránke projektu OpenPlaceReviews.org s otvorenými dátami pre odoslanie ďalších fotografií.</string>
     <string name="register_opr_create_new_account">Vytvoriť nový účet</string>
     <string name="register_opr_have_account">Už mám účet</string>
     <string name="shared_string_search_history">História hľadania</string>
     <string name="app_mode_kayak">Kajak</string>
     <string name="app_mode_motorboat">Motorový čln</string>
+    <string name="add_to_mapillary">Pridať do Mapillary</string>
+    <string name="add_to_opr">Pridať do OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd szobrazuje fotografie z rôznych zdrojov:
+\nOpenPlaceReviews - fotografie bodov záujmu;
+\nMapillary - fotografie z ulice;
+\nWeb / Wikimedia - fotografie bodov záujmu špeficikované v údajoch OpenStreetMap.</string>
+    <string name="shared_string_resources">Zdroje</string>
+    <string name="approximate_file_size">Približná veľkosť súboru</string>
+    <string name="select_data_to_export">Zvoľte údaje na export do súboru.</string>
+    <string name="file_size_needed_for_import">Potrebné pre import</string>
+    <string name="export_not_enough_space_descr">Na vašom zariadení je len %1$s voľného miesta. Prosím uvoľnite miesto alebo zrušte niektoré položky z exportu.</string>
+    <string name="export_not_enough_space">Nie je dostatok miesta</string>
+    <string name="select_groups_for_import">Zvoľte skupiny, ktoré budú importované.</string>
+    <string name="select_items_for_import">Zvoľte položky, ktoré budú importované.</string>
 </resources>

OsmAnd/res/values-sr/phrases.xml

@@ -3815,4 +3815,51 @@
     <string name="poi_volcano_type_caldera">Калдера</string>
     <string name="poi_volcano_type_maar">Мар</string>
     <string name="poi_traffic_signals_arrow_no">Стрелица: не</string>
+    <string name="poi_departures_board_no">Табла одласка: не</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>
+    <string name="poi_embassy_high_commission">Висока комисија</string>
+    <string name="poi_embassy_delegation">Делегација</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>
+    <string name="poi_radar_tower">Радарски торањ</string>
+    <string name="poi_parking_layby">Паркинг</string>
+    <string name="poi_parking_sheds">Паркинг</string>
+    <string name="poi_parking_rooftop">Таван</string>
+    <string name="poi_gpx_point">ГПКС тачка</string>
+    <string name="poi_fuel_lng">ЛНГ</string>
+    <string name="poi_nuts">Продавница ораха</string>
+    <string name="poi_beehive">Кошница</string>
+    <string name="poi_departures_board_timetable">Распоред</string>
+    <string name="poi_departures_board_realtime">Стварно време</string>
+    <string name="poi_departures_board_delay">Кашњење</string>
+    <string name="poi_departures_board_yes">Да</string>
+    <string name="poi_elevator">Лифт</string>
+    <string name="poi_recycling_small_electrical_appliances">Мали електрични уређаји</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Услуге за грађане</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Имигрантске визе</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Неимигрантске визе</string>
+    <string name="poi_liaison_filter">Посредник</string>
+    <string name="poi_consulate_filter">Конзулат</string>
+    <string name="poi_embassy_filter">Амбасада</string>
+    <string name="poi_departures_board">Табла</string>
+    <string name="poi_drinking_water_refill">Доливање воде за пиће</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -3865,8 +3865,35 @@
     <string name="plan_route_change_route_type_after">Промените врсту руте након</string>
     <string name="what_is_new">Шта је ново</string>
     <string name="shared_string_file_name">Име фајла</string>
-    <string name="number_of_gpx_files_selected_pattern"></string>
+    <string name="number_of_gpx_files_selected_pattern"/>
     <string name="gpx_monitoring_stop">Паузирај снимање пута</string>
     <string name="one_point_error">Додајте бар две тачке.</string>
     <string name="osm_edit_logout_success">Одјава успешна</string>
+    <string name="gpx_upload_private_visibility_descr">„Приватно“ значи да се траг не појављује ни на једној јавној листи, али су тачке праћења у њему у нехронолошком редоследу доступне путем јавног ГПС АПИ-ја без временских ознака.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">„Могуће је идентификовати“ значи да ће се траг јавно приказати у вашим ГПС траговима и у јавним списковима ГПС трагова, тј. други корисници ће моћи да преузму необрађени траг и повежу га са вашим корисничким именом. Јавни подаци о временским тачкама трага из ГПС АПИ-ја који се сервирају путем АПИ-ја за тачке праћења имаће референцу на вашу оригиналну страницу праћења.</string>
+    <string name="gpx_upload_trackable_visibility_descr">„Следљиво“ значи да се траг не приказује нигде на јавним листама, али обрађене тачке праћења са временским ознакама у њима (које не могу бити директно повезане са вама) иду кроз преузимања са јавног ГПС АПИ-ја.</string>
+    <string name="osm_edit_close_note">Затвори ОСМ белешку</string>
+    <string name="osm_edit_comment_note">Коментар ОСМ напомене</string>
+    <string name="osm_login_descr">Пријавите се помоћу сигурне методе ОАутх или користите своје корисничко име и лозинку.</string>
+    <string name="shared_string_add_photo">Додај фотографију</string>
+    <string name="register_on_openplacereviews">Региструјте се на
+\nOpenPlaceReviews.</string>
+    <string name="register_on_openplacereviews_desc">Пријавите се на веб локацију пројекта отворених података OpenPlaceReviews.орг да бисте отпремили још више фотографија.</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="add_to_mapillary">Додај у Мапилари</string>
+    <string name="add_to_opr">Додај у ОпенПлејсРевјуз</string>
+    <string name="add_photos_descr">ОсмАнд приказује фотографије из неколико извора:
+\nОпенПлејсРевјуз - ПОИ фотографије;
+\nМапилари - слике на нивоу улице;
+\nВеб / Викимедиа - ПОИ фотографије наведене у подацима ОпенСтритМап.</string>
+    <string name="shared_string_resources">Ресурси</string>
+    <string name="approximate_file_size">Приближна величина датотеке</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>
 </resources>

OsmAnd/res/values-sv/strings.xml

@@ -2842,7 +2842,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="rendering_attr_tracktype_grade5_name">Mjuk</string>
     <string name="routeInfo_tracktype_name">Ytfasthet</string>
     <string name="shared_string_file_is_saved">%s är sparat</string>
-    <string name="shared_string_open_track">Öppet spår</string>
+    <string name="shared_string_open_track">Öppna spår</string>
     <string name="shared_string_track_is_saved">Spår %s är sparat</string>
     <string name="gpx_join_gaps">Ta bort mellanrum</string>
     <string name="temporary_conditional_routing">Överväg tillfälliga begränsningar</string>

OsmAnd/res/values-tr/phrases.xml

@@ -3130,4 +3130,6 @@
     <string name="poi_fire_hydrant_type_pillar">Sütun</string>
     <string name="poi_fire_hydrant_type_pond">Gölet</string>
     <string name="poi_fire_hydrant_style_water_source_pond">Gölet</string>
+    <string name="poi_consulate_filter">Konsolosluk</string>
+    <string name="poi_embassy_filter">Büyük elçilik</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -535,7 +535,7 @@
     <string name="use_fluorescent_overlays">Floresan üst katmanlar</string>
     <string name="use_fluorescent_overlays_descr">İzlenen yolları ve rotaları görüntülemek için floresan renkler kullan.</string>
     <string name="offline_edition">Çevrim dışı düzenleme</string>
-    <string name="offline_edition_descr">Her zaman çevrim dışı düzenlemeyi kullanın.</string>
+    <string name="offline_edition_descr">Çevrim dışı düzenleme etkinleştirilirse, değişiklikler önce yerel olarak kaydedilecek ve istek üzerine karşıya yüklenecek, aksi takdirde değişiklikler hemen karşıya yüklenecek.</string>
     <string name="update_poi_does_not_change_indexes">Uygulama içinde POI değişiklikleri indirilen harita dosyalarını etkilemez, bunun yerine değişiklikler cihazınızda bir dosya olarak kaydedilir.</string>
     <string name="local_openstreetmap_uploading">Yükleniyor…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/not karşıya yüklendi</string>
@@ -1236,7 +1236,7 @@
     <string name="shared_string_dismiss">Vazgeç</string>
     <string name="shared_string_selected_lowercase">seçili</string>
     <string name="shared_string_deselect">Seçimini kaldırın</string>
-    <string name="shared_string_deselect_all">Tüm Seçimleri Kaldır</string>
+    <string name="shared_string_deselect_all">Tüm seçimleri kaldır</string>
     <string name="shared_string_collapse">Daralt</string>
     <string name="shared_string_tracks">İzlenen yollar</string>
     <string name="shared_string_currently_recording_track">Şu anda kaydedilen yol</string>
@@ -1854,7 +1854,7 @@
     <string name="reports_for">Şunun için rapor</string>
     <string name="data_is_not_available">Veri mevcut değil</string>
     <string name="shared_string_status">Durum</string>
-    <string name="shared_string_save_changes">Değişiklikleri Kaydet</string>
+    <string name="shared_string_save_changes">Değişiklikleri kaydet</string>
     <string name="shared_string_email_address">E-posta adresi</string>
     <string name="rendering_attr_hideUnderground_name">Yeraltı nesneleri</string>
     <string name="shared_string_read_more">Devamını oku</string>
@@ -1943,7 +1943,7 @@
     <string name="storage_permission_restart_is_required">Uygulamanın şimdi harici depolamaya yazma izni var, ancak bunu yapmak için yeniden başlatılması gerekir.</string>
     <string name="full_report">Tam rapor</string>
     <string name="open_street_map_login_and_pass">OSM kullanıcı adı ve parolası</string>
-    <string name="file_name_containes_illegal_char">Dosya adı geçersiz karakter içermektedir</string>
+    <string name="file_name_containes_illegal_char">Dosya adında geçersiz karakter</string>
     <string name="shared_string_is_open_24_7">7/24 açık</string>
     <string name="storage_directory_card">Bellek kartı</string>
     <string name="coords_format">Koordinat biçimi</string>
@@ -2805,7 +2805,7 @@
     <string name="rendering_attr_hidePOILabels_name">POI etiketleri</string>
     <string name="will_open_tomorrow_at">Yarın şu saatte açılıyor</string>
     <string name="show_closed_notes">Kapalı notları göster</string>
-    <string name="switch_osm_notes_visibility_desc">Haritada OSM notlarını göster/gizle.</string>
+    <string name="switch_osm_notes_visibility_desc">Haritada OSM notlarını göster veya gizle.</string>
     <string name="gpx_file_desc">GPX - JOSM veya diğer OSM düzenleyicilerine aktarmak için uygundur.</string>
     <string name="osc_file_desc">OSC - OSM\'ye aktarmak için uygundur.</string>
     <string name="osc_file">OSC dosyası</string>
@@ -3156,7 +3156,7 @@
     <string name="empty_state_favourites_desc">Sık Kullanılanları içe aktarın veya haritadaki noktaları işaretleyerek ekleyin.</string>
     <string name="import_track">GPX dosyasını içe aktar</string>
     <string name="import_track_desc">%1$s dosyası ara noktalar içermiyor, izlenen yol olarak içe aktar\?</string>
-    <string name="move_point">Hareket Noktası</string>
+    <string name="move_point">Noktayı Taşı</string>
     <string name="osm_recipients_label">OSM alıcıları</string>
     <string name="total_donations">Toplam bağış</string>
     <string name="day_off_label">kapalı</string>
@@ -3186,9 +3186,9 @@
     <string name="quick_action_day_night_switch_mode">Gündüz/gece modunu değiştir</string>
     <string name="routing_attr_avoid_sett_name">Parke veya kaldırım taşı yok</string>
     <string name="quick_action_need_to_add_item_to_list">\'Hızlı eylem\' ayarlarında listeye en az bir öge ekleyin</string>
-    <string name="routing_attr_piste_type_downhill_name">Alp/yokuş aşağı kayak</string>
+    <string name="routing_attr_piste_type_downhill_name">Alp ve yokuş aşağı kayak</string>
     <string name="routing_attr_piste_type_downhill_description">Alp veya yokuş aşağı kayak ve kayak teleferiklerine erişim için yamaçlar.</string>
-    <string name="routing_attr_piste_type_nordic_name">Kros/İskandinav kayak</string>
+    <string name="routing_attr_piste_type_nordic_name">Kros ve İskandinav kayak</string>
     <string name="routing_attr_piste_type_nordic_description">İskandinav veya kros kayağı pistleri.</string>
     <string name="routing_attr_piste_type_skitour_name">Kayak turu</string>
     <string name="routing_attr_piste_type_skitour_description">Kayak turu rotaları.</string>
@@ -3322,7 +3322,7 @@
     <string name="route_start_point">Başlangıç noktası</string>
     <string name="default_speed_dialog_msg">Bilinmeyen yol türleri için varış zamanını tahmin eder ve tüm yollar için hızı sınırlar (güzergahı etkileyebilir)</string>
     <string name="track_saved">Yol izi kaydedildi</string>
-    <string name="empty_filename">Dosya adı boş</string>
+    <string name="empty_filename">Boş dosya adı</string>
     <string name="shared_string_revert">Eski haline döndür</string>
     <string name="quick_action_directions_from_desc">Ekranın, kalkış noktasını ortalamasını sağlamak için bir düğme. Daha sonra hedef belirlemeyi veya rota hesaplamasını tetiklemeyi isteyecektir.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Düğüm ağı bisiklet rotalarını göster</string>
@@ -3384,7 +3384,7 @@
     <string name="login_and_pass">Kullanıcı adı ve parola</string>
     <string name="plugin_global_prefs_info">Bu eklenti ayarları geneldir ve tüm profiller için geçerlidir</string>
     <string name="osm_editing">OSM düzenleme</string>
-    <string name="osm_edits_view_descr">Yüklenmemiş tüm düzenlemelerinizi veya OSM hatalarınızı %1$s\'de görüntüleyebilirsiniz. Karşıya yüklenen noktalar OsmAnd\'da gösterilmez.</string>
+    <string name="osm_edits_view_descr">Henüz karşıya yüklenmemiş tüm düzenlemelerinizi veya OSM hatalarınızı %1$s\'de görüntüleyebilirsiniz. Karşıya yüklenen noktalar OsmAnd\'da gösterilmez.</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Navigasyon sırasında veya harekete halindeyken gösterilen simge.</string>
     <string name="select_map_icon_descr">Dinlenme anında gösterilen simge.</string>
@@ -3495,7 +3495,7 @@
     <string name="replace_all">Hepsini değiştir</string>
     <string name="keep_both">Her ikisini de sakla</string>
     <string name="keep_both_desc">İçe aktarılan ögelere ön ek eklenecek</string>
-    <string name="import_duplicates_description">OsmAnd\'da içe aktarılanlarla aynı isme sahip ögeler zaten var.
+    <string name="import_duplicates_description">OsmAnd\'da içe aktarılanlarla aynı ada sahip ögeler zaten var.
 \n
 \nBir eylem seçin.</string>
     <string name="import_duplicates_title">Bazı ögeler zaten var</string>
@@ -3532,7 +3532,7 @@
     <string name="recalculate_route_distance_promo">Güzergahtan geçerli konuma olan mesafe seçilen değerden fazla ise güzergah yeniden hesaplanacaktır.</string>
     <string name="n_items_of_z">%1$s / %2$s</string>
     <string name="download_slope_maps">Yamaçlar</string>
-    <string name="quick_action_show_hide_terrain">Araziyi göster / gizle</string>
+    <string name="quick_action_show_hide_terrain">Araziyi göster veya gizle</string>
     <string name="quick_action_terrain_hide">Araziyi gizle</string>
     <string name="quick_action_terrain_show">Araziyi göster</string>
     <string name="quick_action_terrain_descr">Haritada arazi katmanını göstermek veya gizlemek için bir düğme.</string>
@@ -3650,11 +3650,11 @@
     <string name="additional_actions_descr">Bu eylemlere “%1$s” düğmesine dokunarak erişebilirsiniz.</string>
     <string name="quick_action_transport_hide">Toplu taşıma araçlarını gizle</string>
     <string name="quick_action_transport_show">Toplu taşıma araçlarını göster</string>
-    <string name="quick_action_show_hide_transport">Toplu taşıma araçlarını göster/gizle</string>
+    <string name="quick_action_show_hide_transport">Toplu taşıma araçlarını göster veya gizle</string>
     <string name="quick_action_transport_descr">Haritada toplu taşıma araçlarını gösteren veya gizleyen düğme.</string>
-    <string name="create_edit_poi">POI Oluştur / Düzenle</string>
+    <string name="create_edit_poi">POI oluştur veya düzenle</string>
     <string name="parking_positions">Park etme alanları</string>
-    <string name="add_edit_favorite">Sık Kullanılan Ekle / Düzenle</string>
+    <string name="add_edit_favorite">Sık kullanılan ekle veya düzenle</string>
     <string name="reset_deafult_order">Öntanımlı öge sıralamasını geri yükle</string>
     <string name="back_to_editing">Düzenlemeye geri dön</string>
     <string name="quick_action_switch_profile_descr">Eylem düğmesi seçilen profiller arasında geçiş yapar.</string>
@@ -3779,7 +3779,7 @@
     <string name="shared_string_done">Bitti</string>
     <string name="overwrite_track">Yolun üzerine yaz</string>
     <string name="route_between_points_warning_desc">Ardından, bu seçeneği kullanmak için navigasyon profillerinizden biriyle izlenen yolunuzu izin verilen en yakın yola tutturun.</string>
-    <string name="save_as_new_track">Yeni bir yol olarak kaydet</string>
+    <string name="save_as_new_track">Yeni bir izleme olarak kaydet</string>
     <string name="reverse_route">Ters güzergah</string>
     <string name="route_between_points_whole_track_button_desc">Tüm yol, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
     <string name="route_between_points_next_segment_button_desc">Sadece sonraki bölüm, seçilen profil kullanılarak yeniden hesaplanacaktır.</string>
@@ -3811,7 +3811,7 @@
     <string name="marker_save_as_track">Yol dosyası olarak kaydet</string>
     <string name="number_of_gpx_files_selected_pattern">%s yol dosyası seçildi</string>
     <string name="disable_recording_once_app_killed_descrp">(Son uygulamalar aracılığıyla) uygulama kapatıldığında yol kaydını duraklatacaktır. (OsmAnd arka plan göstergesi Android bildirim çubuğundan kaybolur.)</string>
-    <string name="save_global_track_interval_descr">Genel yol kaydı için kayıt aralığını seçin (haritadaki seyahat kayıt widget\'ı aracılığıyla etkin).</string>
+    <string name="save_global_track_interval_descr">Genel yol kaydı için kayıt aralığını belirtin (haritadaki \'Seyahat kaydetme\' widget\'ı aracılığıyla açıldı).</string>
     <string name="gpx_monitoring_stop">Seyahat kaydetmeyi duraklat</string>
     <string name="gpx_monitoring_start">Seyahat kaydetmeyi devam ettir</string>
     <string name="nearest_point">En yakın nokta</string>
@@ -3843,7 +3843,7 @@
     <string name="simplified_track">Basitleştirilmiş yol</string>
     <string name="release_3_8">• Güzergah planlama işlevi güncellendi: her bölüm için farklı navigasyon türlerinin kullanılmasına ve izlenen yolların dahil edilmesine izin veriliyor
 \n
-\n • İzlenen yollar için yeni görünüm menüsü: renk ve kalınlık seçimi, yön oklarının gösterilmesi, başlangıç/bitiş simgeleri
+\n • İzlenen yollar için yeni görünüm menüsü: renk ve kalınlık seçimi, yön oklarının gösterilmesi, başlangıç ve bitiş simgeleri
 \n
 \n • Bisiklet düğümlerinin görünürlüğü iyileştirildi.
 \n
@@ -3859,7 +3859,7 @@
     <string name="sort_last_modified">Son değiştirme</string>
     <string name="sort_name_descending">İsim: Z – A</string>
     <string name="sort_name_ascending">İsim: A – Z</string>
-    <string name="start_finish_icons">Başlangıç/bitiş simgeleri</string>
+    <string name="start_finish_icons">Başlangıç ve bitiş simgeleri</string>
     <string name="contour_lines_thanks">\'Eş yükselti eğrileri\'ni satın aldığınız için teşekkürler</string>
     <string name="osm_live_payment_desc_hw">Abonelik seçilen dönem başına ücretlendirilir. İstediğiniz zaman AppGallery\'den iptal edin.</string>
     <string name="osm_live_payment_subscription_management_hw">Ödeme, satın alma onaylandığında AppGallery hesabınızdan alınacaktır.
@@ -3877,10 +3877,10 @@
     <string name="use_native_pt">Yerel Toplu Taşıma geliştirme</string>
     <string name="use_native_pt_desc">Java (güvenli) Toplu Taşıma yönlendirme hesaplamasına geçin</string>
     <string name="what_is_new">Yenilikler</string>
-    <string name="perform_oauth_authorization_description">osmedit özelliklerini kullanmak için OAuth oturum açma işlemi gerçekleştirin</string>
+    <string name="perform_oauth_authorization_description">osmedit özelliklerini kullanmak için OAuth ile oturum açın</string>
     <string name="perform_oauth_authorization">OAuth ile oturum aç</string>
     <string name="clear_osm_token">OpenStreetMap OAuth belirtecini temizle</string>
-    <string name="osm_edit_logout_success">Oturum kapatma başarılı</string>
+    <string name="osm_edit_logout_success">Oturum kapatıldı</string>
     <string name="file_already_imported">Dosya zaten OsmAnd\'da içe aktarıldı</string>
     <string name="use_two_phase_routing">2 aşamalı A* yönlendirme algoritması kullan</string>
     <string name="snowmobile_render_descr">Ayrılmış yollar ve parkurlarla kar arabası sürüşü için.</string>
@@ -3903,12 +3903,12 @@
     <string name="icon_group_emergency">Acil</string>
     <string name="icon_group_travel">Seyahat</string>
     <string name="message_you_need_add_two_points_to_show_graphs">En az iki nokta eklemelisiniz</string>
-    <string name="login_open_street_map">OpenStreetMap\'te oturum aç</string>
-    <string name="login_open_street_map_org">OpenStreetMap.org\'da oturum aç</string>
-    <string name="open_street_map_login_mode">Yenilikleri veya değişiklikleri karşıya yüklemek için oturum açmanız gerekir.
+    <string name="login_open_street_map">OpenStreetMap için oturum aç</string>
+    <string name="login_open_street_map_org">OpenStreetMap.org için oturum aç</string>
+    <string name="open_street_map_login_mode">Yenilikleri veya değişiklikleri karşıya yüklemek için oturum açın,
 \n
-\nGüvenli OAuth yöntemini kullanarak oturum açabilir veya kullanıcı adı ve parolanızı kullanabilirsiniz.</string>
-    <string name="use_login_password">Kullanıcı adı ve parola kullan</string>
+\nOAuth ile oturum açabilir veya kullanıcı adı ve parolanızı kullanabilirsiniz.</string>
+    <string name="use_login_password">Kullanıcı adı ve parola ile oturum aç</string>
     <string name="user_login">Kullanıcı adı</string>
     <string name="login_account">Hesap</string>
     <string name="manage_subscription">Aboneliği yönet</string>
@@ -3920,4 +3920,32 @@
     <string name="markers_history">İşaretleyiciler geçmişi</string>
     <string name="send_files_to_openstreetmap">GPX dosyasını OpenStreetMap\'e gönder</string>
     <string name="enter_text_separated">Virgülle ayrılmış etiketleri girin.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Genel\", izlemenin GPS izlerinizde ve genel GPS izleme listelerinde herkese açık olarak ve ham biçimde zaman damgalarıyla birlikte genel izleme listesinde gösterileceği anlamına gelir. API aracılığıyla sunulan veriler, izleme sayfanızı göstermez. İzleme noktası zaman damgaları, genel GPS API\'si aracılığıyla kullanılamaz ve izleme noktaları kronolojik olarak sıralanmaz.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Özel\", izlemenin herkese açık herhangi bir listede gösterilmediği, ancak ondan alınan izleme noktalarının zaman damgası olmadan genel GPS API\'si aracılığıyla eşzamanlı olmayan sırada kullanılabileceği anlamına gelir.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Teşhis edilebilir\", izlemenin GPS izlerinizde ve genel GPS izleme listelerinde herkese açık olarak gösterileceği anlamına gelir, yani diğer kullanıcılar ham izi indirebilir ve kullanıcı adınızla ilişkilendirebilir. İzleme noktaları API\'si aracılığıyla sunulan GPS API\'sinden alınan herkese açık zaman damgalı izleme noktası verileri, orijinal izleme sayfanızı gösterecektir.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Takip edilebilir\", izlemenin herkese açık herhangi bir listede gösterilmediği, ancak (sizinle doğrudan ilişkilendirilemeyen) zaman damgaları olan işlenen izleme noktalarının herkese açık GPS API\'sinden indirmeler yoluyla göründüğü anlamına gelir.</string>
+    <string name="osm_edit_close_note">OSM Notunu Kapat</string>
+    <string name="osm_edit_comment_note">OSM Notuna Yorum Yap</string>
+    <string name="osm_login_descr">Güvenli OAuth yöntemini kullanarak oturum açın veya kullanıcı adınızı ve parolanızı kullanın.</string>
+    <string name="shared_string_add_photo">Fotoğraf ekle</string>
+    <string name="register_on_openplacereviews">OpenPlaceReviews.org\'a
+\nkaydolun</string>
+    <string name="register_on_openplacereviews_desc">Daha da fazla fotoğraf yüklemek için açık veri projesi web sitesi OpenPlaceReviews.org\'da oturum açın.</string>
+    <string name="register_opr_create_new_account">Yeni hesap oluştur</string>
+    <string name="register_opr_have_account">Zaten bir hesabım var</string>
+    <string name="shared_string_search_history">Arama geçmişi</string>
+    <string name="app_mode_kayak">Kano</string>
+    <string name="app_mode_motorboat">Motorlu tekne</string>
+    <string name="add_to_mapillary">Mapillary\'ye ekle</string>
+    <string name="add_to_opr">OpenPlaceReviews\'a ekle</string>
+    <string name="add_photos_descr">OsmAnd çeşitli kaynaklardan fotoğraflar gösterir:
+\nOpenPlaceReviews - POI fotoğrafları;
+\nMapillary - sokak seviyesi görüntüleri;
+\nİnternet / Wikimedia - OpenStreetMap verilerinde belirtilen POI fotoğrafları.</string>
+    <string name="shared_string_resources">Kaynaklar</string>
+    <string name="approximate_file_size">Yaklaşık dosya boyutu</string>
+    <string name="select_data_to_export">Dosyaya aktarılacak verileri seçin.</string>
+    <string name="file_size_needed_for_import">İçe aktarma için gerekli</string>
+    <string name="export_not_enough_space_descr">Aygıtınızda yalnızca %1$s boş alan var. Lütfen biraz alan boşaltın veya dışa aktarılacak bazı ögelerin seçimini kaldırın.</string>
+    <string name="export_not_enough_space">Yeterli alan yok</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -3989,4 +3989,6 @@
 \nOpenPlaceReviews — світлини POI;
 \nMapillary - зображення вулиць;
 \nМережа / Вікімедіа — світлини POI, вказані в даних OpenStreetMap.</string>
+    <string name="select_groups_for_import">Виберіть групи, які буде імпортовано.</string>
+    <string name="select_items_for_import">Виберіть елементи, які буде імпортовано.</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -11,6 +11,8 @@
 	Thx - Hardy
 
 -->
+    <string name="use_dev_url">Use dev.openstreetmap.org</string>
+    <string name="use_dev_url_descr">Switch to use "dev.openstreetmap.org" instead of "openstreetmap.org" to testing uploading OSM Note / POI / GPX.</string>
     <string name="select_items_for_import">Select items that will be imported.</string>
     <string name="select_groups_for_import">Select groups that will be imported.</string>
     <string name="export_not_enough_space">There is not enough space</string>

OsmAnd/res/xml/osm_editing.xml

@@ -32,6 +32,14 @@
 		android:title="@string/offline_edition"
 		tools:icon="@drawable/ic_action_offline" />
 
+	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
+		android:key="use_dev_url"
+		android:layout="@layout/preference_with_descr_dialog_and_switch"
+		android:summaryOff="@string/shared_string_disabled"
+		android:summaryOn="@string/shared_string_enabled"
+		android:title="@string/use_dev_url"
+		tools:icon="@drawable/ic_action_laptop" />
+
 	<Preference
 		android:layout="@layout/simple_divider_item"
 		android:selectable="false" />

OsmAnd/src/net/osmand/AndroidNetworkUtils.java

@@ -305,8 +305,8 @@ public class AndroidNetworkUtils {
 		try {
 			boolean firstPrm = !urlText.contains("?");
 			StringBuilder sb = new StringBuilder(urlText);
-			for (String key : additionalParams.keySet()) {
-				sb.append(firstPrm ? "?" : "&").append(key).append("=").append(URLEncoder.encode(additionalParams.get(key), "UTF-8"));
+			for (Map.Entry<String, String> entry : additionalParams.entrySet()) {
+				sb.append(firstPrm ? "?" : "&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue(), "UTF-8"));
 				firstPrm = false;
 			}
 			urlText = sb.toString();

OsmAnd/src/net/osmand/access/NavigationInfo.java

@@ -373,7 +373,7 @@ public class NavigationInfo implements OsmAndCompassListener, OsmAndLocationList
 				dialog.cancel();
 			}
 		});
-		info.setItems(attributes.toArray(new String[attributes.size()]), new DialogInterface.OnClickListener() {
+		info.setItems(attributes.toArray(new String[0]), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 			}

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

@@ -190,14 +190,15 @@ class AppVersionUpgradeOnInit {
 		migrateEnumPreferences();
 		SharedPreferences globalSharedPreferences = (SharedPreferences) settings.getGlobalPreferences();
 		Map<String, ?> globalPrefsMap = globalSharedPreferences.getAll();
-		for (String key : globalPrefsMap.keySet()) {
+		for (Map.Entry<String, ?> entry : globalPrefsMap.entrySet()) {
+			String key = entry.getKey();
 			OsmandPreference<?> pref = settings.getPreference(key);
 			if (pref instanceof CommonPreference) {
 				CommonPreference<?> commonPreference = (CommonPreference<?>) pref;
 				if (!commonPreference.isGlobal()) {
 					for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 						if (!commonPreference.isSetForMode(mode) && !commonPreference.hasDefaultValueForMode(mode)) {
-							settings.setPreference(key, globalPrefsMap.get(key), mode);
+							settings.setPreference(key, entry.getValue(), mode);
 						}
 					}
 				}
@@ -205,12 +206,13 @@ class AppVersionUpgradeOnInit {
 		}
 		SharedPreferences defaultProfilePreferences = (SharedPreferences) settings.getProfilePreferences(ApplicationMode.DEFAULT);
 		Map<String, ?> defaultPrefsMap = defaultProfilePreferences.getAll();
-		for (String key : defaultPrefsMap.keySet()) {
+		for (Map.Entry<String, ?> entry : defaultPrefsMap.entrySet()) {
+			String key = entry.getKey();
 			OsmandPreference<?> pref = settings.getPreference(key);
 			if (pref instanceof CommonPreference) {
 				CommonPreference<?> commonPreference = (CommonPreference<?>) pref;
 				if (commonPreference.isGlobal() && !commonPreference.isSet()) {
-					settings.setPreference(key, defaultPrefsMap.get(key));
+					settings.setPreference(key, entry.getValue());
 				}
 			}
 		}

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

@@ -208,7 +208,7 @@ public class ContextMenuAdapter {
 		}
 		items.removeAll(itemsToRemove);
 		return new ContextMenuArrayAdapter(activity, layoutId, R.id.title,
-				items.toArray(new ContextMenuItem[items.size()]), app, lightTheme, changeAppModeListener);
+				items.toArray(new ContextMenuItem[0]), app, lightTheme, changeAppModeListener);
 	}
 
 	public class ContextMenuArrayAdapter extends ArrayAdapter<ContextMenuItem> {
@@ -643,7 +643,7 @@ public class ContextMenuAdapter {
 	}
 
 	public static OnItemDeleteAction makeDeleteAction(final List<? extends OsmandPreference> prefs) {
-		return makeDeleteAction(prefs.toArray(new OsmandPreference[prefs.size()]));
+		return makeDeleteAction(prefs.toArray(new OsmandPreference[0]));
 	}
 
 	private static void resetSetting(ApplicationMode appMode, OsmandPreference preference, boolean profileOnly) {

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

@@ -261,10 +261,11 @@ public class FavouritesDbHelper {
 
 	private boolean merge(Map<String, FavouritePoint> source, Map<String, FavouritePoint> destination) {
 		boolean changed = false;
-		for (String ks : source.keySet()) {
+		for (Map.Entry<String, FavouritePoint> entry : source.entrySet()) {
+			String ks = entry.getKey();
 			if (!destination.containsKey(ks)) {
 				changed = true;
-				destination.put(ks, source.get(ks));
+				destination.put(ks, entry.getValue());
 			}
 		}
 		return changed;
@@ -360,7 +361,7 @@ public class FavouritesDbHelper {
 	}
 
 	public boolean addFavourite(FavouritePoint p, boolean saveImmediately) {
-		if (p.getName().equals("") && flatGroups.containsKey(p.getCategory())) {
+		if (p.getName().isEmpty() && flatGroups.containsKey(p.getCategory())) {
 			return true;
 		}
 		if (!p.isAddressSpecified()) {
@@ -369,7 +370,7 @@ public class FavouritesDbHelper {
 		context.getSettings().SHOW_FAVORITES.set(true);
 		FavoriteGroup group = getOrCreateGroup(p, 0);
 
-		if (!p.getName().equals("")) {
+		if (!p.getName().isEmpty()) {
 			p.setVisible(group.visible);
 			if (FavouritePoint.SpecialPointType.PARKING.equals(p.getSpecialPointType())) {
 				p.setColor(ContextCompat.getColor(context, R.color.parking_icon_background));
@@ -712,9 +713,10 @@ public class FavouritesDbHelper {
 
 	public boolean isGroupVisible(String name) {
 		String nameLowercase = name.toLowerCase();
-		for (String groupName : flatGroups.keySet()) {
+		for (Map.Entry<String, FavoriteGroup> entry : flatGroups.entrySet()) {
+			String groupName = entry.getKey();
 			if (groupName.toLowerCase().equals(nameLowercase) || FavoriteGroup.getDisplayName(context, groupName).equals(name)) {
-				return flatGroups.get(groupName).isVisible();
+				return entry.getValue().isVisible();
 			}
 		}
 		return false;
@@ -968,7 +970,7 @@ public class FavouritesDbHelper {
 							p.setName(name);
 							p.setCategory(cat);
 							FavoriteGroup group = getOrCreateGroup(p, 0);
-							if (!name.equals("")) {
+							if (!name.isEmpty()) {
 								p.setLatitude(query.getDouble(2));
 								p.setLongitude(query.getDouble(3));
 								group.points.add(p);
@@ -1012,7 +1014,7 @@ public class FavouritesDbHelper {
 
 
 	public boolean addFavouriteDB(FavouritePoint p) {
-		if (p.getName().equals("") && flatGroups.containsKey(p.getCategory())) {
+		if (p.getName().isEmpty() && flatGroups.containsKey(p.getCategory())) {
 			return true;
 		}
 		SQLiteConnection db = openConnection(false);
@@ -1022,7 +1024,7 @@ public class FavouritesDbHelper {
 						"INSERT INTO " + FAVOURITE_TABLE_NAME + " (" + FAVOURITE_COL_NAME + ", " + FAVOURITE_COL_CATEGORY + ", "
 								+ FAVOURITE_COL_LAT + ", " + FAVOURITE_COL_LON + ")" + " VALUES (?, ?, ?, ?)", new Object[]{p.getName(), p.getCategory(), p.getLatitude(), p.getLongitude()}); //$NON-NLS-1$ //$NON-NLS-2$
 				FavoriteGroup group = getOrCreateGroup(p, 0);
-				if (!p.getName().equals("")) {
+				if (!p.getName().isEmpty()) {
 					p.setVisible(group.visible);
 					p.setColor(group.color);
 					group.points.add(p);

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

@@ -408,10 +408,10 @@ public class GpxSelectionHelper {
 			boolean split = true;
 			if (group.splitDistance > 0) {
 				List<GPXTrackAnalysis> trackSegments = r.splitByDistance(group.splitDistance, joinSegments);
-				as = trackSegments.toArray(new GPXTrackAnalysis[trackSegments.size()]);
+				as = trackSegments.toArray(new GPXTrackAnalysis[0]);
 			} else if (group.splitTime > 0) {
 				List<GPXTrackAnalysis> trackSegments = r.splitByTime(group.splitTime, joinSegments);
-				as = trackSegments.toArray(new GPXTrackAnalysis[trackSegments.size()]);
+				as = trackSegments.toArray(new GPXTrackAnalysis[0]);
 			} else {
 				split = false;
 				as = new GPXTrackAnalysis[] {GPXTrackAnalysis.segment(0, r)};

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

@@ -13,4 +13,9 @@ public interface OsmAndConstants {
 
 	public int UI_HANDLER_SEARCH = 7000;
 
+	String OSM_OAUTH_DEVELOPER_KEY = "v8G8r9NLJZGMV4he5lwbQlz620FNVARKjI9Bm5UJ";
+	String OSM_OAUTH_DEVELOPER_SECRET = "jDvM95Ne1Bq2BDTmIfB6b3ZMxvdK87WGfp6DC07J";
+	String OSM_OAUTH_CONSUMER_KEY = "Ti2qq3fo4i4Wmuox3SiWRIGq3obZisBHnxmcM05y";
+	String OSM_OAUTH_CONSUMER_SECRET = "lxulb3HYoMmd2cC4xxNe1dyfRMAY8dS0eNihJ0DM";
+
 }

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

@@ -63,7 +63,7 @@ public class OsmAndFormatter {
 	private static final char WEST = 'W';
 	private static final char EAST = 'E';
 
-	{
+	static {
 		fixed2.setMinimumFractionDigits(2);
 		fixed1.setMinimumFractionDigits(1);
 		fixed1.setMinimumIntegerDigits(1);

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

@@ -412,8 +412,8 @@ public class OsmandApplication extends MultiDexApplication {
 		if (defaultLocale == null) {
 			defaultLocale = Locale.getDefault();
 		}
-		if (!"".equals(lang)) {
-			if (!"".equals(country)) {
+		if (!Algorithms.isEmpty(lang)) {
+			if (!Algorithms.isEmpty(country)) {
 				preferredLocale = new Locale(lang, country);
 			} else {
 				preferredLocale = new Locale(lang);
@@ -421,9 +421,9 @@ public class OsmandApplication extends MultiDexApplication {
 		}
 		Locale selectedLocale = null;
 
-		if (!"".equals(lang) && !config.locale.equals(preferredLocale)) {
+		if (!Algorithms.isEmpty(lang) && !config.locale.equals(preferredLocale)) {
 			selectedLocale = preferredLocale;
-		} else if ("".equals(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) {
+		} else if (Algorithms.isEmpty(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) {
 			selectedLocale = defaultLocale;
 			preferredLocale = null;
 		}
@@ -812,12 +812,12 @@ public class OsmandApplication extends MultiDexApplication {
 		if (preferredLocale != null) {
 			Configuration config = context.getResources().getConfiguration();
 			String lang = preferredLocale.getLanguage();
-			if (!"".equals(lang) && !config.locale.getLanguage().equals(lang)) {
+			if (!Algorithms.isEmpty(lang) && !config.locale.getLanguage().equals(lang)) {
 				preferredLocale = new Locale(lang);
 				Locale.setDefault(preferredLocale);
 				config.locale = preferredLocale;
 				context.getResources().updateConfiguration(config, context.getResources().getDisplayMetrics());
-			} else if("".equals(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) {
+			} else if (Algorithms.isEmpty(lang) && defaultLocale != null && Locale.getDefault() != defaultLocale) {
 				Locale.setDefault(defaultLocale);
 				config.locale = defaultLocale;
 				getBaseContext().getResources().updateConfiguration(config, getBaseContext().getResources().getDisplayMetrics());

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

@@ -309,9 +309,7 @@ public class TargetPointsHelper {
 	public List<TargetPoint> getIntermediatePointsNavigation() {
 		List<TargetPoint> intermediatePoints = new ArrayList<>();
 		if (settings.USE_INTERMEDIATE_POINTS_NAVIGATION.get()) {
-			for (TargetPoint t : this.intermediatePoints) {
-				intermediatePoints.add(t);
-			}
+			intermediatePoints.addAll(this.intermediatePoints);
 		}
 		return intermediatePoints;
 	}
@@ -347,8 +345,7 @@ public class TargetPointsHelper {
 	}
 
 	public List<TargetPoint> getIntermediatePointsWithTarget() {
-		List<TargetPoint> res = new ArrayList<>();
-		res.addAll(this.intermediatePoints);
+		List<TargetPoint> res = new ArrayList<>(this.intermediatePoints);
 		if(pointToNavigate != null) {
 			res.add(pointToNavigate);
 		}

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

@@ -478,7 +478,7 @@ public class UiUtilities {
 			endButtonText.setTextColor(activeColor);
 			startButtonContainer.setBackgroundDrawable(background);
 			startButtonText.setTextColor(textColor);
-		} else {
+		} else if (buttonType == CustomRadioButtonType.END) {
 			if (isLayoutRtl) {
 				background.setCornerRadii(new float[]{radius, radius, 0, 0, 0, 0, radius, radius});
 			} else {
@@ -488,6 +488,11 @@ public class UiUtilities {
 			endButtonText.setTextColor(textColor);
 			startButtonContainer.setBackgroundColor(Color.TRANSPARENT);
 			startButtonText.setTextColor(activeColor);
+		} else if (buttonType == null) {
+			endButtonContainer.setBackgroundColor(Color.TRANSPARENT);
+			startButtonContainer.setBackgroundColor(Color.TRANSPARENT);
+			endButtonText.setTextColor(activeColor);
+			startButtonText.setTextColor(activeColor);
 		}
 	}
 

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

@@ -176,7 +176,7 @@ public class HelpActivity extends OsmandActionBarActivity implements AdapterView
 				"feature_articles/osmand-3-8-released.html"));
 
 		String releasedate = "";
-		if (!this.getString(R.string.app_edition).equals("")) {
+		if (!this.getString(R.string.app_edition).isEmpty()) {
 			releasedate = ", " + this.getString(R.string.shared_string_release).toLowerCase() + ": " + this.getString(R.string.app_edition);
 		}
 		String version = Version.getFullVersion(getMyApplication()) + releasedate;

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

@@ -1148,7 +1148,7 @@ public class MapActivityActions implements DialogProvider {
 		items.add(getString(R.string.show_location));
 		items.add(getString(R.string.shared_string_show_details));
 		AlertDialog.Builder menu = new AlertDialog.Builder(mapActivity);
-		menu.setItems(items.toArray(new String[items.size()]), new DialogInterface.OnClickListener() {
+		menu.setItems(items.toArray(new String[0]), new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int item) {
 				dialog.dismiss();

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

@@ -208,11 +208,13 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 				Map<String, GPXFile> data = collectRecordedData();
 
 				// save file
-				for (final String f : data.keySet()) {
+				for (final Map.Entry<String, GPXFile> entry : data.entrySet()) {
+					final String f = entry.getKey();
+					GPXFile gpx = entry.getValue();
 					log.debug("Filename: " + f);
 					File fout = new File(dir, f + IndexConstants.GPX_FILE_EXT);
-					if (!data.get(f).isEmpty()) {
-						WptPt pt = data.get(f).findPointToShow();
+					if (!gpx.isEmpty()) {
+						WptPt pt = gpx.findPointToShow();
 						String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
 						Integer trackStorageDirectory = ctx.getSettings().TRACK_STORAGE_DIRECTORY.get();
 						if (!OsmandSettings.REC_DIRECTORY.equals(trackStorageDirectory)) {
@@ -235,13 +237,12 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
 						}
 					}
 
-					Exception warn = GPXUtilities.writeGpxFile(fout, data.get(f));
+					Exception warn = GPXUtilities.writeGpxFile(fout, gpx);
 					if (warn != null) {
 						warnings.add(warn.getMessage());
 						return new SaveGpxResult(warnings, new ArrayList<String>());
 					}
 
-					GPXFile gpx = data.get(f);
 					GPXTrackAnalysis analysis = gpx.getAnalysis(fout.lastModified());
 					GpxDataItem item = new GpxDataItem(fout, analysis);
 					ctx.getGpxDbHelper().add(item);

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

@@ -165,7 +165,7 @@ public class StartGPSStatus extends OsmAndAction {
 			// if (g.activity.length() == 0) {
 				PackageManager pm = mapActivity.getPackageManager();
 				try {
-					String appName = !g.paidAppName.equals("") &&
+					String appName = !g.paidAppName.isEmpty() &&
 							g.installed(mapActivity, g.paidAppName) ? g.paidAppName : g.appName;
 					intent = pm.getLaunchIntentForPackage(appName);
 				} catch (RuntimeException e) {

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

@@ -166,9 +166,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
 				}
 
 			});
-			for (AbstractPoiType p : res) {
-				filters.add(p);
-			}
+			filters.addAll(res);
 			filters.add(poiFilters.getSearchByNamePOIFilter());
 			if (OsmandPlugin.getEnabledPlugin(OsmandRasterMapsPlugin.class) != null) {
 				filters.add(poiFilters.getNominatimPOIFilter());

OsmAnd/src/net/osmand/plus/api/FileSettingsAPIImpl.java

@@ -25,9 +25,9 @@ public class FileSettingsAPIImpl implements SettingsAPI {
 			Properties props = new Properties();
 			FileInputStream fis = new FileInputStream(file);
 			props.load(fis);
-			for (Object key : props.keySet()) {
-				String k = key.toString();
-				map.put(k, props.get(key));
+			for (Entry<Object, Object> entry : props.entrySet()) {
+				String k = entry.getKey().toString();
+				map.put(k, entry.getValue());
 			}
 		}
 	}

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

@@ -1860,7 +1860,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 	protected Recording[] getRecordingsSorted() {
 		checkRecordings();
 		Collection<Recording> allObjects = getAllRecordings();
-		Recording[] res = allObjects.toArray(new Recording[allObjects.size()]);
+		Recording[] res = allObjects.toArray(new Recording[0]);
 		Arrays.sort(res, new Comparator<Recording>() {
 
 			@Override

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

@@ -223,7 +223,7 @@ public class DashChooseAppDirFragment {
 			paths.add("");
 			types.add(OsmandSettings.EXTERNAL_STORAGE_TYPE_SPECIFIED);
 
-			editalert.setSingleChoiceItems(items.toArray(new String[items.size()]), selected,
+			editalert.setSingleChoiceItems(items.toArray(new String[0]), selected,
 					new DialogInterface.OnClickListener() {
 
 						@Override

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

@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
@@ -298,9 +299,7 @@ public class LogcatActivity extends ActionBarProgressActivity {
 				LogcatActivity activity = logcatActivity.get();
 				if (activity != null) {
 					boolean autoscroll = !activity.recyclerView.canScrollVertically(1);
-					for(String s : values) {
-						activity.logs.add(s);
-					}
+					activity.logs.addAll(Arrays.asList(values));
 					activity.adapter.notifyDataSetChanged();
 					if(autoscroll) {
 						activity.recyclerView.scrollToPosition(activity.logs.size() - 1);

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

@@ -404,7 +404,7 @@ public class ConfigureMapMenu {
 						bld.setTitle(R.string.map_magnifier);
 						bld.setNegativeButton(R.string.shared_string_dismiss, null);
 						DialogListItemAdapter dialogAdapter = DialogListItemAdapter.createSingleChoiceAdapter(
-								values.toArray(new String[values.size()]), nightMode, i, app, selectedProfileColor, themeRes, new View.OnClickListener() {
+								values.toArray(new String[0]), nightMode, i, app, selectedProfileColor, themeRes, new View.OnClickListener() {
 									@Override
 									public void onClick(View v) {
 										int which = (int) v.getTag();
@@ -481,7 +481,7 @@ public class ConfigureMapMenu {
 				.createItem());
 
 		String localeDescr = activity.getMyApplication().getSettings().MAP_PREFERRED_LOCALE.get();
-		localeDescr = localeDescr == null || localeDescr.equals("") ? activity.getString(R.string.local_map_names)
+		localeDescr = localeDescr == null || localeDescr.isEmpty() ? activity.getString(R.string.local_map_names)
 				: localeDescr;
 		adapter.addItem(new ContextMenuItem.ItemBuilder().setTitleId(R.string.map_locale, activity)
 				.setId(MAP_LANGUAGE_ID)
@@ -570,7 +570,7 @@ public class ConfigureMapMenu {
 										txtIds[index]);
 								refreshMapComplete(activity);
 								String localeDescr = txtIds[index];
-								localeDescr = localeDescr == null || localeDescr.equals("") ? activity
+								localeDescr = localeDescr == null || localeDescr.isEmpty() ? activity
 										.getString(R.string.local_map_names) : localeDescr;
 								adapter.getItem(pos).setDescription(localeDescr);
 								ad.notifyDataSetInvalidated();
@@ -639,7 +639,7 @@ public class ConfigureMapMenu {
 				return mp.get(lhs).compareTo(mp.get(rhs));
 			}
 		});
-		return lst.toArray(new String[lst.size()]);
+		return lst.toArray(new String[0]);
 	}
 
 	public static String[] getMapNamesValues(Context ctx, String[] ids) {

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

@@ -349,7 +349,7 @@ public class DownloadFileHelper {
 		private int currentRead = 0;
 
 		public CountingMultiInputStream(List<InputStream> streams) {
-			this.delegate = streams.toArray(new InputStream[streams.size()]);
+			this.delegate = streams.toArray(new InputStream[0]);
 		}
 		
 		@Override

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

@@ -582,7 +582,7 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 			operationTask = null;
 		}
 		if (operationTask != null) {
-			operationTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, selectedItems.toArray(new LocalIndexInfo[selectedItems.size()]));
+			operationTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, selectedItems.toArray(new LocalIndexInfo[0]));
 		}
 		if (actionMode != null) {
 			actionMode.finish();

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

@@ -166,12 +166,12 @@ public class UpdatesIndexFragment extends OsmAndListFragment implements Download
 						dialog.setPositiveButton(R.string.shared_string_update, new DialogInterface.OnClickListener() {
 							@Override
 							public void onClick(DialogInterface dialog, int which) {
-								getMyActivity().startDownload(indexItems.toArray(new IndexItem[indexItems.size()]));
+								getMyActivity().startDownload(indexItems.toArray(new IndexItem[0]));
 							}
 						});
 						dialog.create().show();
 					} else {
-						getMyActivity().startDownload(indexItems.toArray(new IndexItem[indexItems.size()]));
+						getMyActivity().startDownload(indexItems.toArray(new IndexItem[0]));
 					}
 				}
 			});

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

@@ -871,7 +871,7 @@ public class ExternalApiHelper {
 			searchTypes.add(HOUSE);
 			searchTypes.add(STREET_INTERSECTION);
 		}
-		searchSettings = searchSettings.setSearchTypes(searchTypes.toArray(new ObjectType[searchTypes.size()]));
+		searchSettings = searchSettings.setSearchTypes(searchTypes.toArray(new ObjectType[0]));
 
 		core.search(searchQuery, false, null, searchSettings);
 	}

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

@@ -101,7 +101,7 @@ public class MapMarkerDialogHelper {
 		String desc = OsmAndFormatter.getFormattedDate(app, marker.creationDate);
 		String markerGroupName = marker.groupName;
 		if (markerGroupName != null) {
-			if (markerGroupName.equals("")) {
+			if (markerGroupName.isEmpty()) {
 				markerGroupName = app.getString(R.string.shared_string_favorites);
 			}
 			desc += " • " + markerGroupName;

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

@@ -513,10 +513,9 @@ public class ImportHelper {
 
 	private File getFileToSave(final String fileName, final File importDir, final WptPt pt) {
 		final StringBuilder builder = new StringBuilder(fileName);
-		if ("".equals(fileName)) {
+		if (Algorithms.isEmpty(fileName)) {
 			builder.append("import_").append(new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time))).append(GPX_FILE_EXT); //$NON-NLS-1$
-		}
-		if (fileName.endsWith(KML_SUFFIX)) {
+		} else if (fileName.endsWith(KML_SUFFIX)) {
 			builder.replace(builder.length() - KML_SUFFIX.length(), builder.length(), GPX_FILE_EXT);
 		} else if (fileName.endsWith(KMZ_SUFFIX)) {
 			builder.replace(builder.length() - KMZ_SUFFIX.length(), builder.length(), GPX_FILE_EXT);

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

@@ -367,8 +367,7 @@ public class MenuBuilder {
 					@Override
 					public void onFinish(List<ImageCard> cardList) {
 						if (!isHidden()) {
-							List<AbstractCard> cards = new ArrayList<>();
-							cards.addAll(cardList);
+							List<AbstractCard> cards = new ArrayList<AbstractCard>(cardList);
 							if (cardList.size() == 0) {
 								cards.add(new NoImagesCard(mapActivity));
 							}

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

@@ -64,6 +64,8 @@ public class HorizontalSelectionAdapter extends RecyclerView.Adapter<HorizontalS
 		final HorizontalSelectionItem item = items.get(holder.getAdapterPosition());
 		TextView textView = holder.buttonText;
 		int activeColorResId = nightMode ? R.color.active_color_primary_dark : R.color.active_color_primary_light;
+		int innerPadding = AndroidUtils.dpToPx(app, 16);
+		textView.setPadding(innerPadding, 0, innerPadding, 0);
 		if (item.equals(selectedItem) && item.isEnabled()) {
 			AndroidUtils.setBackground(holder.button, app.getUIUtilities().getPaintedIcon(
 					R.drawable.bg_select_icon_group_button, ContextCompat.getColor(app, activeColorResId)));

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

@@ -77,6 +77,10 @@ public class TrackDetailsMenu {
 	private boolean hidding;
 	private Location myLocation;
 
+	public boolean shouldShowXAxisPoints () {
+		return true;
+	}
+
 	@Nullable
 	public MapActivity getMapActivity() {
 		return mapActivity;
@@ -518,7 +522,9 @@ public class TrackDetailsMenu {
 		} else {
 			gpxItem.chartHighlightPos = -1;
 		}
+		if (shouldShowXAxisPoints()) {
 			trackChartPoints.setXAxisPoints(getXAxisPoints(chart));
+		}
 		if (gpxItem.route) {
 			mapActivity.getMapLayers().getMapInfoLayer().setTrackChartPoints(trackChartPoints);
 		} else {

OsmAnd/src/net/osmand/plus/mapillary/MapillaryFiltersFragment.java

@@ -123,7 +123,7 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
         final DelayAutoCompleteTextView textView = (DelayAutoCompleteTextView) view.findViewById(R.id.auto_complete_text_view);
         textView.setAdapter(new MapillaryAutoCompleteAdapter(getContext(), R.layout.auto_complete_suggestion, getMyApplication()));
         String selectedUsername = settings.MAPILLARY_FILTER_USERNAME.get();
-        if (!selectedUsername.equals("") && settings.USE_MAPILLARY_FILTER.get()) {
+        if (!selectedUsername.isEmpty() && settings.USE_MAPILLARY_FILTER.get()) {
             textView.setText(selectedUsername);
             textView.setSelection(selectedUsername.length());
         }
@@ -261,16 +261,16 @@ public class MapillaryFiltersFragment extends BaseOsmAndFragment {
                 String dateFrom = dateFromEt.getText().toString();
                 String dateTo = dateToEt.getText().toString();
 
-                if (!settings.MAPILLARY_FILTER_USERNAME.get().equals("") || !dateFrom.equals("") || !dateTo.equals("") || settings.MAPILLARY_FILTER_PANO.get()) {
+                if (!settings.MAPILLARY_FILTER_USERNAME.get().isEmpty() || !dateFrom.isEmpty() || !dateTo.isEmpty() || settings.MAPILLARY_FILTER_PANO.get()) {
                     settings.USE_MAPILLARY_FILTER.set(true);
                 }
-                if (dateFrom.equals("")) {
+                if (dateFrom.isEmpty()) {
                     settings.MAPILLARY_FILTER_FROM_DATE.set(0L);
                 }
-                if (dateTo.equals("")) {
+                if (dateTo.isEmpty()) {
                     settings.MAPILLARY_FILTER_TO_DATE.set(0L);
                 }
-                if (!username.equals("") && settings.MAPILLARY_FILTER_USERNAME.get().equals("")) {
+                if (!username.isEmpty() && settings.MAPILLARY_FILTER_USERNAME.get().isEmpty()) {
                     view.findViewById(R.id.warning_linear_layout).setVisibility(View.VISIBLE);
                 } else {
                     mapActivity.getDashboard().hideDashboard();

OsmAnd/src/net/osmand/plus/mapillary/MapillaryVectorLayer.java

@@ -205,7 +205,7 @@ class MapillaryVectorLayer extends MapTileLayer implements MapillaryLayer, ICont
 		long to = settings.MAPILLARY_FILTER_TO_DATE.get();
 		boolean pano = settings.MAPILLARY_FILTER_PANO.get();
 
-		if (!userKey.equals("")) {
+		if (!userKey.isEmpty()) {
 			String key = (String) userData.get("userkey");
 			if (!userKey.equals(key)) {
 				return true;

OsmAnd/src/net/osmand/plus/mapmarkers/DirectionIndicationDialogFragment.java

@@ -277,7 +277,7 @@ public class DirectionIndicationDialogFragment extends BaseOsmAndDialogFragment
 				}
 			}
 			((ImageView) mainView.findViewById(R.id.action_bar_image))
-					.setImageDrawable(new LayerDrawable(imgList.toArray(new Drawable[imgList.size()])));
+					.setImageDrawable(new LayerDrawable(imgList.toArray(new Drawable[0])));
 		} else {
 			mainView.findViewById(R.id.action_bar_image_container).setVisibility(View.GONE);
 		}

OsmAnd/src/net/osmand/plus/mapmarkers/SelectWptCategoriesBottomSheetDialogFragment.java

@@ -81,7 +81,8 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 
 		Map<String, List<WptPt>> pointsByCategories = gpxFile.getPointsByCategories();
 
-		for (String category : pointsByCategories.keySet()) {
+		for (Map.Entry<String, List<WptPt>> entry : pointsByCategories.entrySet()) {
+			String category = entry.getKey();
 			final BottomSheetItemWithCompoundButton[] categoryItem = new BottomSheetItemWithCompoundButton[1];
 			categoryItem[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder()
 					.setChecked(!isUpdateMode || (categories != null && categories.contains(category)))
@@ -96,9 +97,9 @@ public class SelectWptCategoriesBottomSheetDialogFragment extends MenuBottomShee
 						}
 					})
 					.setCompoundButtonColorId(activeColorResId)
-					.setDescription(String.valueOf(pointsByCategories.get(category).size()))
+					.setDescription(String.valueOf(entry.getValue().size()))
 					.setIcon(getContentIcon(R.drawable.ic_action_folder))
-					.setTitle(category.equals("") ? getString(R.string.shared_string_waypoints) : category)
+					.setTitle(category.isEmpty() ? getString(R.string.shared_string_waypoints) : category)
 					.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_checkbox_56dp)
 					.setTag(category)
 					.setOnClickListener(new View.OnClickListener() {

OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java

@@ -131,7 +131,7 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
 
 		String descr;
 		if ((descr = marker.groupName) != null) {
-			if (descr.equals("")) {
+			if (descr.isEmpty()) {
 				descr = mapActivity.getString(R.string.shared_string_favorites);
 			}
 		} else {

OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersGroupsAdapter.java

@@ -403,7 +403,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 				final GroupHeader groupHeader = (GroupHeader) header;
 				final MapMarkersGroup group = groupHeader.getGroup();
 				String groupName = group.getName();
-				if (groupName.equals("")) {
+				if (groupName.isEmpty()) {
 					groupName = app.getString(R.string.shared_string_favorites);
 				} else if (group.getType() == MapMarkersGroup.GPX_TYPE) {
 					groupName = groupName.replace(IndexConstants.GPX_FILE_EXT, "").replace("/", " ").replace("_", " ");
@@ -579,7 +579,7 @@ public class MapMarkersGroupsAdapter extends RecyclerView.Adapter<RecyclerView.V
 			Iterator<String> it = categories.iterator();
 			while (it.hasNext()) {
 				String category = it.next();
-				if (category.equals("")) {
+				if (category.isEmpty()) {
 					category = app.getResources().getString(R.string.shared_string_waypoints);
 				}
 				sb.append(category);

OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersHistoryAdapter.java

@@ -145,7 +145,7 @@ public class MapMarkersHistoryAdapter extends RecyclerView.Adapter<RecyclerView.
 			String desc = app.getString(R.string.passed, OsmAndFormatter.getFormattedDate(app, marker.visitedDate));
 			String markerGroupName = marker.groupName;
 			if (markerGroupName != null) {
-				if (markerGroupName.equals("")) {
+				if (markerGroupName.isEmpty()) {
 					markerGroupName = app.getString(R.string.shared_string_favorites);
 				}
 				desc += " • " + markerGroupName;

OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java

@@ -197,7 +197,7 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
 
 			String descr;
 			if ((descr = marker.groupName) != null) {
-				if (descr.equals("")) {
+				if (descr.isEmpty()) {
 					descr = mapActivity.getString(R.string.shared_string_favorites);
 				}
 			} else {

OsmAnd/src/net/osmand/plus/mapmarkers/adapters/TracksGroupsAdapter.java

@@ -57,7 +57,7 @@ public class TracksGroupsAdapter extends GroupsAdapter {
 			Iterator<String> it = categories.iterator();
 			while (it.hasNext()) {
 				String category = it.next();
-				if (!category.equals("")) {
+				if (!category.isEmpty()) {
 					sb.append(category);
 					if (it.hasNext()) {
 						sb.append(", ");

OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java

@@ -127,7 +127,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private Snackbar snackbar;
 	private String fileName;
 
-	private AdditionalInfoType currentAdditionalInfoType;
+	private @Nullable
+	AdditionalInfoType currentAdditionalInfoType;
 
 	private boolean wasCollapseButtonVisible;
 	private boolean progressBarVisible;
@@ -175,6 +176,11 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		protected int getFragmentHeight() {
 			return mainView.getHeight();
 		}
+
+		@Override
+		public boolean shouldShowXAxisPoints() {
+			return false;
+		}
 	}
 
 	private void setEditingCtx(MeasurementEditingContext editingCtx) {
@@ -264,6 +270,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
 
 		pointsSt = getString(R.string.shared_string_gpx_points).toLowerCase();
+		int widthInPixels = getResources().getDimensionPixelOffset(R.dimen.gpx_group_button_width);
 
 		View view = UiUtilities.getInflater(getContext(), nightMode)
 				.inflate(R.layout.fragment_measurement_tool, container, false);
@@ -283,6 +290,15 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				@Override
 				public void onClick(View v) {
 					changeAdditionalInfoType(AdditionalInfoType.POINTS);
+					int pointsCount = editingCtx.getPointsCount();
+					if (pointsCount == 0) {
+						disable(upDownBtn);
+						collapseAdditionalInfoView();
+					} else {
+						expandAdditionalInfoView();
+						additionalInfoExpanded = true;
+					}
+					updateUpDownBtn();
 				}
 			});
 
@@ -293,6 +309,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				@Override
 				public void onClick(View v) {
 					changeAdditionalInfoType(AdditionalInfoType.GRAPH);
+					expandAdditionalInfoView();
+					updateUpDownBtn();
 				}
 			});
 		}
@@ -340,6 +358,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		View applyMovePointButton = mainView.findViewById(R.id.apply_move_point_button);
 		UiUtilities.setupDialogButton(nightMode, applyMovePointButton, UiUtilities.DialogButtonType.PRIMARY,
 				R.string.shared_string_apply);
+		applyMovePointButton.setMinimumWidth(widthInPixels);
 		applyMovePointButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -351,6 +370,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		View applyPointBeforeAfterButton = mainView.findViewById(R.id.apply_point_before_after_point_button);
 		UiUtilities.setupDialogButton(nightMode, applyPointBeforeAfterButton, UiUtilities.DialogButtonType.PRIMARY,
 				R.string.shared_string_apply);
+		applyPointBeforeAfterButton.setMinimumWidth(widthInPixels);
 		applyPointBeforeAfterButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -361,6 +381,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		View addPointBeforeAfterButton = mainView.findViewById(R.id.add_point_before_after_button);
 		UiUtilities.setupDialogButton(nightMode, addPointBeforeAfterButton, UiUtilities.DialogButtonType.PRIMARY,
 				R.string.shared_string_add);
+		addPointBeforeAfterButton.setMinimumWidth(widthInPixels);
 		addPointBeforeAfterButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
@@ -416,7 +437,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				addCenterPoint();
 			}
 		});
-
+		addPointButton.setMinimumWidth(widthInPixels);
 		measurementLayer.setOnSingleTapListener(new MeasurementToolLayer.OnSingleTapListener() {
 			@Override
 			public void onAddPoint() {
@@ -425,9 +446,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			@Override
 			public void onSelectPoint(int selectedPointPos) {
-				if (additionalInfoExpanded) {
-					collapseAdditionalInfoView();
-				}
 				if (selectedPointPos != -1) {
 					openSelectedPointMenu(mapActivity);
 				}
@@ -529,25 +547,36 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return view;
 	}
 
-	private void changeAdditionalInfoType(@NonNull AdditionalInfoType type) {
+	private void changeAdditionalInfoType(@Nullable AdditionalInfoType type) {
 		if (!additionalInfoExpanded || !isCurrentAdditionalInfoType(type)) {
 			MapActivity ma = getMapActivity();
 			if (ma == null) return;
 
 			OsmandApplication app = ma.getMyApplication();
+			View buttonsDivider = customRadioButton.findViewById(R.id.buttons_divider);
 			if (AdditionalInfoType.POINTS == type) {
 				visibleCard = pointsCard;
+				additionalInfoExpanded = true;
+				buttonsDivider.setVisibility(View.GONE);
 				UiUtilities.updateCustomRadioButtons(app, customRadioButton, nightMode, START);
 			} else if (AdditionalInfoType.GRAPH == type) {
 				visibleCard = graphsCard;
+				additionalInfoExpanded = true;
+				buttonsDivider.setVisibility(View.GONE);
 				UiUtilities.updateCustomRadioButtons(app, customRadioButton, nightMode, END);
+			} else if (null == type) {
+				visibleCard = null;
+				additionalInfoExpanded = false;
+				buttonsDivider.setVisibility(View.VISIBLE);
+				UiUtilities.updateCustomRadioButtons(app, customRadioButton, nightMode, null);
 			}
 			cardsContainer.removeAllViews();
+			if (visibleCard != null) {
 				View cardView = visibleCard.getView() != null ? visibleCard.getView() : visibleCard.build(ma);
 				cardsContainer.addView(cardView);
+			}
 
 			currentAdditionalInfoType = type;
-			additionalInfoExpanded = true;
 			updateUpDownBtn();
 		}
 	}
@@ -1465,9 +1494,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private void collapseAdditionalInfoView() {
 		if (portrait) {
 			additionalInfoExpanded = false;
-			updateUpDownBtn();
 			additionalInfoContainer.setVisibility(View.GONE);
 			setDefaultMapPosition();
+			changeAdditionalInfoType(null);
+			updateUpDownBtn();
 		}
 	}
 

OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java

@@ -14,26 +14,31 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
+import net.osmand.GPXUtilities.WptPt;
 import net.osmand.PlatformUtil;
+import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BottomSheetBehaviourDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
 import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.util.MapUtils;
 
 import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.osmand.plus.UiUtilities.CustomRadioButtonType.START;
 import static net.osmand.plus.UiUtilities.CustomRadioButtonType.END;
+import static net.osmand.plus.UiUtilities.CustomRadioButtonType.START;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.DEFAULT_APP_MODE;
 import static net.osmand.plus.measurementtool.SelectFileBottomSheet.BOTTOM_SHEET_HEIGHT_DP;
 
 public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetBehaviourDialogFragment {
 
+
 	private static final Log LOG = PlatformUtil.getLog(RouteBetweenPointsBottomSheetDialogFragment.class);
 	public static final String TAG = RouteBetweenPointsBottomSheetDialogFragment.class.getSimpleName();
 	public static final int STRAIGHT_LINE_TAG = -1;
@@ -60,101 +65,6 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetBeha
 		ALL,
 	}
 
-	private String getButtonText(RouteBetweenPointsDialogMode dialogMode) {
-		switch (dialogType) {
-			case WHOLE_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.next_segment);
-					case ALL:
-						return getString(R.string.whole_track);
-				}
-				break;
-			case NEXT_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.next_segment);
-					case ALL:
-						return getString(R.string.all_next_segments);
-				}
-				break;
-			case PREV_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.previous_segment);
-					case ALL:
-						return getString(R.string.all_previous_segments);
-				}
-				break;
-		}
-		return "";
-	}
-
-	private String getButtonDescr(RouteBetweenPointsDialogMode dialogMode) {
-		switch (dialogType) {
-			case WHOLE_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.route_between_points_next_segment_button_desc);
-					case ALL:
-						return getString(R.string.route_between_points_whole_track_button_desc);
-				}
-				break;
-			case NEXT_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.only_selected_segment_recalc);
-					case ALL:
-						return getString(R.string.all_next_segments_will_be_recalc);
-				}
-				break;
-			case PREV_ROUTE_CALCULATION:
-				switch (dialogMode) {
-					case SINGLE:
-						return getString(R.string.only_selected_segment_recalc);
-					case ALL:
-						return getString(R.string.all_previous_segments_will_be_recalc);
-				}
-				break;
-		}
-		return "";
-	}
-
-	private void addDelimiterView(LinearLayout container) {
-		View row = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.divider, container, false);
-		View divider = row.findViewById(R.id.divider);
-		ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) divider.getLayoutParams();
-		params.topMargin = row.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_title_padding_bottom);
-		params.bottomMargin = row.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_title_padding_bottom);
-		container.addView(row);
-	}
-
-	public void setDefaultDialogMode(RouteBetweenPointsDialogMode defaultDialogMode) {
-		this.defaultDialogMode = defaultDialogMode;
-		updateModeButtons();
-	}
-
-	public void updateModeButtons() {
-		UiUtilities.updateCustomRadioButtons(getMyApplication(), customRadioButton, nightMode,
-				defaultDialogMode == RouteBetweenPointsDialogMode.SINGLE ? START : END);
-		btnDescription.setText(getButtonDescr(defaultDialogMode));
-	}
-
-	private void addProfileView(LinearLayout container, View.OnClickListener onClickListener, Object tag,
-								Drawable icon, CharSequence title, boolean check) {
-		View row = UiUtilities.getInflater(getContext(), nightMode)
-				.inflate(R.layout.bottom_sheet_item_with_radio_btn, container, false);
-		((RadioButton) row.findViewById(R.id.compound_button)).setChecked(check);
-		ImageView imageView = row.findViewById(R.id.icon);
-		imageView.setImageDrawable(icon);
-		ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) imageView.getLayoutParams();
-		params.rightMargin = container.getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin_large);
-		((TextView) row.findViewById(R.id.title)).setText(title);
-		row.setOnClickListener(onClickListener);
-		row.setTag(tag);
-		container.addView(row);
-	}
-
 	@Override
 	public void createMenuItems(Bundle savedInstanceState) {
 		Bundle args = getArguments();
@@ -173,6 +83,7 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetBeha
 				.inflate(R.layout.fragment_route_between_points_bottom_sheet_dialog,
 						null, false);
 		customRadioButton = mainView.findViewById(R.id.custom_radio_buttons);
+		customRadioButton.setMinimumHeight(getResources().getDimensionPixelSize(R.dimen.route_info_control_buttons_height));
 		TextView singleModeButton = mainView.findViewById(R.id.left_button);
 		singleModeButton.setText(getButtonText(RouteBetweenPointsDialogMode.SINGLE));
 		TextView allModeButton = mainView.findViewById(R.id.right_button);
@@ -253,6 +164,137 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetBeha
 		super.onDestroyView();
 	}
 
+	private void addDelimiterView(LinearLayout container) {
+		View row = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.divider, container, false);
+		View divider = row.findViewById(R.id.divider);
+		ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) divider.getLayoutParams();
+		params.topMargin = row.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_title_padding_bottom);
+		params.bottomMargin = row.getResources().getDimensionPixelSize(R.dimen.bottom_sheet_title_padding_bottom);
+		container.addView(row);
+	}
+
+	public void setDefaultDialogMode(RouteBetweenPointsDialogMode defaultDialogMode) {
+		this.defaultDialogMode = defaultDialogMode;
+		updateModeButtons();
+	}
+
+	public void updateModeButtons() {
+		UiUtilities.updateCustomRadioButtons(getMyApplication(), customRadioButton, nightMode,
+				defaultDialogMode == RouteBetweenPointsDialogMode.SINGLE ? START : END);
+		btnDescription.setText(getButtonDescr(defaultDialogMode));
+	}
+
+	private void addProfileView(LinearLayout container, View.OnClickListener onClickListener, Object tag,
+								Drawable icon, CharSequence title, boolean check) {
+		View row = UiUtilities.getInflater(getContext(), nightMode)
+				.inflate(R.layout.bottom_sheet_item_with_radio_btn, container, false);
+		((RadioButton) row.findViewById(R.id.compound_button)).setChecked(check);
+		ImageView imageView = row.findViewById(R.id.icon);
+		imageView.setImageDrawable(icon);
+		ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) imageView.getLayoutParams();
+		params.rightMargin = container.getContext().getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin_large);
+		((TextView) row.findViewById(R.id.title)).setText(title);
+		row.setOnClickListener(onClickListener);
+		row.setTag(tag);
+		container.addView(row);
+	}
+
+	private String getButtonText(RouteBetweenPointsDialogMode dialogMode) {
+		switch (dialogType) {
+			case WHOLE_ROUTE_CALCULATION:
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.next_segment);
+					case ALL:
+						return getString(R.string.whole_track);
+				}
+				break;
+			case NEXT_ROUTE_CALCULATION:
+				String nextDescr = getDescription(false, dialogMode);
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.ltr_or_rtl_combine_via_space, getString(R.string.next_segment), nextDescr);
+					case ALL:
+						return getString(R.string.ltr_or_rtl_combine_via_space, getString(R.string.all_next_segments), nextDescr);
+				}
+				break;
+			case PREV_ROUTE_CALCULATION:
+				String prevDescr = getDescription(true, dialogMode);
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.ltr_or_rtl_combine_via_space, getString(R.string.previous_segment), prevDescr);
+					case ALL:
+						return getString(R.string.ltr_or_rtl_combine_via_space, getString(R.string.all_previous_segments), prevDescr);
+				}
+				break;
+		}
+		return "";
+	}
+
+	private String getButtonDescr(RouteBetweenPointsDialogMode dialogMode) {
+		switch (dialogType) {
+			case WHOLE_ROUTE_CALCULATION:
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.route_between_points_next_segment_button_desc);
+					case ALL:
+						return getString(R.string.route_between_points_whole_track_button_desc);
+				}
+				break;
+			case NEXT_ROUTE_CALCULATION:
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.only_selected_segment_recalc);
+					case ALL:
+						return getString(R.string.all_next_segments_will_be_recalc);
+				}
+				break;
+			case PREV_ROUTE_CALCULATION:
+				switch (dialogMode) {
+					case SINGLE:
+						return getString(R.string.only_selected_segment_recalc);
+					case ALL:
+						return getString(R.string.all_previous_segments_will_be_recalc);
+				}
+				break;
+		}
+		return "";
+	}
+
+	@NonNull
+	private String getDescription(boolean before, RouteBetweenPointsDialogMode dialogMode) {
+		MapActivity mapActivity = (MapActivity) getActivity();
+		if (mapActivity == null) {
+			return "";
+		}
+		MeasurementEditingContext editingCtx = mapActivity.getMapLayers().getMeasurementToolLayer().getEditingCtx();
+		int pos = editingCtx.getSelectedPointPosition();
+		List<WptPt> points = editingCtx.getPoints();
+
+		float dist = 0;
+		if (dialogMode == RouteBetweenPointsDialogMode.SINGLE) {
+			WptPt selectedPoint = points.get(pos);
+			WptPt second = points.get(before ? pos - 1 : pos + 1);
+			dist += MapUtils.getDistance(selectedPoint.lat, selectedPoint.lon, second.lat, second.lon);
+		} else {
+			int startIdx;
+			int endIdx;
+			if (before) {
+				startIdx = 1;
+				endIdx = pos;
+			} else {
+				startIdx = pos + 1;
+				endIdx = points.size() - 1;
+			}
+			for (int i = startIdx; i <= endIdx; i++) {
+				WptPt first = points.get(i - 1);
+				WptPt second = points.get(i);
+				dist += MapUtils.getDistance(first.lat, first.lon, second.lat, second.lon);
+			}
+		}
+		return OsmAndFormatter.getFormattedDistance(dist, mapActivity.getMyApplication());
+	}
+
 	public static void showInstance(FragmentManager fm, Fragment targetFragment,
 									RouteBetweenPointsDialogType dialogType,
 									RouteBetweenPointsDialogMode defaultDialogMode,

OsmAnd/src/net/osmand/plus/measurementtool/SelectedPointBottomSheetDialogFragment.java

@@ -159,7 +159,6 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo
 		items.add(new OptionsDividerItem(getContext()));
 
 		BaseBottomSheetItem changeRouteTypeBefore = new BottomSheetItemWithDescription.Builder()
-				.setDescription(getDescription(true))
 				.setIcon(getRouteTypeIcon(true))
 				.setTitle(getString(R.string.plan_route_change_route_type_before))
 				.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)
@@ -178,7 +177,6 @@ public class SelectedPointBottomSheetDialogFragment extends MenuBottomSheetDialo
 		items.add(changeRouteTypeBefore);
 
 		BaseBottomSheetItem changeRouteTypeAfter = new BottomSheetItemWithDescription.Builder()
-				.setDescription(getDescription(false))
 				.setIcon(getRouteTypeIcon(false))
 				.setTitle(getString(R.string.plan_route_change_route_type_after))
 				.setLayoutId(R.layout.bottom_sheet_item_with_descr_pad_32dp)