Merge pull request #10247 from osmandapp/master

update test branch

.github/ISSUE_TEMPLATE/5-feature-request.md

@@ -12,7 +12,7 @@ Existing issues often contain information about workarounds, resolution, or prog
 
 GitHub is our main development tool for our developers. There are hundreds of requests a month and there are relatively few developers.
 So by opening an issue, please know that your issue will be sent out to all developers and acknowledge that it could be closed without explanation or with just a brief message.
-Comments on the closed issues are also sent to all developers, so you will definitely will be heard.
+Comments on the closed issues are also sent to all developers, so you definitely will be heard.
 However, there is no guarantee that a developer will pick up the issue to work on it.
 
 Please be sure to read our [FAQ](https://osmand.net/help-online) before creating an issue here.

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

@@ -11,8 +11,6 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 import net.osmand.Collator;
 import net.osmand.CollatorStringMatcher;
@@ -576,13 +574,12 @@ public class BinaryMapPoiReaderAdapter {
 							}
 						}
 						if (!matches) {
-							Map<String, String> lt = am.getAdditionalInfo();
+							for (String key : am.getAdditionalInfoKeys()) {
-							for (Entry<String, String> e : lt.entrySet()) {
+								if(!key.contains("_name") && 
-								if(!e.getKey().contains("_name") && 
+									!key.equals("brand")) {
-									!e.getKey().equals("brand")) {
 									continue;
 								}
-								matches = matcher.matches(e.getValue());
+								matches = matcher.matches(am.getAdditionalInfo(key));
 								if (matches) {
 									break;
 								}
@@ -812,7 +809,6 @@ public class BinaryMapPoiReaderAdapter {
 	}
 
 	private boolean checkCategories(SearchRequest<Amenity> req, PoiRegion region) throws IOException {
-		StringBuilder subType = new StringBuilder();
 		while (true) {
 			int t = codedIS.readTag();
 			int tag = WireFormat.getTagFieldNumber(t);

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

@@ -1,17 +1,7 @@
 package net.osmand.data;
 
-import net.osmand.Location;
-import net.osmand.osm.MapPoiTypes;
-import net.osmand.osm.PoiCategory;
-import net.osmand.util.Algorithms;
-
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -21,9 +11,14 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.zip.GZIPInputStream;
+
+import org.json.JSONObject;
 
 import gnu.trove.list.array.TIntArrayList;
+import net.osmand.Location;
+import net.osmand.osm.MapPoiTypes;
+import net.osmand.osm.PoiCategory;
+import net.osmand.util.Algorithms;
 
 
 public class Amenity extends MapObject {
@@ -96,12 +91,46 @@ public class Amenity extends MapObject {
 	}
 
 
-	public Map<String, String> getAdditionalInfo() {
+	// this method should be used carefully
+	public Map<String, String> getInternalAdditionalInfoMap() {
 		if (additionalInfo == null) {
 			return Collections.emptyMap();
 		}
 		return additionalInfo;
 	}
+	
+	public Collection<String> getAdditionalInfoValues(boolean excludeZipped) {
+		if (additionalInfo == null) {
+			return Collections.emptyList();
+		}
+		boolean zipped = false;
+		for(String v : additionalInfo.values()) {
+			if(isContentZipped(v)) {
+				zipped = true;
+				break;
+			}
+		}
+		if(zipped) {
+			List<String> r = new ArrayList<>(additionalInfo.size());
+			for(String str : additionalInfo.values()) {
+				if(excludeZipped && isContentZipped(str)) {
+					
+				} else {
+					r.add(unzipContent(str));
+				}
+			}
+			return r;
+		} else {
+			return additionalInfo.values();
+		}
+	}
+	
+	public Collection<String> getAdditionalInfoKeys() {
+		if (additionalInfo == null) {
+			return Collections.emptyList();
+		}
+		return additionalInfo.keySet();
+	}
 
 	public void setAdditionalInfo(Map<String, String> additionalInfo) {
 		this.additionalInfo = null;
@@ -182,7 +211,7 @@ public class Amenity extends MapObject {
 		}
 		int maxLen = 0;
 		String lng = defLang;
-		for (String nm : getAdditionalInfo().keySet()) {
+		for (String nm : getAdditionalInfoKeys()) {
 			if (nm.startsWith(tag + ":")) {
 				String key = nm.substring(tag.length() + 1);
 				String cnt = getAdditionalInfo(tag + ":" + key);
@@ -204,7 +233,7 @@ public class Amenity extends MapObject {
 
 	public List<String> getNames(String tag, String defTag) {
 		List<String> l = new ArrayList<String>();
-		for (String nm : getAdditionalInfo().keySet()) {
+		for (String nm : getAdditionalInfoKeys()) {
 			if (nm.startsWith(tag + ":")) {
 				l.add(nm.substring(tag.length() + 1));
 			} else if (nm.equals(tag)) {
@@ -229,7 +258,7 @@ public class Amenity extends MapObject {
 		if (!Algorithms.isEmpty(enName)) {
 			return enName;
 		}
-		for (String nm : getAdditionalInfo().keySet()) {
+		for (String nm : getAdditionalInfoKeys()) {
 			if (nm.startsWith(tag + ":")) {
 				return getAdditionalInfo(nm);
 			}
@@ -345,4 +374,6 @@ public class Amenity extends MapObject {
 		}
 		return a;
 	}
+
+	
 }

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

@@ -13,7 +13,6 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -351,8 +350,8 @@ public abstract class MapObject implements Comparable<MapObject> {
 		return json;
 	}
 	
-	public String unzipContent(String str) {
+	String unzipContent(String str) {
-		if (str != null && str.startsWith(" gz ")) {
+		if (isContentZipped(str)) {
 			try {
 				int ind = 4;
 				byte[] bytes = new byte[str.length() - ind];
@@ -369,6 +368,10 @@ public abstract class MapObject implements Comparable<MapObject> {
 				}
 				br.close();
 				str = bld.toString();
+				// ugly fix of temporary problem of map generation
+				if(isContentZipped(str)) {
+					str = unzipContent(str);
+				}
 			} catch (IOException e) {
 				e.printStackTrace();
 			}
@@ -376,6 +379,10 @@ public abstract class MapObject implements Comparable<MapObject> {
 		return str;
 	}
 
+	boolean isContentZipped(String str) {
+		return str != null && str.startsWith(" gz ");
+	}
+
 	protected static void parseJSON(JSONObject json, MapObject o) {
 		if (json.has("name")) {
 			o.name = json.getString("name");

OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java

@@ -741,7 +741,7 @@ public class SearchUICore {
 					}
 				}
 				if (Algorithms.isEmpty(object.alternateName) && object.object instanceof Amenity) {
-					for (String value : ((Amenity) object.object).getAdditionalInfo().values()) {
+					for (String value : ((Amenity) object.object).getAdditionalInfoValues(true)) {
 						if (phrase.getFirstUnknownNameStringMatcher().matches(value)) {
 							object.alternateName = value;
 							break;

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

@@ -602,7 +602,7 @@ public class SearchCoreFactory {
 							sr.localeName = object.getName(phrase.getSettings().getLang(),
 									phrase.getSettings().isTransliterate());
 							if (!nm.matches(sr.localeName) && !nm.matches(sr.otherNames)
-									&& !nm.matches(object.getAdditionalInfo().values())) {
+									&& !nm.matches(object.getAdditionalInfoValues(false))) {
 								return false;
 							}
 							sr.object = object;
@@ -1059,7 +1059,7 @@ public class SearchCoreFactory {
 					if (!poiAdditionals.isEmpty()) {
 						boolean found = false;
 						for (String add : poiAdditionals) {
-							if(object.getAdditionalInfo().containsKey(add)) {
+							if (object.getAdditionalInfoKeys().contains(add)) {
 								found = true;
 								break;
 							}

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

@@ -250,7 +250,7 @@
     <string name="set_time_timeline_descr">Elige la hora de visualización</string>
     <string name="start_end_date">Fecha de Inicio — Fin</string>
     <string name="saved_messages">Mensajes guardados</string>
-    <string name="time_zone_descr">Seleccione la zona horaria que desea mostrar en los mensajes de ubicación.</string>
+    <string name="time_zone_descr">Seleccione la zona horaria a mostrar en sus mensajes de ubicación.</string>
     <string name="time_zone">Zona horaria</string>
     <string name="units_and_formats">Unidades y formatos</string>
     <string name="unit_of_length_descr">Cambia las unidades de longitud.</string>

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

@@ -43,8 +43,8 @@
     <string name="si_km_m">Kílómetrar/metrar</string>
     <string name="last_update_from_telegram_duration">Síðasta uppfærsla frá Telegram: Fyrir %1$s síðan</string>
     <string name="monitoring_is_disabled">Vöktun er óvirk</string>
-    <string name="status_widget_title">Staða OsmAnd-rekjara</string>
+    <string name="status_widget_title">Staða OsmAnd-rakningar</string>
-    <string name="app_name_short">OsmAnd-rekjari</string>
+    <string name="app_name_short">OsmAnd-rakning</string>
     <string name="shared_string_group">Hópur</string>
     <string name="min_mile">mín/ml</string>
     <string name="proxy_server">Netþjónn</string>
@@ -211,12 +211,12 @@
     <string name="not_found_yet">Ekki fundist ennþá</string>
     <string name="received_gps_points">Móttók GPX-punkta: %1$s</string>
     <string name="sharing_location">Deili staðsetningu</string>
-    <string name="logout_help_desc">Hvernig á að slökkva á OsmAnd-rekjaranum úr Telegram</string>
+    <string name="logout_help_desc">Hvernig á að slökkva á OsmAnd-rakningu úr Telegram</string>
     <string name="not_sent_yet">Ekki sent ennþá</string>
     <string name="app_name">OsmAnd nettengdur GPS-rekjari</string>
-    <string name="logout_from_osmand_telegram">Skrá út úr OsmAnd-rekjara\?</string>
+    <string name="logout_from_osmand_telegram">Skrá út úr OsmAnd-rakningu\?</string>
     <string name="stop_sharing_all">Kveikt er á deilingu (slökkva)</string>
-    <string name="disconnect_from_telegram">Hvernig á að slökkva á OsmAnd-rekjaranum úr Telegram</string>
+    <string name="disconnect_from_telegram">Hvernig á að slökkva á OsmAnd-rakningu úr Telegram</string>
     <string name="gps_not_available">Virkjaðu \"Staðsetning\" í stillingunum stýrikerfisins</string>
     <string name="live_now_description">Tengiliðir og hópar sem deila staðsetningu til þín.</string>
     <string name="logout_no_internet_msg">Tengstu við internetið til að geta skráð þig til fulls út úr Telegram.</string>
@@ -234,10 +234,10 @@
     <string name="choose_osmand">Veldu hvaða útgáfu OsmAnd þú vilt nota</string>
     <string name="disable_all_sharing">Gera alla deilingu óvirka</string>
     <string name="please_update_osmand">Uppfærðu OsmAnd til að skoða gögn á kortinu</string>
-    <string name="time_zone_descr">Veldu tímabelti til birtingar í staðsetningarskilaboðum þínum</string>
+    <string name="time_zone_descr">Veldu tímabelti til birtingar í staðsetningarskilaboðum þínum.</string>
     <string name="location_service_no_gps_available">Veldu eina af staðsetningarþjónustunum til að deila staðsetningu þinni.</string>
     <string name="set_visible_time_for_all">Stilla tímabil þar sem allir eru sýnilegir</string>
-    <string name="osmand_connect_desc">Veldu þá útgáfu OsmAnd sem OsmAnd-rekjarinn notar til að birta staðsetningar.</string>
+    <string name="osmand_connect_desc">Veldu þá útgáfu OsmAnd sem OsmAnd-rakningin notar til að birta staðsetningar.</string>
     <string name="get_telegram_description_continue">Endilega settu upp Telegram og skráðu notandaaðgang.</string>
     <string name="shared_string_authorization_descr">Settu inn Telegram-símanúmerið þitt á alþjóðlegu sniði</string>
     <string name="timeline_description">Virkja vöktun til að vista allar staðsetningar í aðgerðaferli.</string>
@@ -260,4 +260,15 @@
     <string name="last_updated_location">Síðasta uppfærða staðsetning:</string>
     <string name="enter_another_device_name">Veldu nafn sem þú hefur ekki þegar notað</string>
     <string name="not_possible_to_send_to_telegram_chats">Ekki mögulegt að senda á Telegram-spjöll:</string>
+    <string name="disconnect_from_telegram_desc">Til að afturkalla heimildir til deilingar á staðsetningu, opnaðu Telegram, farðu í Stillingar → Gagnaleynd og öryggi → Setur, og bittu enda á setu OsmAnd-rakningar.</string>
+    <string name="share_location_as_description_second_line">Þú getur útbúið og skoðað auðkenningu tækis (device ID) í Telegram-biðlaraforritinu með því að nota %1$s spjallvélmennið. %2$s</string>
+    <string name="logout_from_osmand_telegram_descr">Ertu viss að þú viljir skrá þig út úr OsmAnd-rakningu þannig að þú getir ekki lengur deilt þinni staðsetningu eða séð staðsetningu annarra\?</string>
+    <string name="battery_optimization_description">Slokktu á bestun rafhlöðunýtingar fyrir OsmAnd-rakningu svo ekki slökkni á henni þegar forritið fer í bakgrunnsham (t.d. slökkt er á skjá).</string>
+    <string name="privacy_policy_telegram_client">OsmAnd-rakning er eitt af biðlaraforritunum sem nota opna Telegram-kerfið. Tengiliðirnir þínir geta notað eitthvað annað Telegram-biðlaraforrit.</string>
+    <string name="welcome_descr"><b>OsmAnd-rakning</b> gerir þér kleift að deila staðsetningu þinni og að sjá aðra í OsmAnd.<br/><br/>Forritið notar Telegram API-forritsviðmótið, þannig að þú verður að vera með Telegram-aðgang.</string>
+    <string name="share_location_as_description">Ef þú ætlar að tengja mörg tæki við einn Telegram-notandaaðgang, þarftu að nota annað tæki til að deila staðsetningunni þinni.</string>
+    <string name="shared_string_live">Rauntíma</string>
+    <string name="background_work_description">Breyta bestunarstillingum rafhlöðu til að auka stöðugleika í deilingu staðsetningar.</string>
+    <string name="set_time_description">Veldu tímann sem valdir tengiliðir og hópar munu sjá staðsetningu þína í rauntíma.</string>
+    <string name="live_now">Rauntíma núna</string>
 </resources>

OsmAnd/build.gradle.lib

@@ -0,0 +1,521 @@
+//apply plugin: 'com.android.application'
+apply plugin: 'com.android.library'
+
+// Global Parameters accepted
+// TARGET_APP_NAME    - app name
+// APK_NUMBER_VERSION - version number of apk
+// APK_VERSION_SUFFIX - build number like #99999Z, appended (for dev builds) to Manifest's versionName as X.X.X#99999Z
+//                      Z means flavor: M=-master, D=-main-default, B=-Blackberry, Des=-design, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
+// APP_EDITION        - date stamp of builds
+// APP_FEATURES       - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
+
+// 1. To be done Filter fonts
+// <unzip src="OsmAndCore_android.aar" dest=".">
+//            <patternset>
+//                <include name="assets/**/map/fonts/OpenSans/*"/>
+//                <include name="assets/**/map/fonts/NotoSans/*"/>
+//            </patternset>
+//        </unzip>
+// Less important
+
+task printc {
+	configurations.each { if(it.isCanBeResolved())  println it.name }
+}
+
+android {
+	compileSdkVersion 29
+	buildToolsVersion "29.0.3"
+	// compileNdkVersion "android-ndk-r17b"
+
+	signingConfigs {
+		development {
+			storeFile file("../keystores/debug.keystore")
+			storePassword "android"
+			keyAlias "androiddebugkey"
+			keyPassword "android"
+		}
+
+		publishing {
+			storeFile file("/var/lib/jenkins/osmand_key")
+			storePassword System.getenv("OSMAND_APK_PASSWORD")
+			keyAlias "osmand"
+			keyPassword System.getenv("OSMAND_APK_PASSWORD")
+		}
+	}
+
+	defaultConfig {
+		minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15
+		targetSdkVersion 29
+		versionCode 390
+		versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
+		multiDexEnabled true
+		versionName "3.9.0"
+		versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName
+		versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName
+		// Stops the Gradle plugin’s automatic rasterization of vectors
+		// vectorDrawables.generatedDensities = ['hdpi']
+		vectorDrawables.useSupportLibrary = true
+	}
+
+	lintOptions {
+		lintConfig file("lint.xml")
+		abortOnError false
+		warningsAsErrors false
+	}
+
+	/*
+	bundle {
+		language {
+			// Specifies that the app bundle should not support
+			// configuration APKs for language resources. These
+			// resources are instead packaged with each base and
+			// dynamic feature APK.
+			enableSplit = false
+		}
+	}
+	*/
+	// related to kuromoji
+	//packagingOptions {
+	//	exclude '/META-INF/CONTRIBUTORS.md'
+	//	exclude '/META-INF/LICENSE.md'
+	//	exclude '/META-INF/NOTICE.md'
+	//}
+
+	// This is from OsmAndCore_android.aar - for some reason it's not inherited
+	aaptOptions {
+		// Don't compress any embedded resources
+		noCompress "qz"
+		cruncherEnabled = false
+		// Flag notifies aapt to keep the attribute IDs around
+		// additionalParameters "--no-version-vectors"
+	}
+
+	dexOptions {
+		javaMaxHeapSize "4g"
+	}
+
+	sourceSets {
+		main {
+			manifest.srcFile "AndroidManifest.xml"
+			jni.srcDirs = []
+			jniLibs.srcDirs = ["libs"]
+			aidl.srcDirs = ["src"]
+			java.srcDirs = ["src", "src-google"]
+			resources.srcDirs = ["src"]
+			renderscript.srcDirs = ["src"]
+			res.srcDirs = ["res"]
+			assets.srcDirs = ["assets"]
+		}
+		debug {
+			manifest.srcFile "AndroidManifest-debug.xml"
+		}
+		/*
+		full {
+			java.srcDirs = ["src-google"]
+		}
+		free {
+			java.srcDirs = ["src-google"]
+			manifest.srcFile "AndroidManifest-free.xml"
+		}
+		freedev {
+			java.srcDirs = ["src-google"]
+			manifest.srcFile "AndroidManifest-freedev.xml"
+		}
+		freehuawei {
+			java.srcDirs = ["src-huawei"]
+			manifest.srcFile "AndroidManifest-freehuawei.xml"
+		}
+		*/
+		legacy {
+			jniLibs.srcDirs = ["libc++"]
+		}
+	}
+
+	flavorDimensions "coreversion", "abi"
+	productFlavors {
+		// ABI
+		armv7 {
+			dimension "abi"
+			ndk {
+				abiFilter 'armeabi-v7a'
+			}
+		}
+		arm64 {
+			dimension "abi"
+			ndk {
+				abiFilter 'arm64-v8a'
+			}
+		}
+		x86 {
+			dimension "abi"
+			ndk {
+				abiFilters 'x86', 'x86_64'
+			}
+		}
+		armonly {
+			dimension "abi"
+			ndk {
+				abiFilters 'arm64-v8a', 'armeabi-v7a'
+			}
+		}
+		fat {
+			dimension "abi"
+			ndk {
+				abiFilters 'arm64-v8a', 'x86', 'x86_64', 'armeabi-v7a'
+			}
+		}
+
+		/*
+		// Version
+		freedev {
+			dimension "version"
+			applicationId "net.osmand.dev"
+			// resConfig "en"
+		}
+		free {
+			dimension "version"
+			applicationId "net.osmand"
+		}
+		full {
+			dimension "version"
+			applicationId "net.osmand.plus"
+		}
+		freehuawei {
+			dimension "version"
+			applicationId "net.osmand.huawei"
+		}
+		*/
+		// CoreVersion
+        // Build that doesn't include 3D OpenGL
+		legacy {
+			dimension "coreversion"
+		}
+        // Build that includes 3D OpenGL release
+		qtcore {
+			dimension "coreversion"
+		}
+        // Build that includes 3D OpenGL debug
+		qtcoredebug {
+			dimension "coreversion"
+		}
+	}
+
+	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
+		}
+		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
+		}
+	}
+
+}
+
+def replaceNoTranslate(line) {
+	if (line.contains("\"app_name\"") && System.getenv("TARGET_APP_NAME")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
+	}
+	if (line.contains("\"app_name_free\"") && System.getenv("TARGET_APP_NAME")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("TARGET_APP_NAME") + "<")
+	}
+	if (line.contains("\"app_edition\"") && System.getenv("APP_EDITION")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_EDITION") + "<")
+	}
+	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
+		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
+	}
+	return line;
+}
+
+task updateNoTranslate(type: Copy) {
+	from('.') {
+		include 'no_translate.xml'
+		filter {
+			line -> replaceNoTranslate(line);
+		}
+	}
+	into 'res/values/'
+}
+
+task validateTranslate {
+	println "Validating translations"
+
+	file("res").eachFileRecurse groovy.io.FileType.FILES, {
+		if (it.name == "strings.xml" || it.name == "phrases.xml") {
+			it.eachLine { line ->
+				if (line.contains("\$ s") || line.contains("\$ d") || line.contains("\$ f") ||
+						line.contains(" \$s") || line.contains(" \$d") || line.contains(" \$f") ||
+						line.contains("1\$ ") || line.contains("2\$ ") || line.contains("3\$ ") ||
+						line.contains("%1s") || line.contains(" 1\$s") ||
+						(line.contains("% \$") || line.contains("% 1") || line.contains("% 2") ||
+                                line.contains("% 3") || line.contains("% s"))) {
+					throw new GradleException("Incorrect translation " + it.getAbsolutePath() + " " + line);
+				}
+			}
+		}
+	}
+}
+
+task downloadWorldMiniBasemap {
+	doLast {
+		ant.get(src: 'http://builder.osmand.net/basemap/World_basemap_mini_2.obf', dest: 'assets/World_basemap_mini.obf', skipexisting: 'true')
+	}
+}
+
+task collectVoiceAssets(type: Sync) {
+	from "../../resources/voice"
+	into "assets/voice"
+	include "**/*.js"
+}
+
+task cleanNoTranslate(type: Delete) {
+     delete('res/values/no_translate.xml')
+}
+
+task collectFonts(type: Copy) {
+	from "../../resources/fonts"
+	from "../../resources/rendering_styles/fonts"
+//	from "../../resources/rendering_styles/fonts/OpenSans"
+	into "assets/fonts"
+	include "*.ttf"
+}
+
+task collectHelpContentsStyle(type: Copy) {
+	from("../../help/website/help/") {
+		include "style.css"
+	}
+	into "assets"
+}
+
+task collectHelpContentsAssets(type: Copy) {
+	from("../../help/website/help") {
+		include "about.html"
+		include "changes.html"
+		include "faq.html"
+		include "technical-articles.html"
+		include "map-legend.html"
+	}
+	from("../../help/website/feature_articles") {
+		include "*.html"
+	}
+	from("../../help/website/blog_articles") {
+		include "osmand-3-8-released.html"
+	}
+	into "assets/feature_articles"
+}
+
+task copyPoiCategories(type: Copy) {
+	from("../../resources/poi") {
+		include "poi_categories.json"
+	}
+	into "assets"
+}
+
+task copyMapShaderIcons(type: Sync) {
+	// from "../../resources/rendering_styles/style-icons/map-shaders-png"
+	// into "res/"
+	from "../../resources/rendering_styles/style-icons/map-shaders-vector"
+	into "res/drawable"
+	include "**/*.png",  "**/*.xml"
+	preserve {
+		include '**/*'
+		exclude  "**/h_*"
+	}
+}
+
+task copyMapPOIIcons(type: Sync) {
+	from "../../resources/rendering_styles/style-icons/map-icons-vector"
+	into "res/drawable/"
+	// from "../../resources/rendering_styles/style-icons/map-icons-png"
+	// into "res/"
+
+	include "**/*.png",  "**/*.xml"
+	preserve {
+		include '**/*'
+		exclude "**/mm_*"
+	}
+}
+
+task copyLargePOIIcons(type: Sync) {
+	from "../../resources/rendering_styles/style-icons/poi-icons-vector"
+	into "res/drawable/"
+	include "**/*.png",  "**/*.xml"
+	preserve {
+		include '**/*'
+		exclude "**/mx_*"
+	}
+}
+
+task copyWidgetIconsXhdpi(type: Sync) {
+	from "res/drawable-xxhdpi/"
+	into "res/drawable-large-xhdpi/"
+	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
+}
+
+task copyWidgetIconsHdpi(type: Sync) {
+	from "res/drawable-xhdpi/"
+	into "res/drawable-large-hdpi/"
+	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
+}
+
+task copyWidgetIcons(type: Sync) {
+	from "res/drawable-hdpi/"
+	into "res/drawable-large/"
+	include "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	preserve {
+		include '*'
+		exclude "**/widget_*.png",  "**/widget_*.xml",  "**/map_*.xml", "**/map_*.png"
+	}
+}
+
+task collectExternalResources {
+	dependsOn collectVoiceAssets,
+			collectFonts,
+			collectHelpContentsAssets,
+			collectHelpContentsStyle,
+			copyMapShaderIcons,
+			copyMapPOIIcons,
+			copyLargePOIIcons,
+			updateNoTranslate,
+			validateTranslate,
+			copyWidgetIcons,
+			copyWidgetIconsHdpi,
+			copyWidgetIconsXhdpi,
+			copyPoiCategories,
+			downloadWorldMiniBasemap
+}
+
+// Legacy core build
+import org.apache.tools.ant.taskdefs.condition.Os
+
+task buildOsmAndCore(type: Exec) {
+	Gradle gradle = getGradle()
+	String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase()
+	String flavour = "";
+	if(!tskReqStr.contains("fat")) {
+		if(tskReqStr.contains("arm64")) {
+			flavour = flavour.length() == 0 ? "ARM64_ONLY" : ""
+		}
+		if(tskReqStr.contains("armv7")) {
+			flavour = flavour.length() == 0 ? "ARMV7_ONLY" : ""
+		}
+		if(tskReqStr.contains("armonly")) {
+			flavour = flavour.length() == 0 ? "ARM_ONLY" : ""
+		}
+		if(tskReqStr.contains("x86")) {
+			flavour = flavour.length() == 0 ? "X86_ONLY" : ""
+		}
+	}
+	
+	description "Build Legacy OsmAndCore"
+
+	if (!Os.isFamily(Os.FAMILY_WINDOWS)) {
+		if(flavour.length()  > 0) {
+			environment "$flavour", "1"
+		}
+		commandLine "bash", file("./old-ndk-build.sh").getAbsolutePath()
+	} else {
+		commandLine "cmd", "/c", "echo", "Not supported"
+	}
+}
+
+task cleanupDuplicatesInCore() {
+	dependsOn buildOsmAndCore
+	// doesn't work for legacy debug builds
+	doLast {
+		file("libc++/armeabi-v7a").mkdirs()
+		file("libs/armeabi-v7a/libc++_shared.so").renameTo(file("libc++/armeabi-v7a/libc++_shared.so"))
+		file("libc++/arm64-v8a").mkdirs()
+		file("libs/arm64-v8a/libc++_shared.so").renameTo(file("libc++/arm64-v8a/libc++_shared.so"))
+		file("libc++/x86").mkdirs()
+		file("libs/x86/libc++_shared.so").renameTo(file("libc++/x86/libc++_shared.so"))
+		file("libc++/x86_64").mkdirs()
+		file("libs/x86_64/libc++_shared.so").renameTo(file("libc++/x86_64/libc++_shared.so"))
+	}
+}
+
+afterEvaluate {
+	android.libraryVariants.all { variant ->
+		variant.javaCompiler.dependsOn(collectExternalResources, buildOsmAndCore, cleanupDuplicatesInCore)
+	}
+	Gradle gradle = getGradle()
+	String tskReqStr = gradle.getStartParameter().getTaskRequests().toString().toLowerCase()
+	if (tskReqStr.contains("huawei")) {
+		apply plugin: 'com.huawei.agconnect'
+	}
+}
+
+task appStart(type: Exec) {
+	// linux 
+	commandLine 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'
+	// windows
+	// commandLine 'cmd', '/c', 'adb', 'shell', 'am', 'start', '-n', 'net.osmand.plus/net.osmand.plus.activities.MapActivity'      
+}
+
+dependencies {
+	implementation project(path: ':OsmAnd-java', configuration: 'android')
+	implementation project(':OsmAnd-api')
+	implementation 'androidx.multidex:multidex:2.0.1'
+	implementation 'androidx.gridlayout:gridlayout:1.0.0'
+	implementation 'androidx.cardview:cardview:1.0.0'
+	implementation 'androidx.appcompat:appcompat:1.2.0'
+	implementation 'com.google.android.material:material:1.2.1'
+	implementation 'androidx.browser:browser:1.0.0'
+	implementation 'androidx.preference:preference:1.1.0'
+	implementation fileTree(include:  ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
+
+	implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
+	implementation 'commons-codec:commons-codec:1.11'
+	implementation 'it.unibo.alice.tuprolog:tuprolog:3.2.1'
+	implementation 'org.apache.commons:commons-compress:1.17'
+	implementation 'com.moparisthebest:junidecode:0.1.1'
+	implementation 'org.immutables:gson:2.5.0'
+	implementation 'com.vividsolutions:jts-core:1.14.0'
+	implementation 'com.google.openlocationcode:openlocationcode:1.0.4'
+	implementation 'com.android.billingclient:billing:2.0.3'
+	// turn off for now
+	//implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
+	implementation 'com.squareup.picasso:picasso:2.71828'
+	implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
+	// JS core
+	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
+// size restrictions
+// implementation 'com.ibm.icu:icu4j:50.1' 
+// implementation 'net.sf.trove4j:trove4j:3.0.3'
+
+	qtcoreImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+	qtcoredebugImplementation fileTree(include:  ['QtAndroid.jar', 'QtAndroidBearer.jar'], dir: 'libs')
+
+	legacyImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
+	qtcoredebugImplementation "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
+	qtcoredebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	qtcoreImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
+	qtcoreImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
+	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
+		exclude group: 'com.android.support'
+	}
+	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
+	implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
+		exclude group: 'com.android.support'
+	}
+	implementation('com.github.scribejava:scribejava-apis:7.1.1'){
+		exclude group: "com.fasterxml.jackson.core"
+	}
+	implementation 'com.jaredrummler:colorpicker:1.1.0'
+
+	//freehuaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
+}

OsmAnd/res/drawable/ic_action_plan_route_point_colored.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12Z"
+      android:fillColor="#000000"
+      android:fillAlpha="0.1"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M21,12C21,16.9706 16.9706,21 12,21C7.0294,21 3,16.9706 3,12C3,7.0294 7.0294,3 12,3C16.9706,3 21,7.0294 21,12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,17C14.7614,17 17,14.7614 17,12C17,9.2386 14.7614,7 12,7C9.2386,7 7,9.2386 7,12C7,14.7614 9.2386,17 12,17ZM12,19C15.866,19 19,15.866 19,12C19,8.134 15.866,5 12,5C8.134,5 5,8.134 5,12C5,15.866 8.134,19 12,19Z"
+      android:fillColor="#237BFF"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/layout/fragment_opr_login.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="@color/color_white"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical"
-	android:clickable="true"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:background="?attr/bg_color"
+	android:clickable="true"
+	android:focusable="true"
+	android:orientation="vertical">
 
 	<LinearLayout
+		android:id="@+id/toolbar"
 		android:layout_width="match_parent"
-		android:layout_height="56dp"
+		android:layout_height="@dimen/toolbar_height"
 		android:layout_marginTop="@dimen/dialog_content_margin">
 
 		<androidx.appcompat.widget.AppCompatImageView
@@ -19,77 +21,85 @@
 			android:layout_height="match_parent"
 			android:layout_gravity="start"
 			android:contentDescription="@string/shared_string_back"
-			app:tint="@color/icon_color_default_light"
+			app:srcCompat="@drawable/ic_arrow_back"
-			app:srcCompat="@drawable/ic_arrow_back"/>
+			app:tint="@color/icon_color_default_light" />
 
 	</LinearLayout>
 
-	<androidx.appcompat.widget.AppCompatImageView
+		<androidx.core.widget.NestedScrollView
-		android:id="@+id/opr_img"
+			android:layout_width="match_parent"
-		android:layout_width="wrap_content"
+			android:layout_height="match_parent"
-		android:layout_height="wrap_content"
+			android:layout_below="@id/toolbar"
-		android:layout_gravity="center"
+			android:layout_above="@id/buttons">
-		android:contentDescription="@string/shared_string_back"
-		app:srcCompat="@drawable/ic_img_logo_openplacereview"/>
 
-	<androidx.appcompat.widget.AppCompatTextView
+			<LinearLayout
-		android:layout_width="match_parent"
+				android:layout_width="match_parent"
-		android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-		android:layout_marginLeft="@dimen/content_padding"
+				android:orientation="vertical">
-		android:textColor="@color/color_black"
-		android:textSize="20sp"
-		android:lineSpacingExtra="5sp"
-		android:textAlignment="center"
-		android:layout_marginRight="@dimen/content_padding"
-		android:layout_marginTop="@dimen/content_padding"
-		android:layout_marginBottom="@dimen/dashPadding"
-		android:text="@string/register_on_openplacereviews"
-		android:gravity="center_horizontal"/>
 
+				<androidx.appcompat.widget.AppCompatImageView
+					android:id="@+id/opr_img"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:contentDescription="@string/shared_string_back"
+					app:srcCompat="@drawable/ic_img_logo_openplacereview" />
 
-	<androidx.appcompat.widget.AppCompatTextView
+				<net.osmand.plus.widgets.TextViewEx
-		android:id="@+id/start_opr_description"
+					android:layout_width="match_parent"
-		android:layout_width="match_parent"
+					android:layout_height="wrap_content"
-		android:layout_height="wrap_content"
+					android:layout_marginLeft="@dimen/content_padding"
-		android:layout_marginTop="@dimen/dashPadding"
+					android:layout_marginTop="@dimen/content_padding"
-		android:layout_marginLeft="@dimen/content_padding"
+					android:layout_marginRight="@dimen/content_padding"
-		android:lineSpacingExtra="5sp"
+					android:layout_marginBottom="@dimen/dashPadding"
-		android:textColor="@color/color_black"
+					android:gravity="center_horizontal"
-		android:textColorLink="@color/icon_color_active_light"
+					android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
-		android:layout_marginRight="@dimen/content_padding"
+					android:text="@string/register_on_openplacereviews"
-		android:text="@string/register_on_openplacereviews_desc"/>
+					android:textAlignment="center"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="20sp"
+					app:typeface="@string/font_roboto_medium" />
+
+				<androidx.appcompat.widget.AppCompatTextView
+					android:id="@+id/start_opr_description"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="@dimen/content_padding"
+					android:layout_marginTop="@dimen/dashPadding"
+					android:layout_marginRight="@dimen/content_padding"
+					android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+					app:typeface="@string/font_roboto_regular"
+					android:text="@string/register_on_openplacereviews_desc"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="@dimen/default_list_text_size"
+					android:textColorLink="@color/icon_color_active_light" />
+			</LinearLayout>
+		</androidx.core.widget.NestedScrollView>
 
 	<LinearLayout
-		android:gravity="bottom"
+		android:id="@+id/buttons"
-		android:orientation="vertical"
-		android:layout_marginBottom="@dimen/content_padding_small"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/content_padding_small"
+		android:layout_alignParentBottom="true"
+		android:orientation="vertical">
 
-		<androidx.appcompat.widget.AppCompatButton
+		<include
 			android:id="@+id/register_opr_create_account"
-			android:layout_marginLeft="@dimen/content_padding"
+			layout="@layout/bottom_sheet_dialog_button"
-			android:layout_marginRight="@dimen/content_padding"
-			android:layout_marginBottom="@dimen/dashPadding"
-			android:text="@string/register_opr_create_new_account"
-			android:textColor="@color/color_white"
-			android:layout_marginTop="@dimen/content_padding_small"
-			android:background="@color/icon_color_active_light"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
+			android:layout_height="@dimen/dialog_button_height"
+			android:layout_marginBottom="@dimen/content_padding_small" />
 
-		<androidx.appcompat.widget.AppCompatButton
+		<include
 			android:id="@+id/register_opr_have_account"
-			android:layout_marginLeft="@dimen/content_padding"
+			layout="@layout/bottom_sheet_dialog_button"
-			android:layout_marginRight="@dimen/content_padding"
-			android:layout_marginTop="@dimen/dashPadding"
-			android:layout_gravity="bottom"
-			android:text="@string/register_opr_have_account"
-			android:textColor="@color/icon_color_active_light"
-			android:background="@color/activity_background_color_light"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"/>
+			android:layout_height="@dimen/dialog_button_height" />
 
 	</LinearLayout>
 
-</LinearLayout>
+</RelativeLayout>

OsmAnd/res/layout/opr_add_photo.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/add_photos_icon"
+		android:layout_width="@dimen/favorites_icon_outline_size"
+		android:layout_height="@dimen/favorites_icon_outline_size"
+		android:layout_marginTop="@dimen/bottom_sheet_icon_margin"
+		android:layout_gravity="center"
+		osmand:srcCompat="@drawable/ic_action_photo_upload_colored" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/add_photos_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="center"
+		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginBottom="@dimen/content_padding_small"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/dialog_header_text_size"
+		osmand:typeface="@string/font_roboto_medium"
+		android:text="@string/shared_string_add_photos" />
+
+	<net.osmand.plus.widgets.TextViewEx
+		android:id="@+id/add_photos_descr"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginLeft="@dimen/content_padding"
+		android:layout_marginRight="@dimen/content_padding"
+		android:layout_marginBottom="@dimen/text_margin_small"
+		android:textColor="?android:textColorPrimary"
+		android:textSize="@dimen/default_list_text_size"
+		android:lineSpacingMultiplier="@dimen/bottom_sheet_text_spacing_multiplier"
+		osmand:typeface="@string/font_roboto_regular"
+		android:text="@string/add_photos_descr" />
+
+</LinearLayout>

OsmAnd/res/layout/settings_group_title.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="@dimen/bottom_sheet_title_height"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding"
+		android:paddingRight="@dimen/wikilink_bottom_sheet_padding"
+		android:paddingBottom="@dimen/wikilink_bottom_sheet_padding">
+
+		<LinearLayout
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center_vertical"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_weight="1"
+			android:orientation="vertical">
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/title"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:letterSpacing="@dimen/text_button_letter_spacing"
+				android:minHeight="@dimen/default_title_line_height"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="@dimen/default_list_text_size"
+				app:lineHeight="@dimen/default_title_line_height"
+				app:typeface="@string/font_roboto_medium"
+				tools:text="Some title" />
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:id="@+id/description"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:ellipsize="end"
+				android:letterSpacing="@dimen/description_letter_spacing"
+				android:minHeight="@dimen/default_desc_line_height"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="@dimen/default_desc_text_size"
+				app:lineHeight="@dimen/default_desc_line_height"
+				app:typeface="@string/font_roboto_regular"
+				tools:text="Some description" />
+
+		</LinearLayout>
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/selected_size"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/default_title_line_height"
+			android:textColor="?android:textColorSecondary"
+			android:textSize="@dimen/default_list_text_size"
+			app:lineHeight="@dimen/default_title_line_height"
+			app:typeface="@string/font_roboto_regular"
+			tools:text="5/6" />
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:id="@+id/select_all_button"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:background="?attr/selectableItemBackground"
+		android:gravity="center_vertical"
+		android:minHeight="@dimen/bottom_sheet_list_item_height"
+		android:paddingLeft="@dimen/content_padding"
+		android:paddingTop="@dimen/content_padding_small"
+		android:paddingRight="@dimen/content_padding"
+		android:paddingBottom="@dimen/content_padding_small">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="@dimen/content_padding"
+			android:layout_marginRight="@dimen/content_padding"
+			android:layout_weight="1"
+			android:ellipsize="end"
+			android:letterSpacing="@dimen/text_button_letter_spacing"
+			android:minHeight="@dimen/default_title_line_height"
+			android:text="@string/shared_string_select_all"
+			android:textColor="?attr/active_color_basic"
+			android:textSize="@dimen/default_list_text_size"
+			app:lineHeight="@dimen/default_title_line_height"
+			app:typeface="@string/font_roboto_medium" />
+
+		<net.osmand.view.ThreeStateCheckbox
+			android:id="@+id/check_box"
+			style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
+			android:layout_width="@dimen/standard_icon_size"
+			android:layout_height="@dimen/standard_icon_size"
+			android:layout_gravity="center"
+			android:clickable="false"
+			android:enabled="false"
+			android:focusable="false" />
+
+	</LinearLayout>
+
+</LinearLayout>

OsmAnd/res/values-ar/phrases.xml

@@ -382,7 +382,7 @@
     <string name="poi_toilets_wheelchair_yes">الوصول إلى المراحيض بالكراسي المتحركة: نعم</string>
     <string name="poi_toilets_wheelchair_no">الوصول إلى المراحيض بالكراسي المتحركة: لا</string>
     <string name="poi_toilets_access_customers">الوصول إلى دورة المياة: العملاء فقط</string>
-    <string name="poi_diaper_yes">طاولة تغيير الحفائض</string>
+    <string name="poi_diaper_yes">طاولة تغيير حفائض الأطفال</string>
     <string name="poi_diaper_no">لا توجد طاولة تغيير الحفاض</string>
     <string name="poi_diaper_room">غرفة تغيير الحفاضات</string>
     <string name="poi_maxstay">الوقت المحدد لوقوف السيارات</string>
@@ -563,7 +563,7 @@
     <string name="poi_commercial">مساحة تجارية</string>
     <string name="poi_vineyard">حقل عنب</string>
     <string name="poi_farmyard">مزرعة</string>
-    <string name="poi_meadow">مرعى أو مرج</string>
+    <string name="poi_meadow">مرعى/مرج/روضة</string>
     <string name="poi_canal">قناة</string>
     <string name="poi_surveillance">مراقبة</string>
     <string name="poi_observatory">مرصد</string>
@@ -1396,7 +1396,7 @@
     <string name="poi_cafeteria">كافتيريا</string>
     <string name="poi_motorcycle_services">الخدمات</string>
     <string name="poi_motorcycle_type">نوع الدراجة النارية</string>
-    <string name="poi_motorcycle_type_standard">موحد</string>
+    <string name="poi_motorcycle_type_standard">قياسية</string>
     <string name="poi_zoo_type">النوع</string>
     <string name="poi_aerialway_station">محطة Aerialway</string>
     <string name="poi_aerialway_chair_lift">رافعة بالكرسي</string>
@@ -1437,7 +1437,7 @@
     <string name="poi_piste_grooming">مسار الزحلقة</string>
     <string name="poi_animal_shelter_type">الحيوانات المسموح بها</string>
     <string name="poi_animal_shelter_purpose">الغرض</string>
-    <string name="poi_direction_entrance">الوجهة: مدخل</string>
+    <string name="poi_direction_entrance">الاتجاه: المدخل</string>
     <string name="poi_boat_rental_type">قوارب مأجرة</string>
     <string name="poi_petroleum_well">بئر نفط</string>
     <string name="poi_cricket_nets">شبكات الكريكيت</string>
@@ -1569,32 +1569,32 @@
     <string name="poi_dolphin">دولفين</string>
     <string name="poi_feeding_place">مكان لتغذية الحيوان</string>
     <string name="poi_water_place_durability_durable">قدرة تحمل المكان للماء: متين</string>
-    <string name="poi_outcrop">بروز</string>
+    <string name="poi_outcrop">بروز طبقات الأرض (تفجر أرضي)</string>
-    <string name="poi_payment_contactless_yes">تماس</string>
+    <string name="poi_payment_contactless_yes">تلامس</string>
-    <string name="poi_payment_contactless_no">التماس غير مقبول</string>
+    <string name="poi_payment_contactless_no">لا يتم قبول التلامس</string>
     <string name="poi_hazard">خطر</string>
     <string name="poi_hazard_nuclear">خطر مواد نووية</string>
-    <string name="poi_hazard_erosion">خطر التآكل</string>
+    <string name="poi_hazard_erosion">خطر الهيار/التعرية الأرضية</string>
-    <string name="poi_hazard_avalanche">خطر الانهيار</string>
+    <string name="poi_hazard_avalanche">خطر الانهيار الجليدي</string>
-    <string name="poi_hazard_slippery_road">طريق زلقة</string>
+    <string name="poi_hazard_slippery_road">طريق زلق</string>
     <string name="poi_hazard_flood">خطر فيضانات</string>
     <string name="poi_hazard_minefield">حقل الغام</string>
-    <string name="poi_ruins">أطلال</string>
+    <string name="poi_ruins">أطلال/أنقاض/خرائب</string>
     <string name="poi_license_classes">فئات الترخيص</string>
     <string name="poi_hill">تل</string>
     <string name="poi_shoe_repair">تصليح أحذية</string>
     <string name="poi_bulk_purchase_yes">نعم</string>
     <string name="poi_bulk_purchase_only">فقط</string>
-    <string name="poi_pipeline_substation">خط أنابيب فرعية</string>
+    <string name="poi_pipeline_substation">محطة فرعية لخطوط الأنابيب</string>
-    <string name="poi_substation_transmission">الإرسال</string>
+    <string name="poi_substation_transmission">‌الإرسال/الدفع</string>
     <string name="poi_substation_distribution">التوزيع</string>
     <string name="poi_substation_minor_distribution">توزيع ثانوي</string>
     <string name="poi_substation_industrial">صناعية</string>
-    <string name="poi_substation_transition">مرحلة انتقالية</string>
+    <string name="poi_substation_transition">ناقل</string>
-    <string name="poi_substation_traction">جر</string>
+    <string name="poi_substation_traction">تغذية النقل (المترو/القطار ..)</string>
     <string name="poi_substation_converter">محول</string>
     <string name="poi_substation_compensation">التعويض</string>
-    <string name="poi_substation_compression">ضغط</string>
+    <string name="poi_substation_compression">الضغط</string>
     <string name="poi_substation_measurement">قياس</string>
     <string name="poi_substation_valve">صمام</string>
     <string name="poi_substation_valve_group">مجموعة صمامات</string>
@@ -1602,14 +1602,14 @@
     <string name="poi_substation_field_gathering">ميدان تجمع</string>
     <string name="poi_craft_confectionery">إنتاج حلويات</string>
     <string name="poi_shop_wholesale">متجر جملة</string>
-    <string name="poi_laboratory">مختبرات طبية</string>
+    <string name="poi_laboratory">مختبر طبي</string>
     <string name="poi_blood_donation">التبرع بالدم</string>
     <string name="poi_books_comic">قصص مصورة</string>
     <string name="poi_books_antiquarian">أثري</string>
     <string name="poi_books_religion">ديني</string>
     <string name="poi_books_academic">أكاديمي</string>
     <string name="poi_books_children">أطفال</string>
-    <string name="poi_atoll">جزر مرجانية</string>
+    <string name="poi_atoll">جزيرة مرجانية</string>
     <string name="poi_toll_gantry">جهاز ارسال رسوم الكترونية</string>
     <string name="poi_childcare">رعاية أطفال</string>
     <string name="poi_denotation_natural_monument">معلم طبيعي</string>
@@ -1618,7 +1618,7 @@
     <string name="poi_park_ride_train">قطار</string>
     <string name="poi_park_ride_bus">باص</string>
     <string name="poi_park_ride_metro">مترو انفاق</string>
-    <string name="poi_park_ride_hov">HOV</string>
+    <string name="poi_park_ride_hov">مركبات فيها أكثر من شخص</string>
     <string name="poi_park_ride_tram">ترام</string>
     <string name="poi_park_ride_ferry">عبّارة</string>
     <string name="poi_generator_source_biomass">مصدر الطاقة: الكتلة الحيوية</string>
@@ -2170,7 +2170,7 @@
     <string name="poi_wetland_reedbed">رطب صعب المشي فيه،قصب</string>
     <string name="poi_wetland_marsh">اهوار</string>
     <string name="poi_wetland_bog">مستنقع</string>
-    <string name="poi_wetland_wet_meadow">مرعى أو مرج رطب طوال العام</string>
+    <string name="poi_wetland_wet_meadow">مرعى/مرج رطب طوال العام</string>
     <string name="poi_resource_tuff">الطفة البركانية</string>
     <string name="poi_resource_tin">القصدير</string>
     <string name="poi_resource_stone">حجر</string>
@@ -2179,7 +2179,7 @@
     <string name="poi_industrial_brickyard">النوع: ساحة الطوب</string>
     <string name="poi_industrial_agriculture">النوع: زراعة</string>
     <string name="poi_industrial_auto_wrecker">النوع: متلف/محطم السيارات</string>
-    <string name="poi_industrial_warehouse">النوع: مستودع</string>
+    <string name="poi_industrial_warehouse">النوع: مخزن</string>
     <string name="poi_industrial_refinery">النوع: مصفاة</string>
     <string name="poi_industrial_timber">النوع: خشب</string>
     <string name="poi_industrial_gas">النوع: صناعة الغاز</string>
@@ -2620,7 +2620,7 @@
     <string name="poi_tomb_rock_cut">النوع: قطع الصخور</string>
     <string name="poi_tomb_tumulus">النوع: رمل</string>
     <string name="poi_tomb_war_grave">النوع: قبر حرب</string>
-    <string name="poi_cairn">رِجّم (صخور مركومة) علامة</string>
+    <string name="poi_cairn">رِجْم، رجوم (صخور مركومة)</string>
     <string name="poi_step_condition_rough">عتبات مختلفة أو مائلة</string>
     <string name="poi_step_condition_uneven">عتبات غير متساوية</string>
     <string name="poi_step_condition_even">عتبات متساوية</string>
@@ -2961,4 +2961,702 @@
     <string name="poi_cuisine_turkish">تركي</string>
     <string name="poi_cuisine_international">عالمي</string>
     <string name="poi_cuisine_thai">تايلندي</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_cash_withdrawal_migros_bank">بنك ميغروس</string>
+    <string name="poi_cash_withdrawal_postfinance_card">بطاقة ما بعد التمويل</string>
+    <string name="poi_cash_withdrawal_foreign_cards">السحب النقدي: البطاقات الأجنبية</string>
+    <string name="poi_cash_withdrawal_purchase_minimum">السحب النقدي: الحد الأدنى للشراء</string>
+    <string name="poi_cash_withdrawal_fee_no">رسوم السحب النقدي: لا</string>
+    <string name="poi_cash_withdrawal_fee_yes">رسوم السحب النقدي: نعم</string>
+    <string name="poi_cash_withdrawal_purchase_required_no">السحب النقدي: لا يتطلب الشراء</string>
+    <string name="poi_cash_withdrawal_purchase_required_yes">السحب النقدي: لابد من الشراء</string>
+    <string name="poi_cash_withdrawal_currency">عملة السحب النقدي</string>
+    <string name="poi_cash_withdrawal_limit">حد السحب النقدي</string>
+    <string name="poi_cash_withdrawal_type_self_checkout">نوع السحب النقدي: الدفع الذاتي</string>
+    <string name="poi_cash_withdrawal_type_checkout">نوع السحب النقدي: الدفع</string>
+    <string name="poi_cash_withdrawal_operator">مشغل السحب النقدي</string>
+    <string name="poi_cash_withdrawal">سحب نقدي</string>
+    <string name="poi_cash_withdrawal_yes">السحب النقدي: نعم</string>
+    <string name="poi_pet_grooming">العناية بالحيوانات الأليفة</string>
+    <string name="poi_charge">شحن</string>
+    <string name="poi_craft_cabinet_maker">نجار/صانع أثاث</string>
+    <string name="poi_craft_bakery">مخبز</string>
+    <string name="poi_craft_floorer">مبلط/تبليط/أرضيات</string>
+    <string name="poi_craft_joiner">نجار</string>
+    <string name="poi_craft_builder">مقاولات/بناء</string>
+    <string name="poi_health_food">الغذاء الصحي</string>
+    <string name="poi_cellar_entrance">مدخل القبو</string>
+    <string name="poi_disabled_designated">المعينه/المحدد</string>
+    <string name="poi_disabled_yes">نعم</string>
+    <string name="poi_goods_designated">المعينه/المحدد</string>
+    <string name="poi_goods_yes">نعم</string>
+    <string name="poi_hgv_delivery">للتسليم والتوصيل فقط</string>
+    <string name="poi_hgv_designated">المعينه/المحدد</string>
+    <string name="poi_hgv_destination">للوصول للوجهة فقط</string>
+    <string name="poi_hgv_yes">نعم</string>
+    <string name="poi_mofa_designated">المعينه/المحدد</string>
+    <string name="poi_mofa_yes">نعم</string>
+    <string name="poi_moped_designated">المعينه/المحدد</string>
+    <string name="poi_moped_yes">نعم</string>
+    <string name="poi_motorcycle_designated">المعينه/المحدد</string>
+    <string name="poi_motorcycle_destination">للوصول للوجهة فقط</string>
+    <string name="poi_motorcycle_yes">نعم</string>
+    <string name="poi_trailer_designated">المعينه/المحدد</string>
+    <string name="poi_trailer_yes">نعم</string>
+    <string name="poi_motorhome_designated">المعينه/المحدد</string>
+    <string name="poi_motorhome_yes">نعم</string>
+    <string name="poi_caravan_designated">المعينه/المحدد</string>
+    <string name="poi_caravan_yes">نعم</string>
+    <string name="poi_bus_designated">المعينه/المحدد</string>
+    <string name="poi_bus_yes">نعم</string>
+    <string name="poi_snowmobile_permissive">خاص مسموح بدخوله</string>
+    <string name="poi_snowmobile_designated">المعينه/المحدد</string>
+    <string name="poi_snowmobile_yes">نعم</string>
+    <string name="poi_disabled_no">السماح بدخول المعاقين: لا</string>
+    <string name="poi_horse_no">الخيول غير مسموح بها</string>
+    <string name="poi_horse_yes">مسموح بالخيول</string>
+    <string name="poi_taxi_no">السماح بدخول مركبات الأجرة: لا</string>
+    <string name="poi_taxi_designated">السماح بدخول مركبات الأجرة: محدد</string>
+    <string name="poi_taxi_yes">السماح بدخول مركبات الأجرة: نعم</string>
+    <string name="poi_agricultural_no">السماح بدخول المركبات الزراعية: لا</string>
+    <string name="poi_agricultural_yes">السماح بدخول المركبات الزراعية: نعم</string>
+    <string name="poi_snowmobile_no">السماح بدخول الزلاجات الآلية: لا</string>
+    <string name="poi_snowmobile_private">السماح بدخول الزلاجات الآلية: خاص</string>
+    <string name="poi_ski_no">السماح بدخول الزلاجات: لا</string>
+    <string name="poi_ski_yes">السماح بدخول الزلاجات: نعم</string>
+    <string name="poi_coach_no">السماح بدخول مدربي القيادة: لا</string>
+    <string name="poi_coach_yes">السماح بدخول مدربي القيادة: نعم</string>
+    <string name="poi_tourist_bus_yes">السماح بدخول حافلات السياح: نعم</string>
+    <string name="poi_tourist_bus_no">السماح بدخول حافلات السياح: لا</string>
+    <string name="poi_tourist_bus_designated">السماح بدخول حافلات السياح: محدد</string>
+    <string name="poi_bus_no">السماح بدخول الحافلات: لا</string>
+    <string name="poi_psv_no">السماح بدخول مركبات الخدمات العامة: لا</string>
+    <string name="poi_psv_designated">السماح بدخول مركبات الخدمات العامة: محدد</string>
+    <string name="poi_psv_yes">السماح بدخول مركبات الخدمات العامة: لا</string>
+    <string name="poi_trailer_no">السماح بدخول المقطورات: لا</string>
+    <string name="poi_motorhome_no">السماح بدخول البيوت المتنقلة: لا</string>
+    <string name="poi_caravan_no">السماح بدخول الكرفانات: لا</string>
+    <string name="poi_foot_customers">السماح بدخول المشاة: للعملاء فقط</string>
+    <string name="poi_foot_destination">السماح بدخول المشاة: للعبور إلى الوجهة فقط</string>
+    <string name="poi_foot_no">السماح بدخول المشاة: لا</string>
+    <string name="poi_foot_private">السماح بدخول المشاة: خاص</string>
+    <string name="poi_foot_yes">السماح بدخول المشاة: نعم</string>
+    <string name="poi_horse_forestry">السماح بدخول الخيول: الخاصة بالغابات</string>
+    <string name="poi_horse_destination">السماح بدخول الخيول: للعبور إلى الوجهة</string>
+    <string name="poi_horse_private">السماح بدخول الخيول: خاص</string>
+    <string name="poi_bicycle_customers">السماح بدخول الدراجات: للعملاء فقط</string>
+    <string name="poi_bicycle_destination">السماح بدخول الدراجات: للعبور إلى الوجهة</string>
+    <string name="poi_bicycle_dismount">السماح بدخول الدراجات: بدون قيادتها (سحبها مشياً)</string>
+    <string name="poi_bicycle_private">السماح بدخول الدراجات:خاص</string>
+    <string name="poi_mofa_no">السماح بدخول الدراجات الآلية:لا</string>
+    <string name="poi_moped_no">السماح بدخول الدبابات الصغيرة:لا</string>
+    <string name="poi_motorcycle_no">السماح بدخول الدراجات النارية:لا</string>
+    <string name="poi_motorcycle_private">السماح بدخول الدراجات النارية:خاص</string>
+    <string name="poi_goods_no">السماح بدخول المركبات الصغيرة:لا</string>
+    <string name="poi_hgv_unsuitable">السماح بدخول المركبات الكبيرة:غير ملائم</string>
+    <string name="poi_hgv_discouraged">السماح بدخول المركبات الكبيرة:غير مناسب</string>
+    <string name="poi_hgv_agricultural">السماح بدخول المركبات الكبيرة:الزراعية</string>
+    <string name="poi_hgv_no">السماح بدخول المركبات الكبيرة:لا</string>
+    <string name="poi_hgv_private">السماح بدخول المركبات الكبيرة:خاص</string>
+    <string name="poi_motor_vehicle_agricultural">السماح بدخول المركبات الآلية:الزراعية</string>
+    <string name="poi_motor_vehicle_forestry">السماح بدخول المركبات الآلية:الخاصة بالغابات</string>
+    <string name="poi_motor_vehicle_delivery">السماح بدخول المركبات الآلية: للتسليم فقط</string>
+    <string name="poi_motor_vehicle_military">السماح بدخول المركبات الآلية:العسكرية</string>
+    <string name="poi_motor_vehicle_customers">السماح بدخول المركبات الآلية:العملاء فقط</string>
+    <string name="poi_motor_vehicle_destination">السماح بدخول المركبات الآلية:للوصول إلى الوجهة فقط</string>
+    <string name="poi_motor_vehicle_no">السماح بدخول المركبات الآلية:لا</string>
+    <string name="poi_motor_vehicle_private">السماح بدخول المركبات الآلية:خاص</string>
+    <string name="poi_motor_vehicle_yes">السماح بدخول المركبات الآلية:نعم</string>
+    <string name="poi_motorcar_forestry">السماح بدخول السيارات: الخاصة بالغابة</string>
+    <string name="poi_motorcar_customers">السماح بدخول السيارات: العملاء</string>
+    <string name="poi_hgv_permissive">‏‏ خاص مسموح بدخوله</string>
+    <string name="poi_motorcycle_permissive">خاص مسموح بدخوله</string>
+    <string name="poi_foot_permissive">السماح بدخول المشاة: خاص مسموح بدخوله</string>
+    <string name="poi_horse_permissive">السماح بدخول الخيول: خاص مسموح بدخوله</string>
+    <string name="poi_bicycle_permissive">السماح بدخول الدرجات: خاص مسموح بدخوله</string>
+    <string name="poi_motor_vehicle_permissive">السماح بدخول المركبات الآلية: خاص مسموح بدخوله</string>
+    <string name="poi_motorcar_permissive">السماح بدخول السيارات: خاص مسموح بدخوله</string>
+    <string name="poi_motorcar_destination">السماح بدخول السيارات: للعبور للوجهة</string>
+    <string name="poi_motorcar_no">السماح بدخول السيارات: لا</string>
+    <string name="poi_motorcar_private">السماح بدخول السيارات:خاص</string>
+    <string name="poi_motorcar_yes">السماح بدخول السيارات:</string>
+    <string name="poi_vehicle_forestry">السماح بدخول المركبات: الخاصة بالغابات</string>
+    <string name="poi_vehicle_delivery">السماح بدخول المركبات: لتسليم الطلبات</string>
+    <string name="poi_vehicle_military">السماح بدخول المركبات: العسكرية</string>
+    <string name="poi_vehicle_customers">السماح بدخول المركبات: العملاء فقط</string>
+    <string name="poi_vehicle_permissive">السماح بدخول المركبات: خاص مسموح بدخوله</string>
+    <string name="poi_vehicle_destination">السماح بدخول المركبات: للعبور للوجهة</string>
+    <string name="poi_vehicle_no">السماح بدخول المركبات: لا</string>
+    <string name="poi_vehicle_private">السماح بدخول المركبات: خاص</string>
+    <string name="poi_vehicle_yes">السماح بدخول المركبات: نعم</string>
+    <string name="poi_taxi_office">مكتب سيارات الأجرة</string>
+    <string name="poi_changing_table_fee_no">رسوم على طاولة تغيير الأطفال: لا</string>
+    <string name="poi_changing_table_fee_yes">رسوم على طاولة تغيير الأطفال: نعم</string>
+    <string name="poi_changing_table_count">عدد طاولات تغيير الأطفال</string>
+    <string name="poi_changing_table_location_unisex_toilet">موقع طاولة تغيير للأطفال: دورة مياة للجنسين</string>
+    <string name="poi_changing_table_location_female_toilet">موقع طاولة تغيير للأطفال: دورة مياة النساء</string>
+    <string name="poi_changing_table_location_male_toilet">موقع طاولة تغيير للأطفال: دورة مياة الرجال</string>
+    <string name="poi_changing_table_location_room">موقع طاولة تغيير للأطفال: غرفة</string>
+    <string name="poi_changing_table_limited">طاولة تغيير للأطفال: محدودة (غير رسمية)</string>
+    <string name="poi_changing_table_no">طاولة تغيير للأطفال: لا</string>
+    <string name="poi_changing_table_yes">طاولة تغيير للأطفال: نعم</string>
+    <string name="poi_defibrillator_location">الموقع (وصف المكان)</string>
+    <string name="poi_hazard_additional_contamination">الخطر: التلوث</string>
+    <string name="poi_hazard_additional_minefield">الخطر: حقل ألغام</string>
+    <string name="poi_hazard_additional_avalanche">الخطر: انهيار جليدي</string>
+    <string name="poi_hazard_additional_flood">الخطر: فيضان</string>
+    <string name="poi_hazard_additional_nuclear">الخطر: نووي</string>
+    <string name="poi_hazard_additional_rockfall">الخطر: سقوط الصخور</string>
+    <string name="poi_hazard_additional_erosion">خطر: تآكل/تعرية</string>
+    <string name="poi_rescue_box">صندوق الطوارئ</string>
+    <string name="poi_change_delete">كائن محذوف</string>
+    <string name="poi_flare">شعلة الغاز ؛ مداخن مضيئة</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3B*</string>
+    <string name="poi_rtsa_scale_3b">3B</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3A*</string>
+    <string name="poi_rtsa_scale_3a">3A</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2B*</string>
+    <string name="poi_rtsa_scale_2b">2B</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2A*</string>
+    <string name="poi_rtsa_scale_2a">2A</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1B*</string>
+    <string name="poi_rtsa_scale_1b">1B</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1A*</string>
+    <string name="poi_rtsa_scale_1a">1A</string>
+    <string name="poi_rtsa_scale_nc_asterisk">n/c*</string>
+    <string name="poi_rtsa_scale_nc">n/c</string>
+    <string name="poi_socket_schuko_yes">شوكو</string>
+    <string name="poi_socket_nema_14_50_yes">نيما 14-50</string>
+    <string name="poi_socket_nema_14_30_yes">نيما 14-30</string>
+    <string name="poi_socket_nema_5_20_yes">نيما 5-20</string>
+    <string name="poi_socket_nema_5_15_yes">نيما 5-15R</string>
+    <string name="poi_socket_tesla_roadster_yes">تسلا رودستر</string>
+    <string name="poi_socket_tesla_supercharger_yes">شاحن تسلا</string>
+    <string name="poi_socket_tesla_standard_yes">معيار تسلا</string>
+    <string name="poi_socket_chademo_yes">شاديمو</string>
+    <string name="poi_socket_type3_yes">النوع 3</string>
+    <string name="poi_socket_type2_combo_yes">النوع 2 كومبو</string>
+    <string name="poi_socket_type2_yes">النوع 2</string>
+    <string name="poi_socket_type1_combo_yes">النوع 1 كومبو</string>
+    <string name="poi_socket_type1_yes">النوع 1</string>
+    <string name="poi_socket_cee_red_125a_yes">CEE الأحمر 125A</string>
+    <string name="poi_socket_cee_red_64a_yes">CEE الأحمر 64 أ</string>
+    <string name="poi_socket_cee_red_32a_yes">CEE الأحمر 32A</string>
+    <string name="poi_socket_cee_red_16a_yes">CEE الأحمر 16A</string>
+    <string name="poi_socket_cee_blue_yes">CEE الأزرق</string>
+    <string name="poi_shop_boat">متجر قوارب</string>
+    <string name="poi_shop_fireplace">متجر موقد/مشب</string>
+    <string name="poi_agrarian">متجر زراعي</string>
+    <string name="poi_frozen_food">أغذية مجمدة</string>
+    <string name="poi_meadow_pasture">النوع: مرعى</string>
+    <string name="poi_meadow_transitional">النوع: انتقالي</string>
+    <string name="poi_meadow_perpetual">النوع: دائم</string>
+    <string name="poi_meadow_agricultural">النوع: زراعي</string>
+    <string name="poi_diameter_crown">قطر القمة</string>
+    <string name="poi_circumference">محيط</string>
+    <string name="poi_climbing_routes">طرق التسلق</string>
+    <string name="poi_climbing_summit_log_no">تسلق قمة الجذوع: لا</string>
+    <string name="poi_climbing_summit_log_yes">تسلق قمة الجذوع: نعم</string>
+    <string name="poi_climbing_orientation_nw">اتجاه الجدار: شمال غرب</string>
+    <string name="poi_climbing_orientation_w">اتجاه الجدار: غرب</string>
+    <string name="poi_climbing_orientation_sw">اتجاه الجدار: جنوب غرب</string>
+    <string name="poi_climbing_orientation_s">اتجاه الجدار: جنوب</string>
+    <string name="poi_climbing_orientation_se">اتجاه الجدار: جنوب شرق</string>
+    <string name="poi_climbing_orientation_e">اتجاه الجدار: شرق</string>
+    <string name="poi_climbing_orientation_ne">اتجاه الجدار: شمال شرق</string>
+    <string name="poi_climbing_orientation_n">اتجاه الجدار: شمال</string>
+    <string name="poi_climbing_bolted_no">المراسي الثابتة: لا</string>
+    <string name="poi_climbing_bolted_yes">المراسي الثابتة: نعم</string>
+    <string name="poi_climbing_quality_fragile">جودة التسلق: هشة</string>
+    <string name="poi_climbing_quality_solid">جودة التسلق: ثابت</string>
+    <string name="poi_climbing_rock_porphyry">تسلق الصخور: الرخام السماقي</string>
+    <string name="poi_climbing_rock_gneiss">تسلق الصخور: النيس</string>
+    <string name="poi_climbing_rock_quartzite">تسلق الصخور: الكوارتز</string>
+    <string name="poi_climbing_rock_sandstone">تسلق الصخور: الحجر الرملي</string>
+    <string name="poi_climbing_rock_granite">تسلق الصخور: الجرانيت</string>
+    <string name="poi_climbing_rock_limestone">تسلق الصخور: الحجر الجيري</string>
+    <string name="poi_climbing_length_max">طول الحد الأقصى للتسلق</string>
+    <string name="poi_climbing_length_min">طول الحد الأدنى للتسلق</string>
+    <string name="poi_climbing_length">طول مساحة التسلق</string>
+    <string name="poi_climbing_deepwater_no">التسلق الفردي في المياه العميقة: لا</string>
+    <string name="poi_climbing_deepwater_yes">التسلق الفردي في المياه العميقة: نعم</string>
+    <string name="poi_climbing_mixed_no">مختلط: لا</string>
+    <string name="poi_climbing_mixed_yes">مختلط: نعم</string>
+    <string name="poi_climbing_ice_no">الجليد: لا</string>
+    <string name="poi_climbing_ice_yes">الجليد: نعم</string>
+    <string name="poi_climbing_multipitch_no">طرق متعددة : لا</string>
+    <string name="poi_climbing_multipitch_yes">طرق متعددة: نعم</string>
+    <string name="poi_climbing_trad_no">تقليدي: لا</string>
+    <string name="poi_climbing_trad_yes">تقليدي: نعم</string>
+    <string name="poi_climbing_toprope_no">حبل علوي: لا</string>
+    <string name="poi_climbing_toprope_yes">حبل علوي: نعم</string>
+    <string name="poi_climbing_boulder_no">بولدرينغ: لا</string>
+    <string name="poi_climbing_boulder_yes">بولدرينغ: نعم</string>
+    <string name="poi_climbing_sport_no">الرياضة: لا</string>
+    <string name="poi_climbing_sport_yes">الرياضة: نعم</string>
+    <string name="poi_ref_post">الرمز البريدي</string>
+    <string name="poi_letter_box">صندوق الرسائل</string>
+    <string name="poi_depot">مستودع</string>
+    <string name="poi_map_size_region">حجم الخريطة: المنطقة</string>
+    <string name="poi_map_size_city">حجم الخريطة: المدينة</string>
+    <string name="poi_map_size_site">حجم الخريطة: الموقع</string>
+    <string name="poi_map_type_toposcope">نوع الخريطة: الطبوغرافية التي توضح معالم الاتجاهات</string>
+    <string name="poi_map_type_scheme">نوع الخريطة: مخطط</string>
+    <string name="poi_map_type_topo">نوع الخريطة: طبوغرافية</string>
+    <string name="poi_charging_station_output">مخرج محطة الشحن</string>
+    <string name="poi_amperage">التيار/أمبير</string>
+    <string name="poi_parking_fee_no">رسوم وقوف السيارات: لا</string>
+    <string name="poi_parking_fee_yes">رسوم وقوف السيارات: نعم</string>
+    <string name="poi_truck_no">شاحنة: لا</string>
+    <string name="poi_truck_yes">شاحنة: نعم</string>
+    <string name="poi_socket_cee_red_32a_current">المقبس: CEE الأحمر 32A: التيار</string>
+    <string name="poi_socket_cee_red_64a_current">المقبس: CEE الأحمر 64A: التيار</string>
+    <string name="poi_socket_cee_red_125a_current">‍المقبس: CEE الأحمر 125A: التيار</string>
+    <string name="poi_socket_type1_current">مأخذ التوصيل: النوع 1: التيار</string>
+    <string name="poi_socket_type1_combo_current">مأخذ التوصيل: نوع 1 التحرير والسرد: التيار</string>
+    <string name="poi_socket_type2_current">مأخذ التوصيل: النوع 2: التيار</string>
+    <string name="poi_socket_type2_combo_current">المقبس: نوع 2 التحرير والسرد: التيار</string>
+    <string name="poi_socket_type3_current">مأخذ التوصيل: النوع 3: التيار</string>
+    <string name="poi_socket_chademo_current">المقبس: CHAdeMO: التيار</string>
+    <string name="poi_socket_tesla_roadster_current">المقبس: تيسلا رودستر: التيار</string>
+    <string name="poi_socket_nema_14_50_current">المقبس: نيما 14-50: التيار</string>
+    <string name="poi_socket_cee_red_16a_current">المقبس: CEE الأحمر 16A: التيار</string>
+    <string name="poi_socket_cee_blue_current">المقبس: CEE الأزرق: التيار</string>
+    <string name="poi_scooter_no">سكوتر: لا</string>
+    <string name="poi_scooter_yes">سكوتر: نعم</string>
+    <string name="poi_bicycle_no">الدراجة: لا</string>
+    <string name="poi_bicycle_yes">الدراجة: نعم</string>
+    <string name="poi_car_no">السيارة: لا</string>
+    <string name="poi_car_yes">السيارة: نعم</string>
+    <string name="poi_socket_as3112_output">المقبس: AS / NZS 3112: الإخراج</string>
+    <string name="poi_socket_as3112_current">المقبس: AS / NZS 3112: التيار</string>
+    <string name="poi_socket_as3112">المقبس: AS / NZS 3112</string>
+    <string name="poi_socket_bs1363_output">المقبس: BS 1363: الإخراج</string>
+    <string name="poi_socket_bs1363_current">مأخذ التوصيل: BS 1363: التيار</string>
+    <string name="poi_socket_bs1363">المقبس: BS 1363</string>
+    <string name="poi_socket_schuko_output">المقبس: شوكو: الإخراج</string>
+    <string name="poi_socket_schuko_current">المقبس: Schuko: التيار</string>
+    <string name="poi_socket_schuko">المقبس: شوكو</string>
+    <string name="poi_socket_nema_14_50_output">المقبس: نيما 14-50: الإخراج</string>
+    <string name="poi_socket_nema_14_50">المقبس: نيما 14-30</string>
+    <string name="poi_socket_nema_14_30_output">المقبس: نيما 14-30: الإخراج</string>
+    <string name="poi_socket_nema_14_30_current">المقبس: نيما 14-30: التيار</string>
+    <string name="poi_socket_nema_14_30">المقبس: نيما 14-30</string>
+    <string name="poi_socket_nema_5_20_output">المقبس: نيما 5-20: الإخراج</string>
+    <string name="poi_socket_nema_5_20_current">المقبس: نيما 5-20: التيار</string>
+    <string name="poi_socket_nema_5_20">المقبس: نيما 5-20</string>
+    <string name="poi_socket_nema_5_15_output">المقبس: نيما 5-15R: الإخراج</string>
+    <string name="poi_socket_nema_5_15_current">المقبس: نيما 5-15R: التيار</string>
+    <string name="poi_socket_nema_5_15">المقبس: نيما 5-15R</string>
+    <string name="poi_socket_tesla_roadster_output">المقبس: تسلا رودستر: الإخراج</string>
+    <string name="poi_socket_tesla_roadster">المقبس: تسلا رودستر</string>
+    <string name="poi_socket_tesla_supercharger_output">المقبس: تسلا شاحن: الإخراج</string>
+    <string name="poi_socket_tesla_supercharger_current">المقبس: تسلا شاحن: التيار</string>
+    <string name="poi_socket_tesla_supercharger">المقبس: تسلا سوبر تشارج</string>
+    <string name="poi_socket_tesla_standard_output">المقبس: معيار تسلا: الإخراج</string>
+    <string name="poi_socket_tesla_standard_current">المقبس: معيار تسلا: التيار</string>
+    <string name="poi_socket_tesla_standard">المقبس: معيار تسلا</string>
+    <string name="poi_socket_chademo_output">مأخذ التوصيل: CHAdeMO: الإخراج</string>
+    <string name="poi_socket_chademo">المقبس: شاديمو</string>
+    <string name="poi_socket_type3_output">مأخذ التوصيل: النوع 3: الإخراج</string>
+    <string name="poi_socket_type3">المقبس: النوع 3</string>
+    <string name="poi_socket_type2_combo_output">المقبس: النوع 2 التحرير والسرد: الإخراج</string>
+    <string name="poi_socket_type2_combo">المقبس: نوع 2 كومبو</string>
+    <string name="poi_socket_type2_output">مأخذ التوصيل: نوع 2: الإخراج</string>
+    <string name="poi_socket_type2">المقبس: النوع 2</string>
+    <string name="poi_socket_type1_combo_output">المقبس: نوع 1 التحرير والسرد: الإخراج</string>
+    <string name="poi_socket_type1_combo">المقبس: نوع 1 كومبو</string>
+    <string name="poi_socket_type1_output">مأخذ التوصيل: النوع 1: الإخراج</string>
+    <string name="poi_socket_type1">المقبس: النوع 1</string>
+    <string name="poi_socket_cee_red_125a_output">المقبس: CEE الأحمر 125A: الإخراج</string>
+    <string name="poi_socket_cee_red_125a">المقبس: CEE الأحمر 125A</string>
+    <string name="poi_socket_cee_red_64a_output">المقبس: CEE الأحمر 64A: الإخراج</string>
+    <string name="poi_socket_cee_red_64a">المقبس: CEE الأحمر 64A</string>
+    <string name="poi_socket_cee_red_32a_output">المقبس: CEE الأحمر 32A: الإخراج</string>
+    <string name="poi_socket_cee_red_32a">المقبس: CEE الأحمر 16A</string>
+    <string name="poi_socket_cee_red_16a_output">المقبس: CEE الأحمر 16A: الإخراج</string>
+    <string name="poi_socket_cee_red_16a">المقبس: CEE الأحمر 16A</string>
+    <string name="poi_socket_cee_blue_output">المقبس: CEE الأزرق: الإخراج</string>
+    <string name="poi_socket_cee_blue">المقبس: CEE الأزرق</string>
+    <string name="poi_water_place_access_multifamilies">عائلات متعددة</string>
+    <string name="poi_water_place_access_family">العائلة</string>
+    <string name="poi_water_place_access_community">المجتمع</string>
+    <string name="poi_water_supply_bottled_water">مياه معبأة</string>
+    <string name="poi_water_supply_water_tank">خزان ماء</string>
+    <string name="poi_water_supply_water_trucking">نقل المياه بالشاحنات</string>
+    <string name="poi_water_supply_borehole">الثقب</string>
+    <string name="poi_water_supply_pump">مضخة</string>
+    <string name="poi_water_supply_running_water">المياه الجارية</string>
+    <string name="poi_water_supply_pipeline">خط انابيب</string>
+    <string name="poi_water_supply_water_well">بئر ماء</string>
+    <string name="poi_water_purification_aquatabs">أكواتابس</string>
+    <string name="poi_water_purification_reverse_osmosis">التناضح العكسي</string>
+    <string name="poi_water_purification_chlorine">الكلور</string>
+    <string name="poi_water_purification_none">بدون</string>
+    <string name="poi_gpx_point">نقطة GPX</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_departures_board_no">لوحة المغادرين: لا</string>
+    <string name="poi_elevator">مصعد</string>
+    <string name="poi_city_block">كتلة المدينة</string>
+    <string name="poi_borough">محافظة</string>
+    <string name="poi_give_box">صندوق العطايا</string>
+    <string name="poi_traffic_signals_arrow_no">أسهم: لا</string>
+    <string name="poi_traffic_signals_arrow_yes">نعم</string>
+    <string name="poi_traffic_signals_vibration_yes">نعم</string>
+    <string name="poi_traffic_signals_vibration_no">الاهتزاز: لا</string>
+    <string name="poi_pump_status_missing_beam">حالة المضخة: شعاع مفقود</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">شفط</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">مضغوط</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">مياه جوفية</string>
+    <string name="poi_fire_hydrant_type_pipe">أنابيب</string>
+    <string name="poi_drinking_water_refill_network">شبكة تعبئة مياه الشرب</string>
+    <string name="poi_drinking_water_refill_no">إعادة تعبئة مياه الشرب:لا</string>
+    <string name="poi_drinking_water_refill_yes">نعم</string>
+    <string name="poi_seamark_obstruction">عائق</string>
+    <string name="poi_seamark_water_level_below_mwl">مستوى الماء: أقل من مستوى الماء</string>
+    <string name="poi_seamark_water_level_above_mwl">مستوى الماء: فوق متوسط مستوى الماء</string>
+    <string name="poi_seamark_water_level_floating">مستوى الماء: عائم</string>
+    <string name="poi_seamark_water_level_floods">مستوى الماء: فيضانات</string>
+    <string name="poi_seamark_water_level_awash">منسوب الماء: متقاذف/متلاطم</string>
+    <string name="poi_seamark_water_level_covers">مستوى الماء: يغطي</string>
+    <string name="poi_seamark_water_level_dry">مستوى الماء: جاف</string>
+    <string name="poi_seamark_water_level_submerged">مستوى الماء: مغمور</string>
+    <string name="poi_seamark_water_level_part_submerged">مستوى الماء: جزء مغمور</string>
+    <string name="poi_tactile_paving_incorrect">غير صحيح</string>
+    <string name="poi_tactile_paving_primitive">بدائي</string>
+    <string name="poi_tactile_paving_contrasted">متباين اللون</string>
+    <string name="poi_traffic_signals_sound_locate">فقط عندما يسمح بالمشي</string>
+    <string name="poi_video_no">لا</string>
+    <string name="poi_video_yes">نعم</string>
+    <string name="poi_booth">نوع الكشك</string>
+    <string name="poi_covered_booth">كشك</string>
+    <string name="poi_sms_no">لا</string>
+    <string name="poi_sms_yes">نعم</string>
+    <string name="poi_resort_hunting">قاعدة الصيد</string>
+    <string name="poi_piste_ref">رقم مرجع الزحلقة</string>
+    <string name="poi_bowling_alley">مركز البولينج</string>
+    <string name="poi_shop_security">متجر الأمن</string>
+    <string name="poi_mountain_rescue">إنقاذ الجبال</string>
+    <string name="poi_paintball">بينتبول (كرة الطلاء)</string>
+    <string name="poi_memorial_ghost_bike">دراجة الشبح</string>
+    <string name="poi_volcano_number_of_eruptions">عدد الانفجارات</string>
+    <string name="poi_volcano_status_inactive">خامل</string>
+    <string name="poi_volcano_status_active">نشط</string>
+    <string name="poi_volcano_status_dormant">في سبات</string>
+    <string name="poi_volcano_status_extinct">منطفئ/خامد</string>
+    <string name="poi_volcano_last_eruption">آخر ثوران بركاني</string>
+    <string name="poi_volcano_type_mud">طينيه</string>
+    <string name="poi_volcano_type_lava_dome">قبة الحمم البركانية</string>
+    <string name="poi_volcano_type_caldera">فوه بركانيه كبيرة</string>
+    <string name="poi_volcano_type_maar">لكن</string>
+    <string name="poi_volcano_type_shield">درع</string>
+    <string name="poi_volcano_type_stratovolcano">ستراتوفوكانو</string>
+    <string name="poi_volcano_type_scoria">سكوريا</string>
+    <string name="poi_url">الرابط</string>
+    <string name="poi_parking_space">أماكن لوقوف السيارات</string>
+    <string name="poi_grave">قبر</string>
+    <string name="poi_community_gender_male">جنس المجتمع: ذكر</string>
+    <string name="poi_community_gender_female">جنس المجتمع: أنثى</string>
+    <string name="poi_bath_open_air_no">لا</string>
+    <string name="poi_bath_open_air_yes">نعم</string>
+    <string name="poi_bath_type_foot_bath">حمام القدم</string>
+    <string name="poi_bath_type_lake">بحيرة</string>
+    <string name="poi_bath_type_river">نهر</string>
+    <string name="poi_bath_type_thermal">حراري</string>
+    <string name="poi_bath_type_hammam">حمام</string>
+    <string name="poi_bath_type_onsen">أونسن</string>
+    <string name="poi_bath_type_hot_spring">ينبوع ساخن</string>
+    <string name="poi_cash_withdrawal_postbank">بوستبنك</string>
+    <string name="poi_cash_withdrawal_girocard">جيروكارد</string>
+    <string name="poi_water_place_durability_emergency">قدرة تحمل المكان للماء: للطوارئ</string>
+    <string name="poi_operational_status_broken">معطل</string>
+    <string name="poi_operational_status_needs_maintenance">يحتاج إلى صيانة</string>
+    <string name="poi_operational_status_restricted">مقيد</string>
+    <string name="poi_operational_status_closed">مغلق</string>
+    <string name="poi_operational_status_open">مفتوح</string>
+    <string name="poi_visibility_area">الرؤية: المنطقة (أعلى من 50 متر)</string>
+    <string name="poi_visibility_street">الرؤية: الشارع (10-50 متر)</string>
+    <string name="poi_visibility_house">الرؤية: منزل (10 متر)</string>
+    <string name="poi_location_entrance">الموقع: المدخل</string>
+    <string name="poi_location_wall">الموقع: الجدار</string>
+    <string name="poi_location_bridge">الموقع: الجسر</string>
+    <string name="poi_location_kiosk">الموقع: كشك</string>
+    <string name="poi_location_platform">الموقع: منصة</string>
+    <string name="poi_location_indoor">الموقع: داخلي</string>
+    <string name="poi_location_outdoor">الموقع: في الهواء الطلق</string>
+    <string name="poi_location_rooftop">الموقع: السطح</string>
+    <string name="poi_location_roof">الموقع: السقف</string>
+    <string name="poi_location_overhead">الموقع: في الهواء</string>
+    <string name="poi_location_overground">الموقع: فوق الأرض</string>
+    <string name="poi_location_underwater">الموقع: تحت الماء</string>
+    <string name="poi_location_underground">الموقع: تحت الارض</string>
+    <string name="poi_surface_metal_grid">شبكة معدنية</string>
+    <string name="poi_surface_decoturf">DecoTurf</string>
+    <string name="poi_surface_artificial_turf">العشب الصناعي</string>
+    <string name="poi_surface_tartan">طرطان</string>
+    <string name="poi_surface_clay">طين</string>
+    <string name="poi_mountain_area">منطقة جبلية</string>
+    <string name="poi_gorge">أخدود/تلعة</string>
+    <string name="poi_government_social_services">الخدمات الاجتماعية</string>
+    <string name="poi_government_social_security">الضمان الاجتماعي</string>
+    <string name="poi_government_archive">أرشيف</string>
+    <string name="poi_network">الشبكة</string>
+    <string name="poi_boat_canoe_rental_rental_no">كانوي: لا</string>
+    <string name="poi_boat_canoe_rental_rental_yes">كانوي: نعم</string>
+    <string name="poi_boat_kayak_rental_rental_no">زوارق الكاياك: لا</string>
+    <string name="poi_boat_kayak_rental_rental_yes">زوارق الكاياك: نعم</string>
+    <string name="poi_boat_dinghy_rental_rental_no">زورق: لا</string>
+    <string name="poi_boat_dinghy_rental_rental_yes">زورق: نعم</string>
+    <string name="poi_boat_sailboat_rental_no">المراكب الشراعية: لا</string>
+    <string name="poi_boat_sailboat_rental_yes">المراكب الشراعية: نعم</string>
+    <string name="poi_boat_jetski_rental_no">جيتسكي: لا</string>
+    <string name="poi_boat_jetski_rental_yes">جيتسكي: نعم</string>
+    <string name="poi_boat_pedalboat_rental_no">الدواسات: لا</string>
+    <string name="poi_boat_pedalboat_rental_yes">الدواسات: نعم</string>
+    <string name="poi_boat_houseboat_rental_no">المراكب: لا</string>
+    <string name="poi_boat_houseboat_rental_yes">المراكب: نعم</string>
+    <string name="poi_boat_motorboat_rental_no">القوارب: لا</string>
+    <string name="poi_boat_motorboat_rental_yes">القوارب: نعم</string>
+    <string name="poi_boat_rental">تأجير قوارب</string>
+    <string name="poi_beds">أسرة/سرير</string>
+    <string name="poi_reservation_members_only">الحجز: للأعضاء فقط</string>
+    <string name="poi_reservation_no">الحجز: لا</string>
+    <string name="poi_reservation_yes">الحجز: نعم</string>
+    <string name="poi_reservation_recommended">الحجز المسبق: موصى به</string>
+    <string name="poi_reservation_required">الحجز المسبق: مطلوب</string>
+    <string name="poi_winter_room_no">غرفة الشتاء: لا</string>
+    <string name="poi_winter_room_yes">غرفة الشتاء: نعم</string>
+    <string name="poi_direction_down">الاتجاه: لأسفل</string>
+    <string name="poi_direction_up">اتجاه: لأعلى</string>
+    <string name="poi_direction_anticlockwise">الاتجاه: عكس اتجاه عقارب الساعة</string>
+    <string name="poi_direction_clockwise">الاتجاه: اتجاه عقارب الساعة</string>
+    <string name="poi_direction_backward">الاتجاه: للخلف</string>
+    <string name="poi_direction_forward">الاتجاه: إلى الأمام</string>
+    <string name="poi_direction_nnw">الاتجاه: الشمال والشمال الغربي</string>
+    <string name="poi_direction_nw">الاتجاه: شمال غربي</string>
+    <string name="poi_direction_wnw">الاتجاه: الغرب والشمال الغربي</string>
+    <string name="poi_direction_w">الاتجاه: الغرب</string>
+    <string name="poi_direction_wsw">الاتجاه: الغرب والجنوب الغربي</string>
+    <string name="poi_direction_sw">الاتجاه: جنوب غربي</string>
+    <string name="poi_direction_ssw">الاتجاه: الجنوب والجنوب الغربي</string>
+    <string name="poi_direction_s">الاتجاه: الجنوب</string>
+    <string name="poi_direction_sse">الاتجاه: جنوب-جنوب شرق</string>
+    <string name="poi_direction_se">الاتجاه: جنوب شرق</string>
+    <string name="poi_direction_ese">الاتجاه: شرق وجنوب شرق</string>
+    <string name="poi_direction_e">الاتجاه: شرق</string>
+    <string name="poi_direction_ene">الاتجاه: شرق - شمال شرق</string>
+    <string name="poi_direction_ne">الاتجاه: شمال شرقي</string>
+    <string name="poi_direction_nne">الاتجاه: الشمال والشمال الشرقي</string>
+    <string name="poi_direction_n">الاتجاه: شمال</string>
+    <string name="poi_spaceport">ميناء فضائي</string>
+    <string name="poi_animal_shelter_purpose_release_no">إطلاق السراح: لا</string>
+    <string name="poi_animal_shelter_purpose_release_yes">إطلاق السراح: نعم</string>
+    <string name="poi_animal_shelter_purpose_adoption_no">التبني: لا</string>
+    <string name="poi_animal_shelter_purpose_adoption_yes">التبني: نعم</string>
+    <string name="poi_owner">مالك</string>
+    <string name="poi_motorcycle_type_dualsport">مزدوج</string>
+    <string name="poi_motorcycle_type_offroad">الطرق الوعره</string>
+    <string name="poi_motorcycle_type_chopper">المروحيه</string>
+    <string name="poi_motorcycle_type_sportbike">دراجة رياضية</string>
+    <string name="poi_motorcycle_type_scooter">سكوتر</string>
+    <string name="poi_motorcycle_clothes_no">ملابس الدراجات النارية: لا توجد</string>
+    <string name="poi_motorcycle_clothes_yes">ملابس الدراجات النارية</string>
+    <string name="poi_motorcycle_tyres_no">إطارات: لا</string>
+    <string name="poi_motorcycle_tyres_yes">اطارات</string>
+    <string name="poi_motorcycle_parts_no">قطع غيار: لا</string>
+    <string name="poi_motorcycle_parts_yes">قطع غيار</string>
+    <string name="poi_motorcycle_repair_no">إصلاح: لا</string>
+    <string name="poi_motorcycle_repair_yes">إصلاح</string>
+    <string name="poi_motorcycle_rental_no">تأجير: لا</string>
+    <string name="poi_motorcycle_rental_yes">تأجير</string>
+    <string name="poi_motorcycle_sales_used">المبيعات: مستعملة</string>
+    <string name="poi_motorcycle_sales_yes_used">المبيعات: نعم ، مستعملة</string>
+    <string name="poi_motorcycle_sales_no">مبيعات: لا</string>
+    <string name="poi_motorcycle_sales_yes">مبيعات</string>
+    <string name="poi_stands">منصة</string>
+    <string name="poi_zoo_reptile">زواحف</string>
+    <string name="poi_zoo_falconry">صقور</string>
+    <string name="poi_zoo_aviary">مطير (قفص)</string>
+    <string name="poi_zoo_birds">طيور</string>
+    <string name="poi_zoo_safari_park">حديقة سفاري</string>
+    <string name="poi_zoo_enclosure">سياج</string>
+    <string name="poi_zoo_wildlife_park">حديقة حيوانات برية</string>
+    <string name="poi_zoo_petting_zoo">حديقة الحيوانات الأليفة</string>
+    <string name="poi_life_ring">طوق النجاة</string>
+    <string name="poi_language_school">مدرسة لغة</string>
+    <string name="poi_resort_kids_camp">مخيم للأطفال</string>
+    <string name="poi_electronics_repair_phone">إصلاح الإلكترونيات: الهاتف</string>
+    <string name="poi_electronics_repair_appliance">إصلاح الإلكترونيات: الأجهزة</string>
+    <string name="poi_electronics_repair_computer">إصلاح الإلكترونيات: أجهزة الكمبيوتر</string>
+    <string name="poi_energy_supplier">مكتب تجهيزات الطاقة</string>
+    <string name="poi_fast_food_cafeteria">نعم</string>
+    <string name="poi_coworking_space">مساحة عمل مشتركة</string>
+    <string name="poi_railway_yard">محطة الشحن</string>
+    <string name="poi_tower_construction_concealed">البناء: مخفي</string>
+    <string name="poi_tower_construction_dome">البناء: قبة</string>
+    <string name="poi_tower_construction_dish">البناء: طبق</string>
+    <string name="poi_tower_construction_freestanding">البناء: قائم بذاته</string>
+    <string name="poi_tower_construction_lattice">البناء: شبكة فولاذية</string>
+    <string name="poi_animal_keeping_type_open_stable">النوع: إسطبل مفتوح</string>
+    <string name="poi_animal_keeping_type_paddock">النوع:مربط خيول</string>
+    <string name="poi_charcoal_pile">كومة فحم</string>
+    <string name="poi_appliance">متجر الأجهزة</string>
+    <string name="poi_end_date">تاريخ الانتهاء</string>
+    <string name="poi_rock">صخرة</string>
+    <string name="poi_course">دورة</string>
+    <string name="poi_checkpoint_type_electronic">إلكتروني</string>
+    <string name="poi_checkpoint_type_needler">إبرة</string>
+    <string name="poi_checkpoint_type_notebook">دفتر ملاحظات</string>
+    <string name="poi_checkpoint_type_code">رمز</string>
+    <string name="poi_checkpoint_type_stamp">نقطة الختم</string>
+    <string name="poi_checkpoint_hiking">نقطة تفتيش للمشاة/الهايكنق</string>
+    <string name="poi_glacier_slope">متوسط الميلان</string>
+    <string name="poi_glacier_ele_bottom">أدنى نقطة</string>
+    <string name="poi_glacier_ele_top">أعلى نقطة</string>
+    <string name="poi_glacier_type_ice_tongue">اللسان الجليدي</string>
+    <string name="poi_glacier_type_remnant">بقايا</string>
+    <string name="poi_glacier_type_shelf">الجرف</string>
+    <string name="poi_glacier_type_rock">صخرة</string>
+    <string name="poi_glacier_type_icefall">انهيار الجليد</string>
+    <string name="poi_glacier_type_hanging">معلقة</string>
+    <string name="poi_glacier_type_mountain">جبل</string>
+    <string name="poi_glacier_type_tidewater">مياه المد</string>
+    <string name="poi_glacier_type_outlet">منفذ</string>
+    <string name="poi_glacier_type_valley">وادي</string>
+    <string name="poi_glacier_type_plateau">هضبة</string>
+    <string name="poi_glacier_type_icefield">الحقل الجليدي</string>
+    <string name="poi_glacier_type_icecap">الغطاء الجليدي</string>
+    <string name="poi_via_ferrata_scale">الصعوبة</string>
+    <string name="poi_cable_number">رقم الكابل</string>
+    <string name="poi_via_ferrata">فيا فيراتا (مسار الحديد)</string>
+    <string name="poi_climbing_adventure">مغامرة التسلق</string>
+    <string name="poi_aerialway_zip_line">المسار الإنزلاقي</string>
+    <string name="poi_service_vehicle_wheels_yes">كفرات/جنوط</string>
+    <string name="poi_service_vehicle_tyres_yes">الإطارات</string>
+    <string name="poi_service_vehicle_motor_yes">إصلاح مكاين/محركات</string>
+    <string name="poi_service_vehicle_transmission_repair_yes">إصلاح قير</string>
+    <string name="poi_service_vehicle_alignment_yes">ميزان/وزن أذرعة ومقصات</string>
+    <string name="poi_service_vehicle_muffler_yes">شكمان/كاتم صوت/دبات</string>
+    <string name="poi_service_vehicle_truck_repair_yes">تصليح شاحنات ومعدات ثقيلة</string>
+    <string name="poi_service_vehicle_glass_yes">زجاج</string>
+    <string name="poi_service_vehicle_electrical_yes">الكهربائية</string>
+    <string name="poi_service_vehicle_body_repair_yes">سمكرة وتعديل جسم السيارة</string>
+    <string name="poi_service_vehicle_air_conditioning_yes">تبريد/مكيفات</string>
+    <string name="poi_service_vehicle_batteries_yes">بطاريات</string>
+    <string name="poi_service_vehicle_car_parts_yes">قطع غيار السيارات</string>
+    <string name="poi_service_vehicle_diagnostics_yes">تشخيص/فحص</string>
+    <string name="poi_service_vehicle_new_car_sales_yes">مبيعات السيارات الجديدة</string>
+    <string name="poi_service_vehicle_brakes_yes">فرامل</string>
+    <string name="poi_service_vehicle_used_car_sales_yes">مبيعات السيارات المستعملة</string>
+    <string name="poi_service_vehicle_oil_change_yes">تغيير زيت</string>
+    <string name="poi_service_vehicle_car_repair_yes">إصلاح السيارات</string>
+    <string name="poi_water_utility">مكتب مرافق المياه</string>
+    <string name="poi_barbecue_grill">شواية: نعم</string>
+    <string name="poi_outpost">نقطة تسليم المحل</string>
+    <string name="poi_whitewater_rapid_name">اسم منحدرات النهر</string>
+    <string name="poi_pottery">فخار</string>
+    <string name="poi_flooring">متجر الأرضيات</string>
+    <string name="poi_socket_schuko_output_low">منخفض</string>
+    <string name="poi_socket_schuko_output_medium">متوسط</string>
+    <string name="poi_socket_schuko_output_high">عالي</string>
+    <string name="poi_socket_cee_blue_output_low">منخفض</string>
+    <string name="poi_socket_cee_blue_output_medium">متوسط</string>
+    <string name="poi_socket_cee_blue_output_high">عالي</string>
+    <string name="poi_socket_type3_output_low">منخفض</string>
+    <string name="poi_socket_type3_output_medium">متوسط</string>
+    <string name="poi_socket_type3_output_high">عالي</string>
+    <string name="poi_socket_type2_combo_output_low">منخفض</string>
+    <string name="poi_socket_type2_combo_output_medium">متوسط</string>
+    <string name="poi_socket_type2_combo_output_high">عالي</string>
+    <string name="poi_socket_type2_output_low">منخفض</string>
+    <string name="poi_socket_type2_output_medium">متوسط</string>
+    <string name="poi_socket_type2_output_high">عالي</string>
+    <string name="poi_socket_chademo_output_low">منخفض</string>
+    <string name="poi_socket_chademo_output_medium">متوسط</string>
+    <string name="poi_socket_chademo_output_high">عالي</string>
+    <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
+    <string name="poi_socket_bs1363_yes">BS 1363</string>
+    <string name="poi_picnic_table">طاولة نزهة</string>
+    <string name="poi_viewpoint">وجهة نظر</string>
+    <string name="poi_religious">منطقة دينية</string>
+    <string name="poi_internet_access_fee_yes">الوصول إلى الإنترنت: رسوم مفروضة</string>
+    <string name="poi_internet_access_yes">الوصول إلى الإنترنت: نعم</string>
+    <string name="poi_internet_access_service">الوصول إلى الإنترنت: خدمة</string>
+    <string name="poi_internet_access_public">الوصول إلى الإنترنت: عام</string>
+    <string name="poi_internet_access_wired">ولوج الإنترنت: سلكي</string>
+    <string name="poi_internet_access_terminal">"ولوج  الإنترنت: terminal"</string>
+    <string name="poi_internet_access_wlan">ولوج الإنترنت: wlan</string>
+    <string name="poi_denomination_mahayana">ماهايانا</string>
+    <string name="poi_denomination_maronite">ماروني</string>
+    <string name="poi_denomination_shingon_shu">شينجون شو</string>
+    <string name="poi_denomination_coptic_orthodox">ارثوذكسي قبطي</string>
+    <string name="poi_denomination_unitarian">موحد</string>
+    <string name="poi_denomination_ethiopian_orthodox_tewahedo">الأرثوذكسية الإثيوبية التوحيدية</string>
+    <string name="poi_denomination_romanian_orthodox">الأرثوذكسية الرومانية</string>
+    <string name="poi_denomination_scientist">عالم</string>
+    <string name="poi_denomination_georgian_orthodox">الأرثوذكسية الجورجية</string>
+    <string name="poi_denomination_united_church_of_christ">كنيسة المسيح المتحدة</string>
+    <string name="poi_denomination_church_of_christ">كنيسة المسيح</string>
+    <string name="poi_denomination_latter_day_saints">قديسي اليوم الأخير</string>
+    <string name="poi_denomination_reform">اصلاح</string>
+    <string name="poi_denomination_apostolic">رسولي</string>
+    <string name="poi_denomination_armenian_apostolic">رسولي أرميني</string>
+    <string name="poi_denomination_spiritist">روحاني</string>
+    <string name="poi_denomination_serbian_orthodox">الأرثوذكسية الصربية</string>
+    <string name="poi_denomination_old_believers">المؤمنون القدامى</string>
+    <string name="poi_denomination_congregational">تجمعي</string>
+    <string name="poi_denomination_nazarene">ناصري</string>
+    <string name="poi_denomination_adventist">سبتي</string>
+    <string name="poi_denomination_nondenominational">غير طائفي</string>
+    <string name="poi_denomination_assemblies_of_god">تجميعات الإله</string>
+    <string name="poi_denomination_bulgarian_orthodox">الأرثوذكسية البلغارية</string>
+    <string name="poi_denomination_quaker">كواكر</string>
+    <string name="poi_denomination_mennonite">مينونايت</string>
+    <string name="poi_denomination_uniting">توحيد</string>
+    <string name="poi_denomination_iglesia_ni_cristo">كنيسة إغليسيا ني كريستو</string>
+    <string name="poi_denomination_salvation_army">جيش الخلاص</string>
+    <string name="poi_denomination_church_of_scotland">كنيسة اسكتلندا</string>
+    <string name="poi_denomination_united_reformed">الكنيسة الإصلاحية الموحدة</string>
+    <string name="poi_denomination_tibetan">التبت</string>
+    <string name="poi_denomination_greek_catholic">كاثوليكي يوناني</string>
+    <string name="poi_denomination_united">متحد</string>
+    <string name="poi_denomination_episcopal">الأسقفية</string>
+    <string name="poi_denomination_church_of_england">كنيسة إنجلترا</string>
+    <string name="poi_denomination_new_apostolic">رسولي جديد</string>
+    <string name="poi_denomination_seventh_day_adventist">سبتي (مؤمن برجوع المسيح في اليوم السابع)</string>
+    <string name="poi_denomination_reformed">تم إصلاحه</string>
+    <string name="poi_denomination_greek_orthodox">الأرثوذكسية اليونانية</string>
+    <string name="poi_denomination_jehovahs_witness">شهود يهوه</string>
+    <string name="poi_denomination_mormon">المورمون</string>
+    <string name="poi_denomination_anglican">الأنجليكانية</string>
+    <string name="poi_religion_zoroastrian">الزرادشتية</string>
+    <string name="poi_religion_tenrikyo">ديانة تينريكيو اليابانية</string>
+    <string name="poi_religion_scientologist">علم السايونتولوجيا</string>
+    <string name="poi_religion_bahai">البهائية</string>
+    <string name="poi_religion_jain">الديانة الجاينية الهندية</string>
+    <string name="poi_religion_unitarian_universalist">التوحيد الكوني</string>
+    <string name="poi_attraction_train">قطار (سياحي)</string>
+    <string name="poi_attraction_swing_carousel">أرجوحة ملاهي دوارة</string>
+    <string name="poi_attraction_summer_toboggan">التزحلق الصيفي</string>
+    <string name="poi_attraction_roller_coaster">قطار الملاهي</string>
+    <string name="poi_attraction_maze">متاهة</string>
+    <string name="poi_attraction_carousel">دائري</string>
+    <string name="poi_attraction_big_wheel">عجلة فيريس/ملاهي</string>
+    <string name="poi_attraction_animal">حيوان (جذب)</string>
+    <string name="poi_attraction_amusement_ride">جولة تسلية</string>
+    <string name="poi_tourism_yes">شيء سياحي</string>
+    <string name="poi_attraction">جذب سياحى</string>
+    <string name="poi_historic_mine">منجم تاريخي</string>
+    <string name="poi_wreck">حطام سفينة</string>
+    <string name="poi_rune_stone">حجر الشاهد القائم الروني</string>
+    <string name="poi_historic_tank">دبابة تاريخية</string>
 </resources>

OsmAnd/res/values-ar/strings.xml

@@ -471,7 +471,7 @@
     <string name="index_name_africa">إفريقيا</string>
     <string name="index_name_asia">آسيا</string>
     <string name="index_name_oceania">أستراليا و أوقيانوسيا</string>
-    <string name="routing_settings">الملاحة</string>
+    <string name="routing_settings">التوجيه مع الطرق</string>
     <string name="routing_settings_descr">ضبط خاص لكل وضع من أوضاع الملاحة.</string>
     <string name="index_settings">إدارة بيانات الخرائط</string>
     <string name="general_settings">إعدادات عامة</string>
@@ -1153,7 +1153,7 @@
     <string name="action_delete">حذف إجراء</string>
     <string name="osm_edits">التعديلات</string>
     <string name="parking_place_limited">وقت وقوف السيارات يقتصر على</string>
-    <string name="shared_string_collapse">أقل</string>
+    <string name="shared_string_collapse">تدلي</string>
     <string name="drawer">قائمة منبسطة</string>
     <string name="osm_settings">تعديل OSM</string>
     <string name="free">فارغ %1$s</string>
@@ -2454,7 +2454,7 @@
     <string name="measurement_tool_action_bar">تصفح الخريطة وإضافة نقاط</string>
     <string name="measurement_tool">قياس المسافة</string>
     <string name="none_point_error">الرجاء إضافة نقطة واحدة على الأقل.</string>
-    <string name="enter_gpx_name">اسم مسار الـGPX :</string>
+    <string name="enter_gpx_name">اسم مسار GPX :</string>
     <string name="show_on_map_after_saving">عرض على الخريطة بعد الحفظ</string>
     <string name="add_waypoint">إضافة نقطة</string>
     <string name="save_gpx_waypoint">حفظ نقطة GPX</string>
@@ -3329,7 +3329,7 @@
     <string name="routing_attr_piste_type_skitour_name">جولة تزلج</string>
     <string name="routing_attr_piste_type_skitour_description">طرق لجولات التزلج.</string>
     <string name="routing_attr_piste_type_sled_name">تزلج</string>
-    <string name="routing_attr_piste_type_sled_description">منحدرات للاستخدام الزلاجات.</string>
+    <string name="routing_attr_piste_type_sled_description">منحدرات لاستخدام الزلاجات.</string>
     <string name="routing_attr_allow_intermediate_name">السماح بالمسارات المتوسطة</string>
     <string name="routing_attr_allow_intermediate_description">طرق أكثر صعوبة مع أقسام أكثر حدة. بعض العقبات التي ينبغي تجنبها.</string>
     <string name="routing_attr_allow_advanced_name">السماح للطرق المتقدمة</string>
@@ -3909,10 +3909,10 @@
     <string name="complex_routing_descr">التوجيه على مرحلتين لملاحة السيارة.</string>
     <string name="use_native_pt">تطوير النقل العام المحلي</string>
     <string name="use_native_pt_desc">قم بالتبديل إلى Java (الآمن) حساب توجيه النقل العام</string>
-    <string name="perform_oauth_authorization_description">قم بتسجيل الدخول إلى OAuth لاستخدام ميزات osmedit</string>
+    <string name="perform_oauth_authorization_description">سجّل الدخول باستخدام OAuth لاستخدام ميزات osmedit</string>
     <string name="perform_oauth_authorization">تسجيل الدخول عبر OAuth</string>
     <string name="clear_osm_token">مسح رمز OpenStreetMap OAuth</string>
-    <string name="osm_edit_logout_success">تسجيل الخروج بنجاح</string>
+    <string name="osm_edit_logout_success">تم تسجيل الخروج</string>
     <string name="file_already_imported">تم استيراد الملف بالفعل في أوسماند</string>
     <string name="use_two_phase_routing">استخدام خوارزمية توجيه من مرحلتين A*</string>
     <string name="message_need_calculate_route_before_show_graph">%1$s البيانات المتوفرة فقط على الطرق ، تحتاج إلى حساب طريق باستخدام \"الطريق بين النقاط\" للحصول عليها.</string>
@@ -3940,32 +3940,44 @@
     <string name="subscription_expired_title">انتهت صلاحية اشتراك OsmAnd Live</string>
     <string name="subscription_paused_title">تم إيقاف اشتراك OsmAnd Live مؤقتًا</string>
     <string name="subscription_on_hold_title">اشتراك OsmAnd Live معلق</string>
-    <string name="login_open_street_map">تسجيل الدخول إلى خريطة الشارع المفتوح</string>
+    <string name="login_open_street_map">تسجيل الدخول ل OpenStreetMap</string>
     <string name="login_open_street_map_org">تسجيل الدخول إلى OpenStreetMap.org</string>
-    <string name="open_street_map_login_mode">تحتاج إلى تسجيل الدخول لرفع التغييرات الجديدة أو المعدلة.
+    <string name="open_street_map_login_mode">قم بتسجيل الدخول لرفع التغييرات الجديدة أو المعدلة.
 \n
-\nيمكنك تسجيل الدخول باستخدام طريقة التفويض الآمنة أو استخدام تسجيل الدخول وكلمة المرور.</string>
+\nإما باستخدام OAuth أو باستخدام اسم المستخدم وكلمة المرور.</string>
-    <string name="use_login_password">استخدام تسجيل الدخول وكلمة المرور</string>
+    <string name="use_login_password">سجل الدخول باسم المستخدم وكلمة المرور</string>
     <string name="login_account">الحساب</string>
-    <string name="user_login">تسجيل الدخول</string>
+    <string name="user_login">اسم المستخدم</string>
     <string name="gpx_upload_trackable_visibility_descr">\"إمكانية التتبع\" تعني أن التتبع لا يظهر في أي قوائم عامة ولكن نقاط التتبع المعالجة مع طوابع زمنية صادرة عنها(التي لا يمكن أن تكون مرتبطة بك مباشرة) ستظهر خلال التنزيلات من واجهة برمجة التطبيقات GPS API العامة.</string>
     <string name="markers_history">سجل تاريخ العلامات</string>
     <string name="send_files_to_openstreetmap">أرسل ملف GPX إلى OpenStreetMap</string>
     <string name="enter_text_separated">أدخل العلامات مفصولة بفاصلة.</string>
     <string name="gpx_upload_private_visibility_descr">\"خاص\"يعني أن التتبع لن يظهر في أي قوائم عامة ، ولكن نقاط التتبع الصادرة عنه ستظل متاحة من خلال واجهة برمجة تطبيقات GPS API العامة بدون طوابع زمنية ولكن لن يتم ترتيبها ترتيبًا زمنيًا.</string>
-    <string name="sign_in_with_open_street_map">قم بتسجيل الدخول باستخدام OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">سجّل الدخول باستخدام OpenStreetMap</string>
     <string name="gpx_upload_public_visibility_descr">عام يعني أنه سيتم عرض التتبع بشكل عام في تتبعات GPS الخاصة بك وفي قوائم تتبع GPS العامة. البيانات المقدمة عبر API لا تشير إلى صفحة التتبع الخاصة بك. الطوابع الزمنية لنقاط التتبع غير متاحة من خلال واجهة برمجة تطبيقات GPS API العامة، والنقاط غير مرتبة ترتيبًا زمنيًا. ومع ذلك، لا يزال المستخدمون الآخرون قادرين على تنزيل التتبع الأولي من قائمة التتبع العامة وأي طوابع زمنية مضمنة فيه.</string>
     <string name="gpx_upload_identifiable_visibility_descr">متعرف عليه يعني أنه سيتم عرض التتبع بشكل عام في تتبعات GPS الخاصة بك وفي قوائم تتبع GPS العامة، أي سيتمكن المستخدمون الآخرون من تنزيل التتبع الأولي وربطه باسم المستخدم الخاص بك. ستشير البيانات التي يتم تقديمها عبر API نقاط التتبع إلى صفحة التتبع الأصلية الخاصة بك. الطوابع الزمنية لنقاط التتبع متاحة من خلال واجهة برمجة تطبيقات GPS API العامة.</string>
     <string name="osm_edit_close_note">أغلاق ملاحظة OSM</string>
     <string name="osm_edit_comment_note">تعليق ملاحظة OSM</string>
-    <string name="osm_login_descr">يمكنك تسجيل الدخول باستخدام طريقة OAuth الآمنة أو استخدام تسجيل الدخول وكلمة المرور الخاصة بك.</string>
+    <string name="osm_login_descr">قم بتسجيل الدخول باستخدام طريقة OAuth الآمنة أو استخدم اسم المستخدم وكلمة المرور.</string>
     <string name="shared_string_add_photo">إضافة صورة</string>
     <string name="register_on_openplacereviews">سجل في
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">يتم توفير الصور من خلال مشروع البيانات المفتوحة OpenPlaceReviews.org. من أجل رفع الصور الخاصة بك، تحتاج إلى الاشتراك بالموقع.</string>
+    <string name="register_on_openplacereviews_desc">قم بتسجيل الدخول إلى موقع مشروع البيانات المفتوحة OpenPlaceReviews.org لرفع المزيد من الصور.</string>
     <string name="register_opr_create_new_account">إنشاء حساب جديد</string>
     <string name="register_opr_have_account">لدي حساب بالفعل</string>
     <string name="app_mode_kayak">كاياك (قوارب صغيرة فردية)</string>
     <string name="app_mode_motorboat">زورق</string>
     <string name="shared_string_search_history">سجل البحث</string>
+    <string name="export_not_enough_space_descr">جهازك يحتوي على %1$s فقط متاحة . الرجاء إخلاء بعض المساحة أو إلغاء تحديد بعض العناصر للتصدير.</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">لا يوجد مساحة كافية</string>
+    <string name="add_to_mapillary">أضف إلى مابيلاي</string>
+    <string name="add_to_opr">إضافة إلى OpenPlaceReviews</string>
+    <string name="add_photos_descr">ويعرض صورًا من عدة مصادر:
+\nOpenPlaceReviews - صور POI ؛
+\nMapillary - صور على مستوى الشارع ؛
+\nالويب / ويكيميديا - صور POI المحددة في بيانات OpenStreetMap.</string>
 </resources>

OsmAnd/res/values-az/strings.xml

@@ -1700,8 +1700,8 @@
     <string name="group_will_be_removed_after_restart">Proqramı növbəti dəfə başlatdığınızda qrup yox olacaq.</string>
     <string name="show_arrows_on_the_map">Xəritədə oxları göstər</string>
     <string name="remove_from_map_markers">Xəritə işarələrindən sil</string>
-    <string name="descendingly">azalan</string>
+    <string name="descendingly">Z-A</string>
-    <string name="ascendingly">artan</string>
+    <string name="ascendingly">A-Z</string>
     <string name="date_added">Əlavə edildi</string>
     <string name="order_by">Sırala:</string>
     <string name="all_markers_moved_to_history">Bütün xəritə işarələri tarixçəyə daşındı</string>
@@ -2069,7 +2069,7 @@
     <string name="shared_string_wikivoyage">Vikisəyahət</string>
     <string name="shared_string_topbar">Üst panel</string>
     <string name="osm_recipient_stat">%1$s düzəliş, cəmi %2$s mBTC</string>
-    <string name="plan_route_create_new_route">Ye</string>
+    <string name="plan_route_create_new_route">Yeni marşrut yarat</string>
     <string name="shared_string_done">Hazırdır</string>
     <string name="navigation_profile">Naviqasiya profili</string>
     <string name="use_live_public_transport">OsmAnd Live məlumatları</string>
@@ -2090,4 +2090,84 @@
     <string name="user_login">İstifadəçi adı</string>
     <string name="shared_string_add_photo">Şəkil əlavə et</string>
     <string name="register_opr_create_new_account">Yeni hesab yarat</string>
+    <string name="shared_string_restore">Bərpa et</string>
+    <string name="metric_ton">t</string>
+    <string name="cubic_m">m³</string>
+    <string name="dont_move_maps">Daşıma</string>
+    <string name="move_maps">Xəritələri daşı</string>
+    <string name="files_copied">%1$d fayl kopyalandı (%2$s).</string>
+    <string name="files_moved">%1$d fayl daşındı (%2$s).</string>
+    <string name="searching_gps">GPS axtarılır</string>
+    <string name="application_profiles">Proqram profilləri</string>
+    <string name="profile_name_hint">Profil adı</string>
+    <string name="shared_string_allow">İcazə ver</string>
+    <string name="shared_string_no_thank_you">Xeyr, təşəkkürlər</string>
+    <string name="shared_string_icon">İkon</string>
+    <string name="shared_string_file_is_saved">%s saxlandı</string>
+    <string name="shared_string_default">Standart</string>
+    <string name="price_free">Pulsuz</string>
+    <string name="months_3">Üç ay</string>
+    <string name="years_5">İl</string>
+    <string name="years_2_4">İl</string>
+    <string name="year">İl</string>
+    <string name="months_5">Ay</string>
+    <string name="months_2_4">Ay</string>
+    <string name="month">Ay</string>
+    <string name="weeks_5">Həftə</string>
+    <string name="weeks_2_4">Həftə</string>
+    <string name="week">Həftə</string>
+    <string name="days_5">Gün</string>
+    <string name="days_2_4">Gün</string>
+    <string name="day">Gün</string>
+    <string name="osmand_settings">OsmAnd parametrləri</string>
+    <string name="shared_string_select_folder">Qovluq…</string>
+    <string name="data_storage_space_description">%1$s GB boş (%2$s GB-dan)</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
+    <string name="shared_string_memory_mb_desc">%1$s MB</string>
+    <string name="shared_string_memory_gb_desc">%1$s GB</string>
+    <string name="shared_string_memory_tb_desc">%1$s TB</string>
+    <string name="shared_string_maps">Xəritələr</string>
+    <string name="shared_string_calculate">Hesabla</string>
+    <string name="update_all_maps">Bütün xəritələri yenilə</string>
+    <string name="rendering_value_white_name">Ağ</string>
+    <string name="shared_string_downloading_formatted">%s endirilir</string>
+    <string name="app_mode_osm">OSM</string>
+    <string name="login_and_pass">İstifadəçi adı və şifrə</string>
+    <string name="monitoring_notification">Bildiriş</string>
+    <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
+    <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
+    <string name="shared_string_menu">Menyu</string>
+    <string name="open_settings">Parametrləri aç</string>
+    <string name="shared_string_profiles">Profillər</string>
+    <string name="shared_string_angle">Bucaq</string>
+    <string name="shared_string_angle_param">Bucaq: %s°</string>
+    <string name="profile_type_custom_string">Xüsusi profil</string>
+    <string name="saving_new_profile">Yeni profil saxlanılır</string>
+    <string name="n_items_of_z">%2$s-dən %1$s</string>
+    <string name="shared_string_languages">Dillər</string>
+    <string name="shared_string_language">Dil</string>
+    <string name="shared_string_all_languages">Bütün dillər</string>
+    <string name="custom_color">Xüsusi rəng</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="favorites_item">Favoritlər</string>
+    <string name="navigation_profiles_item">Naviqasiya profilləri</string>
+    <string name="shared_string_add_profile">Profil əlavə et</string>
+    <string name="change_application_profile">Proqram profilini dəyiş</string>
+    <string name="shared_string_always">Hər zaman</string>
+    <string name="sqlite_db_file">SQLiteDB faylı</string>
+    <string name="shared_string_delete_all_q">Hamısı silinsin\?</string>
+    <string name="keep_active">Aktiv saxla</string>
+    <string name="shared_string_uninstall">Sil</string>
+    <string name="shared_string_tones">ton</string>
+    <string name="shared_string_meters">metr</string>
+    <string name="quick_action_showhide_mapillary_title">Mapillary-ni göstər/gizlət</string>
+    <string name="quick_action_mapillary_hide">Mapillary-ni gizlət</string>
+    <string name="quick_action_mapillary_show">Mapillary-ni göstər</string>
+    <string name="item_deleted">%1$s silindi</string>
+    <string name="shared_string_uninstall_and_restart">Sil və yenidən başlat</string>
+    <string name="search_download_wikipedia_maps">Vikipediya xəritələrini endir</string>
+    <string name="osm_edit_closed_note">Bağlanmış OSM qeydi</string>
+    <string name="shared_string_custom">Xüsusi</string>
+    <string name="plan_route_last_edited">Son düzəliş</string>
 </resources>

OsmAnd/res/values-cs/strings.xml

@@ -1521,7 +1521,7 @@ Délka %2$s</string>
     <string name="routing_attr_height_name">Výškové omezení</string>
     <string name="routing_attr_height_description">Zadejte výšku vozidla, která musí být povolena na cestách.</string>
     <string name="use_fast_recalculation">Inteligentní přepočítávání trasy</string>
-    <string name="use_fast_recalculation_desc">Pro dlouhé cesty přepočítat pouze počáteční úsek trasy.</string>
+    <string name="use_fast_recalculation_desc">Přepočítá pouze počáteční úsek trasy. Může se hodit pro dlouhé trasy.</string>
     <string name="shared_string_logoff">Odhlásit</string>
     <string name="shared_string_import2osmand">Importovat do OsmAnd</string>
     <string name="read_full_article">Přečíst celý článek (on-line)</string>
@@ -3090,15 +3090,15 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="app_mode_offroad">Terénní</string>
     <string name="edit_profile_setup_title">Nastavit profil</string>
     <string name="edit_profile_setup_subtitle">Profil si udrží své vlastní nastavení</string>
-    <string name="edit_profile_setup_map_subtitle">Vybrat výchozí nastavení mapy u profilu</string>
+    <string name="edit_profile_setup_map_subtitle">Zvolte nastavení mapy pro profil</string>
-    <string name="edit_profile_screen_options_subtitle">Vybrat výchozí nastavení obrazovky u profilu</string>
+    <string name="edit_profile_screen_options_subtitle">Zvolte nastavení obrazovky pro profil</string>
-    <string name="edit_profile_nav_settings_subtitle">Vybrat výchozí nastavení navigace u profilu</string>
+    <string name="edit_profile_nav_settings_subtitle">Zvolte nastavení navigace pro profil</string>
     <string name="routing_attr_max_num_changes_description">Určete maximální počet přestupů</string>
     <string name="routing_attr_max_num_changes_name">Počet přestupů</string>
     <string name="turn_screen_on_router">Probudit na odbočce</string>
-    <string name="turn_screen_on_time_descr">Nastavte čas, po který bude obrazovka zapnutá.</string>
+    <string name="turn_screen_on_time_descr">Nastavte, jak dlouho bude obrazovka zapnutá.</string>
     <string name="turn_screen_on_sensor">Použít senzor přiblížení</string>
-    <string name="turn_screen_on_sensor_descr">Zamávejte rukou přes horní část obrazovky pro zapnutí obrazovky při navigování.</string>
+    <string name="turn_screen_on_sensor_descr">Zamávání rukou nad obrazovkou ji zapne.</string>
     <string name="rendering_attr_highway_class_track_grade1_name">1. třída</string>
     <string name="rendering_attr_highway_class_track_grade2_name">2. třída</string>
     <string name="rendering_attr_highway_class_track_grade3_name">3. třída</string>
@@ -3110,7 +3110,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="sett_generic_ext_input">Obecná klávesnice</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="sett_parrot_ext_input">Parrot</string>
-    <string name="turn_on_profile_desc">Prosíme, zapněte alespoň jeden profil aplikace, pro použití tohoto nastavení.</string>
+    <string name="turn_on_profile_desc">Pro použití tohoto nastavení zapněte prosím alespoň jeden profil aplikace.</string>
     <string name="rendering_attr_winter_road_name">Zimní cesta</string>
     <string name="rendering_attr_ice_road_name">Ledová cesta</string>
     <string name="routeInfo_winter_ice_road_name">Zimní a ledové cesty</string>
@@ -3159,7 +3159,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="list_of_installed_plugins">Nainstalované moduly</string>
     <string name="configure_navigation">Nastavení navigace</string>
     <string name="general_settings_profile_descr">Vzhled aplikace, jednotky, oblast</string>
-    <string name="screen_alerts_descr">Upozornění jsou zobrazena vlevo dole během navigace.</string>
+    <string name="screen_alerts_descr">Upozornění zobrazená vlevo dole během navigace.</string>
     <string name="language_and_output">Jazyk a výstup</string>
     <string name="reset_to_default">Obnovit do základního nastavení</string>
     <string name="manage_profiles">Spravovat profily aplikace…</string>
@@ -3170,14 +3170,14 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="map_during_navigation_info">Mapa během navigace</string>
     <string name="map_during_navigation">Mapa během navigace</string>
     <string name="shared_string_other">Další</string>
-    <string name="vehicle_parameters_descr">Hmotnost, výška, rychlost</string>
+    <string name="vehicle_parameters_descr">Hmotnost, výška, délka, rychlost</string>
     <string name="vehicle_parameters">Parametry vozidla</string>
     <string name="voice_announces_info">Hlasová oznámení se přehrávají pouze během navigace.</string>
     <string name="voice_announces_descr">Navigační pokyny a oznámení</string>
     <string name="voice_announces">Hlasová oznámení</string>
     <string name="route_parameters_descr">Konfigurace parametrů trasy</string>
     <string name="route_parameters">Parametry trasy</string>
-    <string name="default_speed_dialog_msg">Použito pro odhadnutí času příjezdu u cest s neznámým povrchem a pro omezení rychlosti u všech cest (může ovlivnit trasu)</string>
+    <string name="default_speed_dialog_msg">Odhaduje času příjezdu u cest s neznámým povrchem a omezuje rychlost na všech cestách (může ovlivnit trasu)</string>
     <string name="configure_profile_info">Nastavení profilu:</string>
     <string name="utm_format_descr">OsmAnd používá UTM Standard, který je podobný, ale nikoliv identický s UTM NATO formátem.</string>
     <string name="shared_string_example">Příklad</string>
@@ -3210,8 +3210,8 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="paste_Osmand_data_folder_path">Zadejte cestu k adresáři s OsmAnd daty</string>
     <string name="change_osmand_data_folder_question">Změnit adresář pro OsmAnd data\?</string>
     <string name="move_maps_to_new_destination">Přesunout do nového umístění</string>
-    <string name="internal_app_storage_description">Vnitřní úložiště, skryté před uživateli a aplikacemi, přístupné výhradně pro OsmAnd</string>
+    <string name="internal_app_storage_description">Vnitřní úložiště pro OsmAnd (skryté před uživateli a jinými aplikacemi).</string>
-    <string name="change_data_storage_folder">Změnit adresář úložiště dat</string>
+    <string name="change_data_storage_folder">Změnit složku pro ukládání dat</string>
     <string name="routeInfo_piste_type_name">Typ sjezdovky</string>
     <string name="rendering_attr_piste_difficulty_novice_name">Nováček</string>
     <string name="rendering_attr_piste_difficulty_easy_name">Začátečník</string>
@@ -3240,44 +3240,44 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="update_all_maps_q">Opravdu chcete aktualizovat všechny mapy (%1$d)\?</string>
     <string name="shared_preference">Sdíleno</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Upřednostňovat nezpevněné cesty</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_description">Upřednostňovat nezpevněné cesty.</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_description">Pro navigaci upřednostňovat nezpevněné cesty před zpevněnými.</string>
     <string name="layer_osm_edits">OSM úpravy</string>
     <string name="export_profile">Exportovat profil</string>
     <string name="exported_osmand_profile">OsmAnd profil: %1$s</string>
-    <string name="overwrite_profile_q">Profil „%1$s“ již existuje. Přepsat\?</string>
+    <string name="overwrite_profile_q">\'%1$s\' již existuje. Přepsat\?</string>
     <string name="export_profile_failed">Profil nelze exportovat.</string>
-    <string name="profile_import">Import profilu:</string>
+    <string name="profile_import">Importovat profil</string>
     <string name="profile_import_descr">Přidejte profil otevřením jeho souboru pomocí OsmAnd.</string>
     <string name="file_import_error">%1$s chyba importu: %2$s</string>
-    <string name="file_imported_successfully">Úspěšně importováno: %1$s</string>
+    <string name="file_imported_successfully">%1$s importován.</string>
     <string name="swap_two_places">Prohodit %1$s a %2$s</string>
     <string name="route_start_point">Počáteční bod</string>
     <string name="track_saved">Trasa uložena</string>
-    <string name="empty_filename">Název souboru je prázdný</string>
+    <string name="empty_filename">Prázdný název souboru</string>
     <string name="shared_string_revert">Vrátit zpět</string>
     <string name="clear_confirmation_msg">Vyčistit %1$s\?</string>
     <string name="download_map_dialog">Dialog stahování map</string>
     <string name="dialogs_and_notifications_title">Dialogy a oznámení</string>
-    <string name="dialogs_and_notifications_descr">Správa vyskakovacích upozornění, oznámení a dialogů zobrazovaných aplikací OsmAnd.</string>
+    <string name="dialogs_and_notifications_descr">Správa vyskakovacích upozornění, dialogů a oznámení.</string>
     <string name="suggested_maps">Navrhované mapy</string>
-    <string name="suggested_maps_descr">Tyto mapy je třeba používat s modulem</string>
+    <string name="suggested_maps_descr">Tyto mapy jsou potřebné pro modul.</string>
     <string name="added_profiles">Přidané profily</string>
-    <string name="added_profiles_descr">Nový profil přidaný do OsmAnd modulem</string>
+    <string name="added_profiles_descr">Profily přidané modulem</string>
     <string name="shared_string_turn_off">Vypnout</string>
     <string name="new_plugin_added">Přidán nový modul</string>
-    <string name="add_new_profile_q">Přidat nový profil „%1$s“\?</string>
+    <string name="add_new_profile_q">Přidat nový profil \'%1$s\'\?</string>
     <string name="routing_attr_allow_classic_only_description">Trasy upravené pro klasické lyžování bez bruslení. Zahrnuje trasy upravené menšími sněžnými vozidly a stopy vytvořené samotnými lyžaři.</string>
     <string name="routing_attr_allow_skating_only_name">Povolit pouze trasy pro bruslení na lyžích</string>
     <string name="app_mode_ski_snowmobile">Sněžný skútr</string>
     <string name="custom_osmand_plugin">Vlastní modul pro OsmAnd</string>
-    <string name="changes_applied_to_profile">Změny aplikovány na profil %1$s.</string>
+    <string name="changes_applied_to_profile">Změny aplikovány na profil \'%1$s\'.</string>
-    <string name="settings_item_read_error">Nelze přečíst %1$s.</string>
+    <string name="settings_item_read_error">Nepodařilo se přečíst z \'%1$s\'.</string>
-    <string name="settings_item_write_error">Nelze zapsat %1$s.</string>
+    <string name="settings_item_write_error">Nelze zapsat do \'%1$s\'.</string>
-    <string name="settings_item_import_error">Nelze importovat %1$s.</string>
+    <string name="settings_item_import_error">Nelze importovat z \'%1$s\'.</string>
     <string name="shared_string_hillshade">Stínování svahů</string>
     <string name="shared_string_terrain">Terén</string>
     <string name="hillshade_description">Stínované svahy používají tmavé odstíny pro vyjádření svahů, vrcholů a nížin.</string>
-    <string name="slope_description">Svahy jsou barevné vizualizace terénu.</string>
+    <string name="slope_description">Svahy využívají barvy k vizualizaci strmosti terénu.</string>
     <string name="terrain_slider_description">Nastavte minimální a maximální úroveň přiblížení, při které bude vrstva zobrazená.</string>
     <string name="hillshade_download_description">Pro zobrazení stínování kopců jsou potřeba další mapy.</string>
     <string name="slope_download_description">Pro zobrazení svahů jsou potřeba další mapy.</string>
@@ -3285,7 +3285,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_transparency">Průhlednost</string>
     <string name="shared_string_zoom_levels">Úrovně přiblížení</string>
     <string name="shared_string_legend">Legenda</string>
-    <string name="terrain_empty_state_text">Zapněte pro zobrazení stínovaných svahů. O tomto typu map se dozvíte více na našich stránkách</string>
+    <string name="terrain_empty_state_text">Zapněte pro zobrazení stínovaných svahů nebo sklonu svahů. O těchto typech map se dozvíte více na našich stránkách.</string>
     <string name="import_complete_description">Všechna data z %1$s jsou naimportovaná, můžete použít tlačítka níže k otevření části aplikace pro jejich správu.</string>
     <string name="shared_string_import_complete">Import dokončen</string>
     <string name="items_added">Položky přidány</string>
@@ -3304,7 +3304,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="recalculate_route_distance_promo">Trasa bude přepočítaná pokud vzdálenost od trasy k aktuální poloze je větší než zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Svahy</string>
-    <string name="quick_action_show_hide_terrain">Zobrazit/skrýt terén</string>
+    <string name="quick_action_show_hide_terrain">Zobrazit nebo skrýt terén</string>
     <string name="quick_action_terrain_hide">Skrýt terén</string>
     <string name="quick_action_terrain_show">Zobrazit terén</string>
     <string name="quick_action_terrain_descr">Tlačítko pro zobrazení nebo skrytí vrstvy terénu na mapě.</string>
@@ -3316,7 +3316,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_octagon">Osmiúhelník</string>
     <string name="shared_string_square">Čtverec</string>
     <string name="shared_string_min">Min</string>
-    <string name="replace_point_descr">Nahradit jiný bod tímto</string>
+    <string name="replace_point_descr">Nahradit jiný bod tímto.</string>
     <string name="app_mode_ski_touring">Lyžařské okruhy</string>
     <string name="shared_string_angle">Úhel</string>
     <string name="shared_string_angle_param">Úhel: %s°</string>
@@ -3333,7 +3333,7 @@ Zobrazená oblast: %1$s x %2$s</string>
 \nModul zůstane v zařízení i po odstranění aplikace OsmAnd.</string>
     <string name="plugin_disabled">Modul vypnutý</string>
     <string name="open_settings">Otevřít nastavení</string>
-    <string name="no_recalculation_setting">Vypnout přepočítávání</string>
+    <string name="no_recalculation_setting">Žádné přepočítávání</string>
     <string name="please_provide_profile_name_message">Zadejte prosím název profilu</string>
     <string name="select_data_to_import">Vyberte data k importu.</string>
     <string name="import_duplicates_title">Některé položky již existují</string>
@@ -3359,12 +3359,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="wikipedia_poi_languages_promo">Některé články Wikipedie nemusí být dostupné ve vašem jazyce. Zvolte jazyky, v nichž se články Wikipedie objeví na mapě.
 \nBěhem čtení článku budete moci přepínat mezi všemi dostupnými jazyky.</string>
     <string name="wiki_menu_download_descr">Pro zobrazení bodů zájmu Wikipedie jsou potřeba další mapy.</string>
-    <string name="main_actions_descr">Hlavní akce mohou obsahovat pouze 4 tlačítka.</string>
+    <string name="main_actions_descr">Obsahuje pouze 4 tlačítka.</string>
     <string name="main_actions">Hlavní akce</string>
     <string name="move_inside_category">Položky můžete přesouvat pouze v rámci této kategorie.</string>
     <string name="developer_plugin">Modul pro vývojáře</string>
     <string name="shared_string_items">Položky</string>
-    <string name="select_wikipedia_article_langs">Zvolte jazyky, v nichž se články Wikipedie zobrazí na mapě. Při čtení článku můžete přepínat mezi všemi dostupnými jazyky.</string>
+    <string name="select_wikipedia_article_langs">Zvolte jazyky článků Wikipedie na mapě. Při čtení článku můžete přepínat mezi všemi dostupnými jazyky.</string>
     <string name="some_articles_may_not_available_in_lang">Některé články Wikipedie nemusí být dostupné ve vašem jazyce.</string>
     <string name="lang_zhyue">Kantonština</string>
     <string name="lang_zhminnan">Jižní min</string>
@@ -3397,9 +3397,9 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="osm_live_payment_subscription_management">Platba bude stržena z vašeho účtu Google Play po potvrzení nákupu.
 \n
-\nPředplatné se automaticky prodlužuje, pokud ho před termínem obnovení nezrušíte. Platba za předplatné (měsíc/tři měsíce/rok) bude stržena vždy jen v den obnovení.
+\n Předplatné se automaticky prodlužuje, pokud ho před termínem obnovení nezrušíte. Platba za předplatné (měsíc/tři měsíce/rok) bude stržena vždy jen v den obnovení.
 \n
-\nSvé předplatné můžete spravovat nebo zrušit v nastavení Google Play.</string>
+\n Své předplatné můžete spravovat nebo zrušit v nastavení Google Play.</string>
     <string name="search_poi_types">Hledat typy bodů zájmu</string>
     <string name="search_poi_types_descr">Zkombinujte body zájmu různých kategorií. Klepnutím na přepínač vyberete všechny, klepnutím na levou stranu vyberete kategorie.</string>
     <string name="extra_maps_menu_group">Další mapy</string>
@@ -3447,12 +3447,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="mercator_projection">Mercatorovo zobrazení</string>
     <string name="storage_format">Formát uložení</string>
     <string name="map_source_zoom_levels">Nastavte minimální a maximální úroveň přiblížení, při níž se zobrazí nebo načte online mapa.</string>
-    <string name="map_source_zoom_levels_descr">Tyto parametry ovlivňují zobrazení při použití jako mapy nebo překryvu/podkladu.
+    <string name="map_source_zoom_levels_descr">Ovlivňuje zobrazení při použití jako mapy nebo překryvu/podkladu.
 \n
-\n%1$s: Zobrazení mapy bude omezeno na vybrané úrovně přiblížení.
+\n%1$s: Mapa bude omezena na vybrané úrovně přiblížení.
 \n
-\n%2$s: Úrovně přiblížení, při nichž budou zobrazeny původní dlaždice. Mimo tyto hodnoty se dlaždice přeškálují.</string>
+\n%2$s jsou úrovně přiblížení, při nichž budou zobrazeny původní dlaždice. Mimo tyto hodnoty se dlaždice přeškálují.</string>
-    <string name="expire_time_descr">Čas obnovení v minutách. Dlaždice v mezipaměti budou znovu načteny po uplynutí zadaného času. Necháte-li toto pole prázdné, dlaždice z tohoto zdroje se nebudou obnovovat nikdy.
+    <string name="expire_time_descr">Dlaždice v mezipaměti budou znovu načteny po uplynutí zadaného počtu minut. Necháte-li toto pole prázdné, dlaždice z tohoto zdroje se nebudou obnovovat nikdy.
 \n
 \nJeden den má 1440 minut.
 \nJeden týden má 10 080 minut.
@@ -3465,7 +3465,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="set_working_days_to_continue">Pro pokračování je potřeba nastavit pracovní dny</string>
     <string name="route_between_points">Trasa mezi body</string>
     <string name="plan_a_route">Naplánovat trasu</string>
-    <string name="add_to_a_track">Přidat k trase</string>
+    <string name="add_to_a_track">Přidat ke stopě</string>
     <string name="track_show_start_finish_icons">Zobrazit ikony startu a cíle</string>
     <string name="select_track_width">Zvolte šířku</string>
     <string name="gpx_split_interval_descr">Vyberte interval pro zobrazování značek na trase se vzdáleností nebo časem.</string>
@@ -3476,12 +3476,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="plan_route_import_track">Importovat trasu</string>
     <string name="plan_route_open_existing_track">Otevřít existující trasu</string>
     <string name="plan_route_create_new_route">Vytvořit novou trasu</string>
-    <string name="plan_route_select_track_file_for_open">Vyberte trasu k otevření.</string>
+    <string name="plan_route_select_track_file_for_open">Vyberte stopu k otevření.</string>
     <string name="shared_string_done">Hotovo</string>
     <string name="please_provide_point_name_error">Zadejte prosím název bodu</string>
     <string name="quick_action_remove_next_destination_descr">Současný cílový bod na trase bude smazán. Jestliže to je poslední cíl, navigace se zastaví.</string>
     <string name="search_download_wikipedia_maps">Stáhnout Wikipedia mapy</string>
-    <string name="plugin_wikipedia_description">Získejte informace o zájmových bodech z Wikipedie. Je to váš offline kapesní průvodce - zapněte Wikipedia plugin a užívejte si články o objektech okolo Vás.</string>
+    <string name="plugin_wikipedia_description">Získejte informace o zájmových bodech z Wikipedie. Je to váš offline kapesní průvodce - zapněte modul Wikipedia a užívejte si články o objektech okolo vás.</string>
     <string name="add_hidden_group_info">Přidaný bod nebude na mapě vidět, protože vybraná skupina je skrytá. Můžete jej najít v \"%s\".</string>
     <string name="app_mode_enduro_motorcycle">Enduro motorka</string>
     <string name="app_mode_motor_scooter">Motorový skútr</string>
@@ -3493,7 +3493,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="marker_save_as_track">Uložit jako soubor trasy</string>
     <string name="follow_track">Sledovat trasu</string>
     <string name="follow_track_descr">Zvolte soubor trasy, kterou chcete sledovat</string>
-    <string name="import_track_descr">Zvolte soubor trasy, kterou chcete sledovat, nebo jej importujte ze zařízení.</string>
+    <string name="import_track_descr">Zvolte soubor stopy, kterou chcete sledovat, nebo jej importujte ze svého zařízení.</string>
     <string name="select_another_track">Zvolit jinou trasu</string>
     <string name="navigate_to_track_descr">Navigovat z mé polohy k trase</string>
     <string name="pass_whole_track_descr">Bod trasy pro navigování</string>
@@ -3518,12 +3518,12 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="routing_attr_length_name">Omezení délky</string>
     <string name="shared_string_bearing">Azimut</string>
     <string name="item_deleted">%1$s smazáno</string>
-    <string name="speed_cameras_restart_descr">Ke kompletnímu smazání dat o rychlostních radarech je nutný restart.</string>
+    <string name="speed_cameras_restart_descr">Restartovat aplikaci pro kompletní smazání dat o rychlostních radarech.</string>
     <string name="shared_string_uninstall_and_restart">Odinstalovat a restartovat</string>
     <string name="speed_cameras_removed_descr">Toto zařízení nemá rychlostní kamery.</string>
     <string name="app_mode_inline_skates">Inline brusle</string>
-    <string name="quick_action_remove_next_destination">Smazat následující cílový bod</string>
+    <string name="quick_action_remove_next_destination">Smazat nejbližší cílový bod</string>
-    <string name="use_volume_buttons_as_zoom_descr">Umožní ovládat úroveň přiblížení mapy pomocí tlačítek hlasitosti zařízení.</string>
+    <string name="use_volume_buttons_as_zoom_descr">Ovládat úroveň přiblížení mapy pomocí tlačítek hlasitosti zařízení.</string>
     <string name="use_volume_buttons_as_zoom">Tlačítka hlasitosti pro přibližování</string>
     <string name="threshold_distance">Mezní vzdálenost</string>
     <string name="navigation_profile">Navigační profil</string>
@@ -3576,7 +3576,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="sort_last_modified">Naposledy změněno</string>
     <string name="sort_name_descending">Název: Z – A</string>
     <string name="sort_name_ascending">Název: A – Z</string>
-    <string name="start_finish_icons">Ikony startu/cíle</string>
+    <string name="start_finish_icons">Ikony startu a cíle</string>
     <string name="contour_lines_thanks">Děkujeme za zakoupení modulu \'Vrstevnice\'</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>
@@ -3692,11 +3692,11 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="shared_string_drawer">Úvodní panel</string>
     <string name="quick_action_transport_hide">Skrýt veřejnou dopravu</string>
     <string name="quick_action_transport_show">Zobrazit veřejnou dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobrazit/skrýt veřejnou dopravu</string>
+    <string name="quick_action_show_hide_transport">Zobrazit nebo skrýt veřejnou dopravu</string>
     <string name="quick_action_transport_descr">Tlačítko pro zobrazení nebo skrytí veřejné dopravy na mapě.</string>
-    <string name="create_edit_poi">Vytvořit / upravit bod zájmu</string>
+    <string name="create_edit_poi">Vytvořit nebo upravit bod zájmu</string>
     <string name="parking_positions">Parkovací místa</string>
-    <string name="add_edit_favorite">Přidat / upravit oblíbený bod</string>
+    <string name="add_edit_favorite">Přidat nebo upravit oblíbený bod</string>
     <string name="reset_deafult_order">Obnovit výchozí pořadí položek</string>
     <string name="back_to_editing">Zpět k úpravám</string>
     <string name="quick_action_switch_profile_descr">Tlačítko akce přepne mezi zvolenými profily.</string>
@@ -3722,7 +3722,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="turn_screen_on_power_button">Tlačítko napájení</string>
     <string name="turn_screen_on_proximity_sensor">Senzor přiblížení</string>
     <string name="turn_screen_on_wake_time_descr">Zvolte časový limit vypnutí obrazovky po probuzení (\"%1$s\" znamená bez časového limitu.)</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Musíte přidat aspoň dva body.</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Musíte přidat aspoň dva body</string>
     <string name="manage_subscription">Spravovat předplatné</string>
     <string name="subscription_payment_issue_title">S vaším předplatným je problém. Klikněte na tlačítko pro přechod do nastavení předplatného v Google Play a opravte způsob platby.</string>
     <string name="subscription_expired_title">Předplatné OsmAnd Live skončilo</string>
@@ -3902,8 +3902,8 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="login_account">Účet</string>
     <string name="user_login">Přihlašovací jméno</string>
     <string name="markers_history">Historie značek</string>
-    <string name="gpx_upload_public_visibility_descr">Veřejná znamená, že trasa bude veřejně dostupná ve vašich GPS trasách a veřejných seznamech GPS tras. 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. Ostatní uživatelé si ale stále budou moci stáhnout nezpracovanou trasu z veřejného seznamu spolu se všemi časovými razítky, které obsahuje.</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ém prostřednictvím veřejného GPS API bez časových razítek, ale 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>
@@ -3942,4 +3942,10 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="use_system_screen_timeout_promo">Ve výchozím stavu vypnuto: běží-li OsmAnd na popředí, obrazovka se nevypne.
 \n
 \nJe-li zapnuto, OsmAnd vypne obrazovku podle systémového limitu.</string>
+    <string name="additional_actions_descr">Tyto akce jsou dostupné po stisknutí tlačítka “%1$s”.</string>
+    <string name="empty_state_my_tracks_desc">Importovat nebo nahrát soubory stop</string>
+    <string name="save_global_track_interval_descr">Zadejte interval ukládání pro obecný záznam trasy (aktivovaný přes widget Záznam trasy na mapové obrazovce).</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>
 </resources>

OsmAnd/res/values-da/phrases.xml

@@ -3808,7 +3808,7 @@
     <string name="poi_booth">Stand type</string>
     <string name="poi_video_yes">Ja</string>
     <string name="poi_video_no">Nej</string>
-    <string name="poi_internet_access_fee_customers">Signal for at finde stangen</string>
+    <string name="poi_internet_access_fee_customers">Internetadgang: kunder</string>
     <string name="poi_traffic_signals_sound_locate">Kun når det er tilladt at gå</string>
     <string name="poi_tactile_paving_contrasted">Kontrast</string>
     <string name="poi_tactile_paving_primitive">Primitiv</string>
@@ -3852,4 +3852,32 @@
     <string name="poi_recycling_small_electrical_appliances">Små elektriske apparater</string>
     <string name="poi_departures_board">Afgangstavle</string>
     <string name="poi_drinking_water_refill">Genopfyldning af drikkevand</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Nej</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Ja</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Nej</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Ja</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Nej</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Ja</string>
+    <string name="poi_liaison_representative_office">Repræsentantkontor</string>
+    <string name="poi_liaison_liaison_office">Kontor</string>
+    <string name="poi_consulate_honorary_consul">Honorærkonsul</string>
+    <string name="poi_consulate_consulate_general">Generalkonsulat</string>
+    <string name="poi_consulate_consular_agency">Konsulært agentur</string>
+    <string name="poi_consulate_yes">Ledet af en konsul</string>
+    <string name="poi_embassy_residence">Bopæl</string>
+    <string name="poi_embassy_high_commission">Højkommissær</string>
+    <string name="poi_embassy_delegation">Delegation</string>
+    <string name="poi_embassy_branch_embassy">Afdeling</string>
+    <string name="poi_embassy_yes">Ledet af en ambassadør</string>
+    <string name="poi_diplomatic_liaison">Forbindelsesofficerer</string>
+    <string name="poi_diplomatic_embassy">Ambassade</string>
+    <string name="poi_radar_tower">Radartårn</string>
+    <string name="poi_parking_rooftop">Tagterrasse</string>
+    <string name="poi_gpx_point">GPX-punkt</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Borgerservice</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Immigrant visum</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Ikke-immigrant visum</string>
+    <string name="poi_liaison_filter">Forbindelsesofficerer</string>
+    <string name="poi_consulate_filter">Konsulat</string>
+    <string name="poi_embassy_filter">Ambassade</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3488,7 +3488,7 @@
     <string name="shared_string_angle_param">Vinkel: %s°</string>
     <string name="shared_string_angle">Vinkel</string>
     <string name="shared_string_preparing">Forbereder</string>
-    <string name="shared_string_poi_types">IP typer</string>
+    <string name="shared_string_poi_types">IP-typer</string>
     <string name="shared_string_nothing_selected">Intet valgt</string>
     <string name="shared_string_quick_actions">Genveje</string>
     <string name="shared_string_profiles">Profiler</string>
@@ -3549,9 +3549,9 @@
     <string name="import_profile_dialog_description">Den importerede profil indeholder yderligere data. Klik på Importer for kun at importere profildata, eller vælg yderligere data, der skal importeres.</string>
     <string name="route_recalculation_dist_descr">Ruten vil blive genberegnet, hvis afstanden til ruten er længere end angivet parameter</string>
     <string name="route_recalculation_dist_title">Mindste afstand for at genberegne ruten</string>
-    <string name="import_duplicates_description">OsmAnd har allerede elementer med de samme navne, som dem, der importeres. 
+    <string name="import_duplicates_description">OsmAnd har allerede elementer med de samme navne som de importerede.
-\n 
+\n
-\nVælg en aktion.</string>
+\nVælg en handling.</string>
     <string name="listed_exist">Det angivne %1$s findes allerede.</string>
     <string name="recalc_angle_dialog_title">Mindste vinkel mellem placering og rute</string>
     <string name="recalc_angle_dialog_descr">Ekstra lige segment mellem placering og den beregnede rute vises, indtil ruten genberegnes</string>
@@ -3790,4 +3790,6 @@
     <string name="start_finish_icons">Start-/slutikoner</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
     <string name="app_mode_gap">Hul</string>
+    <string name="export_not_enough_space">Der er ikke plads nok</string>
+    <string name="routing_attr_length_name">Længdegrænse</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -3853,4 +3853,34 @@
     <string name="poi_parking_rooftop">Dachparkplätze</string>
     <string name="poi_gpx_point">GPX-Wegpunkt</string>
     <string name="poi_radar_tower">Radarturm</string>
+    <string name="poi_diplomatic_services_citizen_services_no">nein</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">ja</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">nein</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">ja</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">nein</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">ja</string>
+    <string name="poi_liaison_subnational">Subnationales Büro</string>
+    <string name="poi_liaison_representative_office">Repräsentanzbüro</string>
+    <string name="poi_liaison_liaison_office">Verbindungsbüro</string>
+    <string name="poi_consulate_honorary_consul">Honorarkonsul</string>
+    <string name="poi_consulate_consulate_general">Generalkonsulat</string>
+    <string name="poi_consulate_consular_office">Konsularbüro</string>
+    <string name="poi_consulate_consular_agency">Konsularagentur</string>
+    <string name="poi_consulate_yes">Geleitet von einem Konsul</string>
+    <string name="poi_embassy_residence">Residenz</string>
+    <string name="poi_embassy_nunciature">Nuntiatur</string>
+    <string name="poi_embassy_mission">Mission</string>
+    <string name="poi_embassy_interests_section">Interessenvertretung</string>
+    <string name="poi_embassy_high_commission">Hochkommissar</string>
+    <string name="poi_embassy_delegation">Delegation</string>
+    <string name="poi_embassy_branch_embassy">Niederlassung</string>
+    <string name="poi_embassy_yes">Geleitet von einem Botschafter</string>
+    <string name="poi_diplomatic_liaison">Verbindungsbüro</string>
+    <string name="poi_diplomatic_embassy">Botschaft</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Dienstleistungen für Bürger</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Einwanderungsvisa</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Nicht-Einwanderungsvisa</string>
+    <string name="poi_liaison_filter">Verbindungsbüro</string>
+    <string name="poi_consulate_filter">Konsulat</string>
+    <string name="poi_embassy_filter">Botschaft</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -1928,7 +1928,7 @@
     <string name="storage_permission_restart_is_required">Die App darf nun auf den externen Speicher schreiben, dazu ist aber ein manueller Neustart nötig.</string>
     <string name="shared_string_move_up">Verschieben ↑</string>
     <string name="shared_string_move_down">Verschieben ↓</string>
-    <string name="file_name_containes_illegal_char">Dateiname beinhaltet nicht erlaubte Zeichen</string>
+    <string name="file_name_containes_illegal_char">Nicht erlaubte Zeichen im Dateinamen</string>
     <string name="no_waypoints_found">Keine Wegpunkte gefunden</string>
     <string name="no_map_markers_found">Bitte Kartenmarkierungen über die Karte hinzufügen</string>
     <string name="rendering_value_fine_name">Fein</string>
@@ -2646,7 +2646,7 @@
     <string name="copy_location_name">Ort/POI-Name kopieren</string>
     <string name="toast_empty_name_error">Unbenannter Ort</string>
     <string name="show_closed_notes">Geschlossene Notizen anzeigen</string>
-    <string name="switch_osm_notes_visibility_desc">OSM-Notizen auf der Karte ein-/ausblenden.</string>
+    <string name="switch_osm_notes_visibility_desc">OSM-Notizen auf der Karte ein- oder ausblenden.</string>
     <string name="gpx_file_desc">GPX - geeignet für den Export in JOSM oder andere OSM-Editoren.</string>
     <string name="osc_file_desc">OSC - geeignet für den Export nach OSM.</string>
     <string name="shared_string_gpx_file">GPX-Datei</string>
@@ -3104,13 +3104,13 @@
     <string name="routing_attr_allow_expert_description">Extrem schwere Routen, mit gefährlichen Hindernissen und schwieriger Umgebung.</string>
     <string name="routing_attr_allow_classic_only_name">Nur klassische Routen zulassen</string>
     <string name="routing_attr_difficulty_preference_name">Bevorzugter Schwierigkeitsgrad</string>
-    <string name="routing_attr_piste_type_downhill_name">Ski Alpin/Abfahrtslauf</string>
+    <string name="routing_attr_piste_type_downhill_name">Ski Alpin und Abfahrtslauf</string>
     <string name="routing_attr_piste_type_downhill_description">Pisten für Ski Alpin oder Abfahrtslauf und Zugang zu den Skiliften.</string>
     <string name="process_downloading_service">OsmAnd Download-Dienst</string>
     <string name="shared_string_color_magenta">Magenta</string>
     <string name="shared_string_icon">Symbol</string>
     <string name="collected_data">Erfasste Daten</string>
-    <string name="routing_attr_piste_type_nordic_name">Skilanglauf/Nordischer Skisport</string>
+    <string name="routing_attr_piste_type_nordic_name">Skilanglauf und Nordischer Skisport</string>
     <string name="routing_attr_piste_type_nordic_description">Loipen für Skilangläufer und Nordische Skiläufer.</string>
     <string name="routing_attr_difficulty_preference_description">Routen dieser Schwierigkeit bevorzugen, obwohl bei kürzerer Routenführung schwierigere oder einfachere Pisten immer noch möglich sind.</string>
     <string name="routing_attr_freeride_policy_name">Abseits der Piste</string>
@@ -3373,7 +3373,7 @@
     <string name="route_start_point">Startpunkt</string>
     <string name="default_speed_dialog_msg">Schätzt die Ankunftszeit für unbekannte Straßentypen und begrenzt die Geschwindigkeit für alle Straßen (kann die Navigation beeinflussen)</string>
     <string name="track_saved">Track gespeichert</string>
-    <string name="empty_filename">Dateiname ist leer</string>
+    <string name="empty_filename">Leerer Dateiname</string>
     <string name="shared_string_revert">Zurücksetzen</string>
     <string name="clear_confirmation_msg">%1$s löschen\?</string>
     <string name="suggested_maps">Vorgeschlagene Karten</string>
@@ -3579,7 +3579,7 @@
     <string name="quick_action_terrain_descr">Eine Schaltfläche zum Ein- und Ausblenden der Geländeebene auf der Karte.</string>
     <string name="quick_action_terrain_show">Gelände einblenden</string>
     <string name="quick_action_terrain_hide">Gelände ausblenden</string>
-    <string name="quick_action_show_hide_terrain">Gelände ein- / ausblenden</string>
+    <string name="quick_action_show_hide_terrain">Gelände ein- oder ausblenden</string>
     <string name="shared_string_hillshade">Relief</string>
     <string name="shared_string_zoom_levels">Zoomstufen</string>
     <string name="shared_string_transparency">Transparenz</string>
@@ -3697,11 +3697,11 @@
     <string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche \"%1$s\" tippen.</string>
     <string name="quick_action_transport_hide">Öffentliche Verkehrsmittel ausblenden</string>
     <string name="quick_action_transport_show">Öffentliche Verkehrsmittel anzeigen</string>
-    <string name="quick_action_show_hide_transport">Öffentliche Verkehrsmittel anzeigen/ausblenden</string>
+    <string name="quick_action_show_hide_transport">Öffentliche Verkehrsmittel anzeigen oder ausblenden</string>
     <string name="quick_action_transport_descr">Schaltfläche zum Ein- oder Ausblenden der öffentlichen Verkehrsmittel auf der Karte.</string>
-    <string name="create_edit_poi">POI erstellen / bearbeiten</string>
+    <string name="create_edit_poi">POI erstellen oder bearbeiten</string>
     <string name="parking_positions">Parkpositionen</string>
-    <string name="add_edit_favorite">Favorit hinzufügen / bearbeiten</string>
+    <string name="add_edit_favorite">Favorit hinzufügen oder bearbeiten</string>
     <string name="reset_deafult_order">Standard-Reihenfolge der Elemente wiederherstellen</string>
     <string name="back_to_editing">Zurück zur Bearbeitung</string>
     <string name="quick_action_switch_profile_descr">Die Aktionsschaltfläche schaltet zwischen den ausgewählten Profilen um.</string>
@@ -3878,7 +3878,7 @@
     <string name="shared_string_gpx_route">Track Route</string>
     <string name="import_track_descr">Track Datei zum Folgen auswählen, oder vom Gerät importieren.</string>
     <string name="disable_recording_once_app_killed_descrp">Die GPX-Aufzeichnung wird angehalten, wenn OsmAnd beendet wird (über „zuletzt verwendete Apps“). (Die Hintergrunddienst-Anzeige verschwindet aus der Android-Benachrichtigungsleiste.)</string>
-    <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (via Schaltfläche \'GPX\' auf dem Kartenbildschirm).</string>
+    <string name="save_global_track_interval_descr">Aufzeichnungsintervall für die generelle Track-Aufzeichnung festlegen (wird über die Schaltfläche \'Routenaufzeichung\' auf dem Kartenbildschirm angeschaltet).</string>
     <string name="route_between_points_warning_desc">Als nächstes können Sie Ihren Track mit einem Ihrer Navigationsprofile auf die nächstgelegene erlaubte Straße einrasten lassen, um diese Option zu nutzen.</string>
     <string name="quick_action_add_gpx">Track-Wegpunkt hinzufügen</string>
     <string name="number_of_gpx_files_selected_pattern">%s Track Dateien ausgewählt</string>
@@ -3895,7 +3895,7 @@
     <string name="shared_string_redo">Wiederholen</string>
     <string name="release_3_8">• Aktualisierte Funktion zum Planen einer Route: erlaubt die Verwendung verschiedener Navigationstypen pro Segment und die Einbeziehung von Tracks
 \n
-\n • Neues Menü zum Erscheinungsbild von Tracks: Wählen Sie Farbe, Dicke, Richtungspfeile, Start-/Ziel-Symbole
+\n • Neues Menü zum Erscheinungsbild von Tracks: Wählen Sie Farbe, Dicke, Richtungspfeile, Start- und Zielsymbole
 \n
 \n • Verbesserte Darstellung von Fahrradknotenpunkten.
 \n
@@ -3911,7 +3911,7 @@
     <string name="sort_last_modified">Zuletzt geändert</string>
     <string name="sort_name_descending">Name: Z – A</string>
     <string name="sort_name_ascending">Name: A – Z</string>
-    <string name="start_finish_icons">Start-/Ziel-Symbole</string>
+    <string name="start_finish_icons">Start- und Zielsymbole</string>
     <string name="contour_lines_thanks">Vielen Dank für den Kauf von \'Höhenlinien\'</string>
     <string name="osm_live_payment_desc_hw">Das Abonnement wird pro ausgewähltem Zeitraum berechnet. Sie können das Abonnement jederzeit über die AppGallery kündigen.</string>
     <string name="osm_live_payment_subscription_management_hw">Die Bezahlung wird Ihrem AppGallery-Konto bei der Bestätigung des Kaufs belastet.
@@ -3928,13 +3928,13 @@
     <string name="complex_routing_descr">Zwei-Phasen-Routenberechnung für die Autonavigation.</string>
     <string name="use_native_pt">Native ÖPNV Entwicklung</string>
     <string name="use_native_pt_desc">Wechseln zu Java (sicher) Berechnung des ÖPNV-Routings</string>
-    <string name="osm_edit_logout_success">Abmeldung erfolgreich</string>
+    <string name="osm_edit_logout_success">Abgemeldet</string>
     <string name="file_already_imported">Datei wurde bereits in OsmAnd importiert</string>
     <string name="perform_oauth_authorization">Anmelden über OAuth</string>
     <string name="clear_osm_token">OpenStreetMap OAuth-Token löschen</string>
     <string name="what_is_new">Was ist neu</string>
     <string name="snowmobile_render_descr">Für das Schneemobilfahren mit speziellen Straßen und Tracks.</string>
-    <string name="perform_oauth_authorization_description">Durchführen eines OAuth-Logins zur Nutzung der osmedit-Funktionen</string>
+    <string name="perform_oauth_authorization_description">Anmelden mit OAuth zur Nutzung der osmedit-Funktionen</string>
     <string name="use_two_phase_routing">2-Phasen-A*-Routing-Algorithmus verwenden</string>
     <string name="message_need_calculate_route_before_show_graph">%1$s Daten sind nur auf den Straßen verfügbar, Sie müssen eine Route mit \"Route zwischen Punkten\" berechnen, um sie zu erhalten.</string>
     <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
@@ -3957,29 +3957,44 @@
     <string name="subscription_expired_title">OsmAnd Live Abonnement ist abgelaufen</string>
     <string name="subscription_paused_title">OsmAnd Live Abonnement wurde ausgesetzt</string>
     <string name="subscription_on_hold_title">OsmAnd Live Abonnement liegt auf Eis</string>
-    <string name="login_open_street_map">Anmeldung bei OpenStreetMap</string>
+    <string name="login_open_street_map">Anmeldung für OpenStreetMap</string>
-    <string name="login_open_street_map_org">Anmeldung bei OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Anmeldung für OpenStreetMap.org</string>
     <string name="sign_in_with_open_street_map">Anmelden mit OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Sie müssen sich anmelden, um Änderungen hochzuladen.
+    <string name="open_street_map_login_mode">Melden Sie sich an, um Änderungen hochzuladen,
 \n
-\nSie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Ihr Passwort verwenden.</string>
+\nentweder mit OAuth oder mit Ihrem Benutzernamen und Passwort.</string>
-    <string name="use_login_password">Benutzername und Passwort verwenden</string>
+    <string name="use_login_password">Anmelden mit Benutzername und Passwort</string>
     <string name="login_account">Konto</string>
-    <string name="user_login">Login</string>
+    <string name="user_login">Benutzername</string>
     <string name="markers_history">Historie der Marker</string>
     <string name="send_files_to_openstreetmap">GPX-Datei an OpenStreetMap senden</string>
     <string name="enter_text_separated">Geben Sie durch Komma getrennte Tags ein.</string>
-    <string name="gpx_upload_public_visibility_descr">Öffentlich bedeutet, dass der Track in Ihren GPS-Tracks und in GPS-Track Verzeichnissen öffentlich angezeigt wird. Die über die API bereitgestellten Daten verweisen nicht auf Ihre Track-Seite. Die Zeitstempel der Trackpunkte sind nicht über die öffentliche GPS-API verfügbar, und die Punkte sind nicht chronologisch geordnet. Andere Benutzer können jedoch nach wie vor den Rohtrack aus der öffentlichen Trackliste und alle darin enthaltenen Zeitstempel herunterladen.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Öffentlich\" bedeutet, dass der Track öffentlich in Ihren GPS-Tracks und in öffentlichen GPS-Track Verzeichnissen mit Zeitstempeln in Rohform angezeigt wird. Die über die API bereitgestellten Daten verweisen nicht auf Ihre Track-Seite. Die Zeitstempel der Trackpunkte sind nicht über die öffentliche GPS API verfügbar, und die Trackpunkte sind nicht chronologisch geordnet.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identifizierbar bedeutet, dass der Track in Ihren GPS-Tracks und in öffentlichen GPS-Track Verzeichnissen angezeigt wird. Andere Benutzer können den Rohtrack herunterladen und mit Ihrem Benutzernamen verknüpfen. Daten, die über die Trackpunkte-API geliefert werden, verweisen auf Ihre ursprüngliche Track-Seite. Die Zeitstempel der Trackpunkte sind über die öffentliche GPS-API verfügbar.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identifizierbar\" bedeutet, dass der Track in Ihren GPS-Tracks und in öffentlichen GPS-Track Verzeichnissen angezeigt wird, d.h. andere Benutzer können den Track herunterladen und mit Ihrem Benutzernamen verknüpfen. Öffentliche, mit Zeitstempel versehene Trackpunkt-Daten von der GPS API, die über die Trackpunkt API bereitgestellt werden, verweisen auf Ihre ursprüngliche Trackseite.</string>
-    <string name="gpx_upload_private_visibility_descr">Privat bedeutet, dass der Track nicht in öffentlichen Verzeichnissen auftaucht. Punkte des Tracks werden weiterhin über die öffentliche GPS-API ohne Zeitstempel verfügbar sein, aber nicht chronologisch geordnet.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Privat\" bedeutet, dass der Track nicht in öffentlichen Verzeichnissen auftaucht, aber seine Trackpunkte in nicht chronologischer Reihenfolge über die öffentliche GPS API ohne Zeitstempel verfügbar sind.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Verfolgbar bedeutet, dass der Track in keiner öffentlichen Auflistung auftaucht, aber Trackpunkte weiterhin über die öffentliche GPS API mit Zeitstempel verfügbar sein werden. Andere Benutzer werden nur verarbeitete Trackpunkte Ihres Tracks herunterladen können, die nicht direkt mit Ihnen in Verbindung gebracht werden können.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Verfolgbar\" bedeutet, dass die Spur nicht in öffentlichen Auflistungen auftaucht, aber verarbeitete Trackpunkte mit Zeitstempeln davon (die nicht direkt mit Ihnen in Verbindung gebracht werden können) durch Downloads von der öffentlichen GPS API.</string>
     <string name="osm_edit_close_note">OSM Notiz schließen</string>
     <string name="osm_edit_comment_note">OSM Notiz kommentieren</string>
-    <string name="osm_login_descr">Sie können sich mit der sicheren OAuth-Methode anmelden oder Ihren Benutzernamen und Passwort verwenden.</string>
+    <string name="osm_login_descr">Melden Sie sich mit der sicheren OAuth-Methode an oder verwenden Sie Ihren Benutzernamen und Ihr Passwort.</string>
     <string name="shared_string_add_photo">Foto hinzufügen</string>
     <string name="register_on_openplacereviews">Registrieren bei
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Fotos werden vom offenen Datenprojekt OpenPlaceReviews.org zur Verfügung gestellt. Um Ihre Fotos hochladen zu können, müssen Sie sich auf der Website anmelden.</string>
+    <string name="register_on_openplacereviews_desc">Melden Sie sich auf der Open Data Website OpenPlaceReviews.org an, um noch mehr Fotos hochzuladen.</string>
     <string name="register_opr_create_new_account">Neues Konto erstellen</string>
     <string name="register_opr_have_account">Ich habe bereits ein Konto</string>
+    <string name="shared_string_search_history">Suchverlauf</string>
+    <string name="app_mode_kayak">Kajak</string>
+    <string name="app_mode_motorboat">Motorboot</string>
+    <string name="add_to_mapillary">Zu Mapillary hinzufügen</string>
+    <string name="add_to_opr">Zu OpenPlaceReviews hinzufügen</string>
+    <string name="add_photos_descr">OsmAnd zeigt Fotos aus verschiedenen Quellen:
+\nOpenPlaceReviews - POI Fotos;
+\nMapillary - Bilder auf Straßenebene;
+\nWeb / Wikimedia - POI Fotos, die in OpenStreetMap Daten angegeben sind.</string>
+    <string name="shared_string_resources">Quellen</string>
+    <string name="approximate_file_size">Ungefähre Dateigröße</string>
+    <string name="select_data_to_export">Wählen Sie die Daten aus, die in die Datei exportiert werden sollen.</string>
+    <string name="file_size_needed_for_import">Benötigt für Import</string>
+    <string name="export_not_enough_space_descr">Ihr Gerät hat nur %1$s Speicherplatz frei. Bitte machen Sie etwas Platz frei oder heben Sie die Auswahl einiger zu exportierender Objekte auf.</string>
+    <string name="export_not_enough_space">Es gibt nicht genug Speicherplatz</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -3966,15 +3966,28 @@
     <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_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. Datumoj liveritaj per la API de spuroj ligos al originala paĝo de via spuro. Tempindikoj de la spuro estos akireblaj per la publika API GPS.</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 estos montrata en publikaj listoj, sed punktoj el ĝi plue estos akireblaj per la publika API GPS kune kun tempindikoj. Aliaj uzantoj povos elŝuti nur pritraktitajn punktojn el via spuro, kiuj ne povos esti senpere ligitaj al vi.</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 l sekura metodo OAuth aŭ per uzi uzantnomon kaj pasvorton.</string>
+    <string name="osm_login_descr">Vi povas ensaluti 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_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>
+    <string name="app_mode_kayak">Kajako</string>
+    <string name="app_mode_motorboat">Motorboato</string>
+    <string name="add_photos_descr">OsmAnd montras fotojn el diversaj fontoj:
+\nOpenPlaceReviews – fotoj de interesejoj;
+\nMapillary – strat‑nivela fotaro;
+\ninterreto, Vikimedio – fotoj de interesejoj difinitaj en OpenStreetMap-datumoj.</string>
+    <string name="shared_string_resources">Rimedoj</string>
+    <string name="approximate_file_size">Proksimuma dosiergrando</string>
+    <string name="select_data_to_export">Elektu datumojn por elporti al dosiero.</string>
+    <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>
 </resources>

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

@@ -3857,4 +3857,34 @@
     <string name="poi_parking_rooftop">Azotea</string>
     <string name="poi_gpx_point">Punto GPX</string>
     <string name="poi_radar_tower">Torre de radar</string>
+    <string name="poi_diplomatic_services_citizen_services_no">No</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Sí</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">No</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Sí</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">No</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Sí</string>
+    <string name="poi_liaison_subnational">Subnacional</string>
+    <string name="poi_liaison_representative_office">Oficina representativa</string>
+    <string name="poi_liaison_liaison_office">Oficina</string>
+    <string name="poi_consulate_honorary_consul">Cónsul honorario</string>
+    <string name="poi_consulate_consulate_general">Consulado general</string>
+    <string name="poi_consulate_consular_office">Oficina consular</string>
+    <string name="poi_consulate_consular_agency">Agencia consular</string>
+    <string name="poi_consulate_yes">Dirigido por un cónsul</string>
+    <string name="poi_embassy_residence">Residencia</string>
+    <string name="poi_embassy_nunciature">Nunciatura</string>
+    <string name="poi_embassy_mission">Misión</string>
+    <string name="poi_embassy_interests_section">Sección de intereses</string>
+    <string name="poi_embassy_high_commission">Alto comisionado</string>
+    <string name="poi_embassy_delegation">Delegación</string>
+    <string name="poi_embassy_branch_embassy">Sucursal;Ramal</string>
+    <string name="poi_embassy_yes">Dirigido por un embajador</string>
+    <string name="poi_diplomatic_liaison">Enlace</string>
+    <string name="poi_diplomatic_embassy">Embajada</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servicios al ciudadano</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Visas de inmigrante</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas de no inmigrante</string>
+    <string name="poi_liaison_filter">Enlace</string>
+    <string name="poi_consulate_filter">Consulado</string>
+    <string name="poi_embassy_filter">Embajada</string>
 </resources>

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

@@ -3927,7 +3927,7 @@
     <string name="use_native_pt">Desarrollo nativo del transporte público</string>
     <string name="use_native_pt_desc">Cambiar al cálculo de ruta Java (seguro) del transporte público</string>
     <string name="what_is_new">Novedades</string>
-    <string name="perform_oauth_authorization_description">Inicia sesión con OAuth para usar las funciones de edición de OSM</string>
+    <string name="perform_oauth_authorization_description">Ingresar con OAuth para usar las funciones de edición de OSM</string>
     <string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
     <string name="clear_osm_token">Vaciar llave OAuth de OpenStreetMap</string>
     <string name="osm_edit_logout_success">Sesión finalizada</string>
@@ -3958,13 +3958,13 @@
     <string name="subscription_paused_title">La suscripción a OsmAnd Live se ha pausado</string>
     <string name="subscription_on_hold_title">La suscripción a OsmAnd Live está en espera</string>
     <string name="login_open_street_map">Iniciar sesión en OpenStreetMap</string>
-    <string name="login_open_street_map_org">Ingresar a OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Ingresar en OpenStreetMap.org</string>
-    <string name="open_street_map_login_mode">Debes iniciar sesión para subir cambios nuevos o modificados.
+    <string name="open_street_map_login_mode">Inicia sesión para subir los cambios nuevos o modificados,
 \n
-\nPuedes ingresar usando el método seguro de OAuth o usar el nombre de usuario y contraseña.</string>
+\nya sea con OAuth o usando el nombre de usuario y contraseña.</string>
-    <string name="use_login_password">Usar nombre de usuario y contraseña</string>
+    <string name="use_login_password">Ingresar nombre de usuario y contraseña</string>
     <string name="login_account">Cuenta</string>
-    <string name="user_login">Iniciar sesión</string>
+    <string name="user_login">Nombre de usuario</string>
     <string name="sign_in_with_open_street_map">Ingresar con OpenStreetMap</string>
     <string name="markers_history">Historial de marcadores</string>
     <string name="send_files_to_openstreetmap">Enviar archivo GPX a OpenStreetMap</string>
@@ -3975,14 +3975,26 @@
     <string name="gpx_upload_identifiable_visibility_descr">«Identificable» significa que la traza se mostrará públicamente en tu listado de trazas y en el listado de trazas GPS públicas, es decir que otros usuarios podrán descargar la traza en bruto y asociarla con su nombre de usuario. Los datos servidos a través de la API de conjunto de puntos hará referencia a la página original de la traza.</string>
     <string name="osm_edit_close_note">Cerrar nota de OSM</string>
     <string name="osm_edit_comment_note">Comentar nota de OSM</string>
-    <string name="osm_login_descr">Puedes iniciar sesión con el método seguro de OAuth o usar el nombre de usuario y contraseña.</string>
+    <string name="osm_login_descr">Ingresa usando el método seguro de OAuth o usa el nombre de usuario y contraseña.</string>
     <string name="shared_string_add_photo">Añadir foto</string>
     <string name="register_on_openplacereviews">Registrarse en
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Las fotos son provistas por el proyecto de datos abiertos OpenPlaceReviews.org. Para subir fotos debes registrarte en el sitio web.</string>
+    <string name="register_on_openplacereviews_desc">Ingresa en el sitio web del proyecto de datos abiertos OpenPlaceReviews.org para subir más fotos.</string>
     <string name="register_opr_create_new_account">Crear nueva cuenta</string>
     <string name="register_opr_have_account">Ya tengo cuenta</string>
     <string name="shared_string_search_history">Historial de búsqueda</string>
     <string name="app_mode_kayak">Kayak</string>
     <string name="app_mode_motorboat">Lancha a motor</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="approximate_file_size">Tamaño aproximado del archivo</string>
+    <string name="select_data_to_export">Marca los datos que serán exportados al archivo.</string>
+    <string name="file_size_needed_for_import">Necesario para importar</string>
+    <string name="export_not_enough_space_descr">El dispositivo sólo tiene %1$s libre. Por favor, libera algo de espacio o desmarca algunos elementos a exportar.</string>
+    <string name="export_not_enough_space">Sin espacio suficiente</string>
+    <string name="add_to_mapillary">Añadir a Mapillary</string>
+    <string name="add_to_opr">Añadir a OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios:
+\nOpenPlaceReviews (fotos de PDI);
+\nMapillary (imágenes a nivel de calle);
+\nWeb / Wikimedia (fotos de PDI incluidas en los datos de OpenStreetMap).</string>
 </resources>

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

@@ -3857,4 +3857,34 @@
     <string name="poi_parking_rooftop">Azotea</string>
     <string name="poi_parking_layby">Apartadero</string>
     <string name="poi_gpx_point">Punto GPX</string>
+    <string name="poi_liaison_subnational">Subnacional</string>
+    <string name="poi_liaison_representative_office">Oficina representativa</string>
+    <string name="poi_liaison_liaison_office">Oficina</string>
+    <string name="poi_liaison_filter">Enlace</string>
+    <string name="poi_embassy_yes">Dirigido por un embajador</string>
+    <string name="poi_embassy_residence">Residencia</string>
+    <string name="poi_embassy_nunciature">Nunciatura</string>
+    <string name="poi_embassy_mission">Misión</string>
+    <string name="poi_embassy_interests_section">Sección de intereses</string>
+    <string name="poi_embassy_high_commission">Alto comisionado</string>
+    <string name="poi_embassy_filter">Embajada</string>
+    <string name="poi_embassy_delegation">Delegación</string>
+    <string name="poi_embassy_branch_embassy">Sucursal;Ramal</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Sí</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">No</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visas de no inmigrante</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Sí</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">No</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Visas de inmigrante</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Sí</string>
+    <string name="poi_diplomatic_services_citizen_services_no">No</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servicios al ciudadano</string>
+    <string name="poi_diplomatic_liaison">Enlace</string>
+    <string name="poi_diplomatic_embassy">Embajada</string>
+    <string name="poi_consulate_yes">Dirigido por un cónsul</string>
+    <string name="poi_consulate_honorary_consul">Cónsul honorario</string>
+    <string name="poi_consulate_filter">Consulado</string>
+    <string name="poi_consulate_consulate_general">Consulado general</string>
+    <string name="poi_consulate_consular_office">Oficina consular</string>
+    <string name="poi_consulate_consular_agency">Agencia consular</string>
 </resources>

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

@@ -1921,7 +1921,7 @@
     <string name="full_report">Informe completo</string>
     <string name="open_street_map_login_and_pass">Nombre de usuario y contraseña de OSM</string>
     <string name="report">Informe</string>
-    <string name="file_name_containes_illegal_char">El nombre del archivo contiene caracteres ilegales</string>
+    <string name="file_name_containes_illegal_char">Carácter ilegal en el nombre del archivo</string>
     <string name="no_map_markers_found">Añade marcadores a través del mapa</string>
     <string name="no_waypoints_found">No se encontraron puntos de referencia</string>
     <string name="rendering_value_thin_name">Fino</string>
@@ -2462,7 +2462,7 @@
     <string name="measurement_tool_action_bar">Navega por el mapa y añade puntos</string>
     <string name="measurement_tool">Medir distancia</string>
     <string name="none_point_error">Añadir al menos un punto.</string>
-    <string name="enter_gpx_name">Nombre del GPX:</string>
+    <string name="enter_gpx_name">Nombre del archivo GPX:</string>
     <string name="show_on_map_after_saving">Mostrar en el mapa al guardar</string>
     <string name="add_waypoint">Añadir punto de referencia</string>
     <string name="save_gpx_waypoint">Guardar punto GPX</string>
@@ -3085,9 +3085,9 @@
     <string name="zoom_by_wunderlinq_descr">Cambia el zoom del mapa desplazando la rueda hacia arriba y abajo. La tecla «Escape» retrocede a la aplicación WunderLINQ.</string>
     <string name="zoom_by_wunderlinq">Controlar con WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Añadir al menos un elemento a la lista en los ajustes de «Acción rápida»</string>
-    <string name="routing_attr_piste_type_downhill_name">Esquí alpino o de descenso</string>
+    <string name="routing_attr_piste_type_downhill_name">Esquí alpino y de descenso</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esquí alpino o de descenso y acceso a remontes mecánicos.</string>
-    <string name="routing_attr_piste_type_nordic_name">Esquí de travesía o nórdico</string>
+    <string name="routing_attr_piste_type_nordic_name">Esquí de travesía y nórdico</string>
     <string name="routing_attr_piste_type_nordic_description">Senderos para esquí nórdico o de travesía.</string>
     <string name="routing_attr_piste_type_skitour_name">Esquí de travesía</string>
     <string name="routing_attr_piste_type_skitour_description">Rutas para esquí de travesía.</string>
@@ -3368,7 +3368,7 @@
     <string name="default_speed_dialog_msg">Estima el tiempo de llegada para los tipos de caminos desconocidos, y limita la velocidad para todos los caminos (puede afectar a la ruta)</string>
     <string name="file_imported_successfully">«%1$s» importado(s).</string>
     <string name="track_saved">Traza guardada</string>
-    <string name="empty_filename">Nombre del archivo vacío</string>
+    <string name="empty_filename">Nombre de archivo vacío</string>
     <string name="shared_string_revert">Revertir</string>
     <string name="quick_action_directions_from_desc">Un botón para hacer que la pantalla se centre en el punto de partida. Luego define el destino o activa el cálculo de la ruta.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Mostrar nodo de la red de rutas ciclistas</string>
@@ -3835,7 +3835,7 @@
     <string name="select_another_track">Elegir otra traza</string>
     <string name="save_track_to_gpx_globally">Guardar traza en archivo GPX</string>
     <string name="save_track_to_gpx">Grabar la traza automáticamente al navegar</string>
-    <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activar mediante el widget de grabación de viaje sobre el mapa).</string>
+    <string name="save_global_track_interval_descr">Intervalo de registro para la grabación general de trazas (activado desde el widget «Grabación de viaje» en el mapa).</string>
     <string name="save_as_new_track">Guardar como nueva traza</string>
     <string name="route_between_points_whole_track_button_desc">Recalcular toda la traza usando el perfil elegido.</string>
     <string name="route_between_points_warning_desc">A continuación, ajusta la traza al camino permitido más cercano con un perfil de navegación.</string>
@@ -3890,7 +3890,7 @@
     <string name="shared_string_redo">Rehacer</string>
     <string name="release_3_8">• Se ha actualizado la función «Planificar ruta»: permite utilizar diferentes tipos de navegación por segmento y la inclusión de trazas
 \n
-\n • Nuevo menú con el aspecto de las trazas: elegir el color, el grosor, mostrar las flechas de dirección y los iconos de inicio/fin.
+\n • Nuevo menú con el aspecto de las trazas: elegir el color, el grosor, mostrar las flechas de dirección y los iconos de inicio y fin.
 \n
 \n • Mejoras en la visibilidad de los nodos de bicicleta.
 \n
@@ -3906,7 +3906,7 @@
     <string name="sort_name_descending">Nombre: Z – A</string>
     <string name="sort_name_ascending">Nombre: A – Z</string>
     <string name="sort_last_modified">Último modificado</string>
-    <string name="start_finish_icons">Iconos de inicio/fin</string>
+    <string name="start_finish_icons">Iconos de inicio y fin</string>
     <string name="contour_lines_thanks">Gracias por comprar las «Curvas de nivel»</string>
     <string name="osm_live_payment_desc_hw">La suscripción se cobra por el período elegido. Puedes cancelarlo en cualquier momento en AppGallery.</string>
     <string name="osm_live_payment_subscription_management_hw">El pago será cargado a la cuenta de AppGallery al confirmar la compra.
@@ -3922,7 +3922,7 @@
     <string name="use_live_routing">Datos de «OsmAnd Live»</string>
     <string name="use_live_public_transport">Datos de «OsmAnd Live»</string>
     <string name="use_complex_routing">Navegación compleja</string>
-    <string name="perform_oauth_authorization_description">Inicia sesión con OAuth para usar las funciones de edición de OSM</string>
+    <string name="perform_oauth_authorization_description">Ingresar con OAuth para usar las funciones de edición de OSM</string>
     <string name="perform_oauth_authorization">Ingresar a través de OAuth</string>
     <string name="osm_edit_logout_success">Sesión finalizada</string>
     <string name="development">Desarrollo</string>
@@ -3948,35 +3948,50 @@
     <string name="icon_group_emergency">Emergencia</string>
     <string name="icon_group_amenity">Comodidad</string>
     <string name="file_already_imported">El archivo ya fue importado en OsmAnd</string>
-    <string name="user_login">Iniciar sesión</string>
+    <string name="user_login">Nombre de usuario</string>
-    <string name="use_login_password">Usar nombre de usuario y contraseña</string>
+    <string name="use_login_password">Ingresar nombre de usuario y contraseña</string>
     <string name="subscription_payment_issue_title">Hay un problema con la suscripción. Pulsa el botón para ir a los ajustes de la suscripción de Google Play y corregir el método de pago.</string>
     <string name="subscription_paused_title">La suscripción a OsmAnd Live se ha pausado</string>
     <string name="subscription_on_hold_title">La suscripción a OsmAnd Live está en espera</string>
     <string name="subscription_expired_title">La suscripción a OsmAnd Live ha caducado</string>
     <string name="sign_in_with_open_street_map">Ingresar con OpenStreetMap</string>
     <string name="send_files_to_openstreetmap">Enviar archivo GPX a OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Debes iniciar sesión para subir cambios nuevos o modificados.
+    <string name="open_street_map_login_mode">Inicia sesión para subir los cambios nuevos o modificados,
 \n
-\nPuedes ingresar usando el método seguro de OAuth o usar el nombre de usuario y contraseña.</string>
+\nya sea con OAuth o usando el nombre de usuario y contraseña.</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Debes añadir al menos dos puntos</string>
     <string name="markers_history">Historial de marcadores</string>
     <string name="manage_subscription">Gestionar suscripción</string>
-    <string name="login_open_street_map_org">Ingresar a OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Ingresar en OpenStreetMap.org</string>
     <string name="login_open_street_map">Iniciar sesión en OpenStreetMap</string>
     <string name="login_account">Cuenta</string>
-    <string name="gpx_upload_trackable_visibility_descr">Trazable significa que la traza no aparecerá en ninguna lista pública pero el conjunto de puntos estarán disponibles a través de la API pública de GPS y con marcas de tiempo. Otros usuarios sólo podrán descargar el conjunto de puntos procesados de su traza que no se pueden asociar directamente con usted.</string>
+    <string name="gpx_upload_trackable_visibility_descr">«Trazable» significa que la traza no aparece en ninguna lista pública, pero el conjunto de puntos procesados con marcas de tiempo (no se pueden asociar directamente con usted) estarán disponibles a través de la API pública de GPS.</string>
-    <string name="gpx_upload_public_visibility_descr">Público significa que la traza se mostrará públicamente en tu listado de trazas y en los listados de trazas GPS públicas. Los datos servidos a través de la API no harán referencia a su página de trazas. Las marcas de tiempo de los puntos de la traza no estarán disponible a través de la API pública de GPS, aunque los puntos se ordenan cronológicamente. Sin embargo, otros usuarios podrán descargar la traza en bruto de la lista de trazas públicas y las marcas de tiempo que contiene.</string>
+    <string name="gpx_upload_public_visibility_descr">«Público» significa que la traza se mostrará públicamente en tu listado de trazas y en los listados de trazas GPS públicas con marcas de tiempo en bruto. Los datos servidos a través de la API no harán referencia a su página de trazas. Las marcas de tiempo de los puntos de la traza no estarán disponible a través de la API pública de GPS, aunque los puntos se ordenan cronológicamente.</string>
-    <string name="gpx_upload_private_visibility_descr">Privado significa que la traza no aparecerá en ninguna lista pública, pero el conjunto de puntos seguirá estando disponible en orden cronológico a través de la API pública de GPS y sin marcas de tiempo.</string>
+    <string name="gpx_upload_private_visibility_descr">«Privado» significa que la traza no aparecerá en ninguna lista pública, pero el conjunto de puntos seguirá estando disponible en orden cronológico a través de la API pública de GPS y sin marcas de tiempo.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identificable significa que la traza se mostrará públicamente en tu listado de trazas y en el listado de trazas GPS públicas, es decir que otros usuarios podrán descargar la traza en bruto y asociarla con su nombre de usuario. Los datos servidos a través de la API de conjunto de puntos hará referencia a la página original de la traza. Las marcas de tiempo de los puntos de la traza estarán disponibles a través de la API pública de GPS.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">«Identificable» significa que la traza se mostrará públicamente en tu listado de trazas y en el listado de trazas GPS públicas, es decir que otros usuarios podrán descargar la traza en bruto y asociarla con su nombre de usuario. Los datos servidos a través de la API de conjunto de puntos hará referencia a la página original de la traza.</string>
     <string name="enter_text_separated">Ingresa etiquetas separadas por comas.</string>
     <string name="shared_string_add_photo">Añadir foto</string>
     <string name="register_opr_have_account">Ya tengo cuenta</string>
     <string name="register_opr_create_new_account">Crear nueva cuenta</string>
-    <string name="register_on_openplacereviews_desc">Las fotos son provistas por el proyecto de datos abiertos OpenPlaceReviews.org. Para subir fotos debes registrarte en el sitio web.</string>
+    <string name="register_on_openplacereviews_desc">Ingresa en el sitio web del proyecto de datos abiertos OpenPlaceReviews.org para subir más fotos.</string>
     <string name="register_on_openplacereviews">Registrarse en
 \nOpenPlaceReviews.org</string>
-    <string name="osm_login_descr">Puedes iniciar sesión con el método seguro de OAuth o usar el nombre de usuario y contraseña.</string>
+    <string name="osm_login_descr">Ingresa usando el método seguro de OAuth o usa el nombre de usuario y contraseña.</string>
     <string name="osm_edit_comment_note">Comentar nota de OSM</string>
     <string name="osm_edit_close_note">Cerrar nota de OSM</string>
+    <string name="shared_string_search_history">Historial de búsqueda</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="select_data_to_export">Marca los datos que serán exportados al archivo.</string>
+    <string name="file_size_needed_for_import">Necesario para importar</string>
+    <string name="export_not_enough_space_descr">El dispositivo sólo tiene %1$s libre. Por favor, libera algo de espacio o desmarca algunos elementos a exportar.</string>
+    <string name="export_not_enough_space">Sin espacio suficiente</string>
+    <string name="approximate_file_size">Tamaño aproximado del archivo</string>
+    <string name="app_mode_motorboat">Lancha a motor</string>
+    <string name="app_mode_kayak">Kayak</string>
+    <string name="add_to_opr">Añadir a OpenPlaceReviews</string>
+    <string name="add_to_mapillary">Añadir a Mapillary</string>
+    <string name="add_photos_descr">OsmAnd muestra fotos de varios repositorios:
+\nOpenPlaceReviews (fotos de PDI);
+\nMapillary (imágenes a nivel de calle);
+\nWeb / Wikimedia (fotos de PDI incluidas en los datos de OpenStreetMap).</string>
 </resources>

OsmAnd/res/values-es/strings.xml

@@ -3897,4 +3897,48 @@
     <string name="sort_last_modified">Último modificado</string>
     <string name="sort_name_descending">Nombre: Z – A</string>
     <string name="sort_name_ascending">Nombre: A - Z</string>
+    <string name="navigate_point_mgrs">MGRS</string>
+    <string name="what_is_new">Novedades</string>
+    <string name="navigate_point_format_mgrs">MGRS</string>
+    <string name="mgrs_format_descr">OsmAnd usa MGRS, que es similar al formato UTM NATO.</string>
+    <string name="start_finish_icons">Iconos de inicio y fin</string>
+    <string name="development">Desarollo</string>
+    <string name="file_already_imported">El fichero ya está importado en OsmAnd</string>
+    <string name="shared_string_local_maps">Mapas locales</string>
+    <string name="ltr_or_rtl_combine_via_dash">%1$s — %2$s</string>
+    <string name="icon_group_amenity">Servicio</string>
+    <string name="icon_group_special">Especial</string>
+    <string name="icon_group_transport">Transporte</string>
+    <string name="icon_group_service">Servicio</string>
+    <string name="icon_group_symbols">Símbolos</string>
+    <string name="icon_group_sport">Deporte</string>
+    <string name="icon_group_emergency">Emergencia</string>
+    <string name="icon_group_travel">Viajar</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Necesita añadir al menos dos puntos</string>
+    <string name="login_account">Cuenta</string>
+    <string name="user_login">Nombre de usuario</string>
+    <string name="manage_subscription">Gestionar suscripción</string>
+    <string name="send_files_to_openstreetmap">Enviar fichero GPX a OpenStreetMap</string>
+    <string name="enter_text_separated">Introduzca las etiquetas separadas por una coma.</string>
+    <string name="osm_edit_close_note">Cerrar Nota de OSM</string>
+    <string name="osm_edit_comment_note">Comentar Nota de OSM</string>
+    <string name="shared_string_add_photo">Añadir foto</string>
+    <string name="register_on_openplacereviews">Registrar en
+\nOpenPlaceReviews.org</string>
+    <string name="register_opr_create_new_account">Crear cuenta nueva</string>
+    <string name="register_opr_have_account">Ya tengo una cuenta</string>
+    <string name="shared_string_search_history">Historial de búsqueda</string>
+    <string name="app_mode_kayak">Kayak</string>
+    <string name="app_mode_motorboat">Lancha a motor</string>
+    <string name="add_to_mapillary">Añadir a Mapillary</string>
+    <string name="add_to_opr">Añadir a OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd muestra fotos de diferentes fuentes:
+\nOpenPlaceReviews - fotos POI;
+\nMapillary - imágenes a nivel de calle;
+\nWeb / Wikimedia - fotos POI especificadas en los datos de OpenStreetMap.</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="approximate_file_size">Tamaño de fichero aproximado</string>
+    <string name="select_data_to_export">Seleccione los datos para exportar al fichero.</string>
+    <string name="file_size_needed_for_import">Necesario para importar</string>
+    <string name="export_not_enough_space">No hay espacio suficiente</string>
 </resources>

OsmAnd/res/values-et/phrases.xml

@@ -3832,4 +3832,9 @@
     <string name="poi_parking_sheds">Parkimine varjualustes</string>
     <string name="poi_parking_rooftop">Parkla katusel</string>
     <string name="poi_radar_tower">Radarimast</string>
+    <string name="poi_embassy_residence">Residents</string>
+    <string name="poi_embassy_nunciature">Nuntsiatuur</string>
+    <string name="poi_diplomatic_embassy">Saatkond</string>
+    <string name="poi_consulate_filter">Konsulaat</string>
+    <string name="poi_embassy_filter">Saatkond</string>
 </resources>

OsmAnd/res/values-eu/phrases.xml

@@ -1749,7 +1749,7 @@
     <string name="poi_podiatrist">Oin-sendagile</string>
     <string name="poi_tax_advisor">Zerga aholkularien bulegoa</string>
     <string name="poi_ice_stock">Ice stock kirola</string>
-    <string name="poi_korfbal">Korfbal</string>
+    <string name="poi_korfbal">Korfball</string>
     <string name="poi_paddle_tennis">Paddle tenisa</string>
     <string name="poi_racquet">Erraketa (kirol tresna)</string>
     <string name="poi_rugby_union">Errugbi elkartea</string>
@@ -2592,7 +2592,7 @@
     <string name="poi_pump_powered">Motorizatua</string>
     <string name="poi_pump_no">Bonba gabekoa</string>
     <string name="poi_water_characteristic_mineral">Minerala</string>
-    <string name="poi_water_characteristic_mud">Uraren ezaugarria: lokatza</string>
+    <string name="poi_water_characteristic_mud">Lokatza</string>
     <string name="poi_water_characteristic_sulfuric">Sulfurikoa</string>
     <string name="poi_water_point">Ur-puntua</string>
     <string name="poi_information_guidepost">Poste adierazlea</string>
@@ -3549,18 +3549,18 @@
     <string name="poi_rtsa_scale_filter">Zailtasun-kategoria</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">1A</string>
     <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
-    <string name="poi_rtsa_scale_1b">1Б</string>
+    <string name="poi_rtsa_scale_1b">1B</string>
-    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1B*</string>
-    <string name="poi_rtsa_scale_2a">2А</string>
+    <string name="poi_rtsa_scale_2a">2A</string>
-    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2A*</string>
-    <string name="poi_rtsa_scale_2b">2Б</string>
+    <string name="poi_rtsa_scale_2b">2B</string>
-    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2B*</string>
-    <string name="poi_rtsa_scale_3a">3А</string>
+    <string name="poi_rtsa_scale_3a">3A</string>
-    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3A*</string>
-    <string name="poi_rtsa_scale_3b">3Б</string>
+    <string name="poi_rtsa_scale_3b">3B</string>
-    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3B*</string>
     <string name="poi_change_delete">Ezabatutako objektua</string>
     <string name="poi_health_specialty_radiotherapy_yes">Erradioterapia</string>
     <string name="poi_climbing_crag">Bai</string>
@@ -3789,7 +3789,7 @@
     <string name="poi_booth">Kabina mota</string>
     <string name="poi_video_yes">Bai</string>
     <string name="poi_video_no">Ez</string>
-    <string name="poi_internet_access_fee_customers">Zutoina aurkitzeko seinalea</string>
+    <string name="poi_internet_access_fee_customers">Internet sarbidea: Bezeroak</string>
     <string name="poi_traffic_signals_sound_locate">Ibiltzea baimenduta dagoenean soilik</string>
     <string name="poi_tactile_paving_contrasted">Kontrastatua</string>
     <string name="poi_tactile_paving_primitive">Primitiboa</string>
@@ -3803,7 +3803,7 @@
     <string name="poi_seamark_water_level_awash">Ur maila: boladaka</string>
     <string name="poi_drinking_water_refill_network">Edateko ura betetzeko sarea</string>
     <string name="poi_drinking_water_refill_no">Edateko ura betetzeko: ez</string>
-    <string name="poi_drinking_water_refill_yes">Edateko ura betetzeko: bai</string>
+    <string name="poi_drinking_water_refill_yes">Bai</string>
     <string name="poi_seamark_obstruction">Trabatzea</string>
     <string name="poi_seamark_water_level_below_mwl">Ur maila: batezbestekotik behera</string>
     <string name="poi_seamark_water_level_above_mwl">Ur maila: batezbestekotik gora</string>

OsmAnd/res/values-fa/strings.xml

@@ -3980,4 +3980,11 @@
     <string name="gpx_upload_private_visibility_descr">خصوصی یا Private به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد از طریق API جی‌پی‌اس‌های عمومی بدون مهر زمان و بدون ترتیب زمانی دست‌یافتنی است.</string>
     <string name="gpx_upload_identifiable_visibility_descr">قابل‌شناسایی یا Identifiable به این معنی است که رد به‌صورت عمومی در لیست ردهای جی‌پی‌اس شما و لیست عمومی ردهای جی‌پی‌اس نمایش داده می‌شود، یعنی سایر کاربران می‌توانند رد خام را دانلود کنند و بدانند که مربوط به نام کاربری شماست. دادهٔ نقاط رد که از طریق API در دسترس قرار می‌گیرد، به صفحهٔ ردهای شما ارجاع می‌دهد. مهر زمان نقاط رد از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است.</string>
     <string name="gpx_upload_trackable_visibility_descr">قابل‌ردیابی یا Trackable به این معنی است که رد در هیچ‌یک از لیست‌های عمومی نشان داده نمی‌شود اما نقاط رد + مهر زمان نقاط از طریق API جی‌پی‌اس‌های عمومی دست‌یافتنی است. سایر کاربران فقط می‌توانند نقاط پردازش‌شدهٔ رد شما را دانلود کنند که مستقیماً امکان ارجاع به نام کاربری شما را ندارد.</string>
+    <string name="shared_string_add_photo">افزودن عکس</string>
+    <string name="register_on_openplacereviews_desc">عکس‌ها از طریق پروژهٔ داده‌باز OpenPlaceReviews.org ارائه می‌شود. برای آپلود عکس‌های خود لازم است در این وبگاه ثبت نام کنید.</string>
+    <string name="register_on_openplacereviews">ثبت نام در
+\nOpenPlaceReviews.org</string>
+    <string name="register_opr_create_new_account">ساخت حساب جدید</string>
+    <string name="register_opr_have_account">حساب کاربری دارم</string>
+    <string name="shared_string_search_history">تاریخچهٔ جست‌وجو</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -3899,7 +3899,7 @@
     <string name="use_native_pt">Développement du transport public autochtone</string>
     <string name="perform_oauth_authorization">Connectez-vous avec OAuth</string>
     <string name="clear_osm_token">Supprimer le jeton OAuth d\'OpenStreetMap</string>
-    <string name="osm_edit_logout_success">Déconnexion réussie</string>
+    <string name="osm_edit_logout_success">Déconnecté</string>
     <string name="file_already_imported">Le fichier est déjà importé dans OsmAnd</string>
     <string name="use_two_phase_routing">Utiliser un algorithme de routage A* à 2 phases</string>
     <string name="osm_live_payment_subscription_management_hw">Le paiement sera débité de votre compte AppGallery dès confirmation de l\'achat.
@@ -3930,10 +3930,10 @@
     <string name="subscription_on_hold_title">L\'abonnement OsmAnd Live est en attente</string>
     <string name="subscription_expired_title">L’abonnement OsmAnd Live a expiré</string>
     <string name="subscription_paused_title">L\'abonnement OsmAnd Live a été suspendu</string>
-    <string name="login_open_street_map">Se connecter à OpenStreetMap</string>
+    <string name="login_open_street_map">Se connecter pour OpenStreetMap</string>
-    <string name="login_open_street_map_org">Se connecter à OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Se connecter pour OpenStreetMap.org</string>
     <string name="user_login">Identifiant</string>
-    <string name="use_login_password">Utiliser un identifiant et un mot de passe</string>
+    <string name="use_login_password">Se connecter avec un identifiant et un mot de passe</string>
     <string name="login_account">Compte</string>
     <string name="manage_subscription">Gérer l\'abonnement</string>
     <string name="sign_in_with_open_street_map">Se connecter avec OpenStreetMap</string>
@@ -3948,11 +3948,20 @@
 \nOpenPlaceReviews.org</string>
     <string name="register_opr_create_new_account">Créer un nouveau compte</string>
     <string name="register_opr_have_account">J\'ai déjà un compte</string>
-    <string name="open_street_map_login_mode">Vous devez vous connecter pour envoyer vos modifications.
+    <string name="open_street_map_login_mode">Connectez-vous pour envoyer vos modifications,
 \n
-\nVous pouvez vous connecter avec la méthode sécurisée OAuth ou utiliser votre identifiant et votre mot de passe.</string>
+\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="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>
+    <string name="app_mode_motorboat">Bateau à moteur</string>
+    <string name="shared_string_resources">Ressources</string>
+    <string name="approximate_file_size">Taille approximative du fichier</string>
+    <string name="select_data_to_export">Sélectionnez les données à exporter dans le fichier.</string>
+    <string name="file_size_needed_for_import">Nécessaire pour l\'import</string>
+    <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>
 </resources>

OsmAnd/res/values-gl/phrases.xml

@@ -796,7 +796,7 @@
     <string name="poi_recycling_light_bulbs">Lámpadas eléctricas</string>
     <string name="poi_recycling_polyester">Poliéster</string>
     <string name="poi_school">Escola</string>
-    <string name="poi_college">Universidade</string>
+    <string name="poi_college">Educación superior</string>
     <string name="poi_paediatrics">Pediatría</string>
     <string name="poi_archery">Tiro con arco</string>
     <string name="poi_shooting">Salón de tiro</string>
@@ -3843,4 +3843,34 @@
     <string name="poi_parking_rooftop">Terrazo</string>
     <string name="poi_gpx_point">Punto GPX</string>
     <string name="poi_radar_tower">Torre de radar</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Non</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Si</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Non</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Si</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Non</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Si</string>
+    <string name="poi_liaison_subnational">Subnacional</string>
+    <string name="poi_liaison_representative_office">Oficina representativa</string>
+    <string name="poi_liaison_liaison_office">Oficina</string>
+    <string name="poi_consulate_honorary_consul">Cónsul honorario</string>
+    <string name="poi_consulate_consulate_general">Consulado xeral</string>
+    <string name="poi_consulate_consular_office">Oficina consular</string>
+    <string name="poi_consulate_consular_agency">Axencia consular</string>
+    <string name="poi_consulate_yes">Dirixido por un cónsul</string>
+    <string name="poi_embassy_residence">Residencia</string>
+    <string name="poi_embassy_nunciature">Nunciatura</string>
+    <string name="poi_embassy_mission">Misión</string>
+    <string name="poi_embassy_interests_section">Sección de intereses</string>
+    <string name="poi_embassy_high_commission">Alto comisionado</string>
+    <string name="poi_embassy_delegation">Delegación</string>
+    <string name="poi_embassy_branch_embassy">Sucursal</string>
+    <string name="poi_embassy_yes">Dirixido por un embaixador</string>
+    <string name="poi_diplomatic_liaison">Ligazón</string>
+    <string name="poi_diplomatic_embassy">Embaixada</string>
+    <string name="poi_diplomatic_services_citizen_services_filter">Servizos ó cidadán</string>
+    <string name="poi_diplomatic_services_immigrant_visas_filter">Visados de inmigrante</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Visados de non inmigrante</string>
+    <string name="poi_liaison_filter">Ligazón</string>
+    <string name="poi_consulate_filter">Consulado</string>
+    <string name="poi_embassy_filter">Embaixada</string>
 </resources>

OsmAnd/res/values-gl/strings.xml

@@ -753,7 +753,7 @@
     <string name="use_fluorescent_overlays">Sobreposicións fluorescentes</string>
     <string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosar as pistas e rutas.</string>
     <string name="offline_edition">Edición sen conexión</string>
-    <string name="offline_edition_descr">Empregar sempre a edición sen conexión.</string>
+    <string name="offline_edition_descr">Se se activa a edición sen conexión, as modificacións serán gardadas de xeito local primeiro e serán cargadas por solicitude, do contrario as modificacións serán cargadas de xeito inmediato.</string>
     <string name="update_poi_does_not_change_indexes">As modificacións nos puntos de interese (PDI) dentro da aplicación non afectan ós ficheiros dos mapas baixados, pois esas modificacións gárdanse coma un ficheiro no teu dispositivo.</string>
     <string name="local_openstreetmap_uploading">Estase a subir…</string>
     <string name="local_openstreetmap_were_uploaded">{0} PDI/notas subidos</string>
@@ -2063,7 +2063,7 @@ Lon %2$s</string>
     <string name="number_of_contributors">Número de colaboradores</string>
     <string name="number_of_edits">Número de edicións</string>
     <string name="reports_for">Informe para</string>
-    <string name="file_name_containes_illegal_char">O nome do ficheiro contén un carácter incorrecto</string>
+    <string name="file_name_containes_illegal_char">Caráter ilegal no nome do ficheiro</string>
     <string name="configure_screen_quick_action">Acción rápida</string>
     <string name="quick_action_item_action">Acción %d</string>
     <string name="quick_action_item_screen">Pantalla %d</string>
@@ -2365,7 +2365,7 @@ Lon %2$s</string>
     <string name="last_intermediate_dest_description">Engade unha parada intermedia</string>
     <string name="first_intermediate_dest_description">Engade a primeira parada do percorrido</string>
     <string name="subsequent_dest_description">Move o destino cara enriba e crea un novo</string>
-    <string name="switch_osm_notes_visibility_desc">Amosar/agochar as notas do OSM no mapa.</string>
+    <string name="switch_osm_notes_visibility_desc">Amosar ou agochar as notas do OSM no mapa.</string>
     <string name="gpx_file_desc">GPX - axeitado para exportar a JOSM ou outros editores do OSM.</string>
     <string name="osc_file_desc">OSC - axeitado para exportar ó OSM.</string>
     <string name="shared_string_gpx_file">Ficheiro GPX</string>
@@ -3115,9 +3115,9 @@ Lon %2$s</string>
     <string name="zoom_by_wunderlinq_descr">Muda o achegamento do mapa desprazando a roda cara arriba e abaixo. A tecla «Esc» volta á aplicación WunderLINQ.</string>
     <string name="zoom_by_wunderlinq">Controlar co WunderLINQ</string>
     <string name="quick_action_need_to_add_item_to_list">Engadir polo menos un elemento á listaxe nos axustes de \'Acción rápida\'</string>
-    <string name="routing_attr_piste_type_downhill_name">Esquí alpino/de descendemento</string>
+    <string name="routing_attr_piste_type_downhill_name">Esquí alpino e de descendemento</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esquí alpino ou de descendemento e acceso a remontes mecánicos.</string>
-    <string name="routing_attr_piste_type_nordic_name">Esquí de travesía/nórdico</string>
+    <string name="routing_attr_piste_type_nordic_name">Esquí de travesía e nórdico</string>
     <string name="routing_attr_piste_type_nordic_description">Pistas para esquí nórdico ou de travesía.</string>
     <string name="routing_attr_piste_type_skitour_name">Esquí de travesía</string>
     <string name="routing_attr_piste_type_skitour_description">Roteiros para esquí de travesía.</string>
@@ -3385,7 +3385,7 @@ Lon %2$s</string>
     <string name="swap_two_places">Trocar %1$s e %2$s</string>
     <string name="route_start_point">Punto de comezo</string>
     <string name="track_saved">Pista gardada</string>
-    <string name="empty_filename">O nome do ficheiro está baleiro</string>
+    <string name="empty_filename">Nome do ficheiro baleiro</string>
     <string name="shared_string_revert">Reverter</string>
     <string name="quick_action_directions_from_desc">Un botón para facer que a pantalla se centre no punto de partida. Despois define o destino ou activa o cálculo da ruta.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Amosar os nós da rede de sendas ciclistas</string>
@@ -3450,7 +3450,7 @@ Lon %2$s</string>
     <string name="login_and_pass">Nome de usuario e contrasinal</string>
     <string name="plugin_global_prefs_info">Os axustes deste complemento son globais e aplícanse a todos os perfís</string>
     <string name="osm_editing">Edición do OSM</string>
-    <string name="osm_edits_view_descr">Podes ollar todas as túas edición non subidas ou erros do OSM en %1$s. Os puntos subidos non se amosan no OsmAnd.</string>
+    <string name="osm_edits_view_descr">Podes ollar todas as túas edicións aínda non subidas ou erros do OSM en %1$s. Os puntos subidos non se amosan no OsmAnd.</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">A icona amósase mentres se navega ou se move pola pantalla.</string>
     <string name="select_map_icon_descr">A icona amósase en asueto.</string>
@@ -3647,7 +3647,7 @@ Lon %2$s</string>
     <string name="recalculate_route_distance_promo">A ruta será recalculada se a distancia á localización actual é maior que o valor escollido.</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pendentes</string>
-    <string name="quick_action_show_hide_terrain">Amosar / agochar terreo</string>
+    <string name="quick_action_show_hide_terrain">Amosar ou agochar terreo</string>
     <string name="quick_action_terrain_hide">Agochar terreo</string>
     <string name="quick_action_terrain_show">Amosar terreo</string>
     <string name="quick_action_terrain_descr">Un botón que amosa ou agocha a capa do terreo no mapa.</string>
@@ -3716,11 +3716,11 @@ Lon %2$s</string>
     <string name="additional_actions_descr">Podes acceder a estas accións premendo no botón “%1$s”.</string>
     <string name="quick_action_transport_hide">Agochar transporte público</string>
     <string name="quick_action_transport_show">Amosar transporte público</string>
-    <string name="quick_action_show_hide_transport">Amosar/agochar transporte público</string>
+    <string name="quick_action_show_hide_transport">Amosar ou agochar transporte público</string>
     <string name="quick_action_transport_descr">Botón que amosa ou agocha o transporte público no mapa.</string>
-    <string name="create_edit_poi">Crear / Editar PDI</string>
+    <string name="create_edit_poi">Crear ou editar PDI</string>
     <string name="parking_positions">Posicións de aparcamento</string>
-    <string name="add_edit_favorite">Engadir / Editar favorito</string>
+    <string name="add_edit_favorite">Engadir ou editar favorito</string>
     <string name="reset_deafult_order">Restabelecer a orde dos elementos predefinidos</string>
     <string name="back_to_editing">Voltar á edición</string>
     <string name="quick_action_switch_profile_descr">O botón de acción troca entre os perfís escollidos.</string>
@@ -3854,7 +3854,7 @@ Lon %2$s</string>
     <string name="shared_string_redo">Refacer</string>
     <string name="release_3_8">• Actualizouse a función \"Planificar ruta\": permite empregar diferentes tipos de navegación por segmento e o engadido de pistas
 \n
-\n • Novo menú coa aparencia das pistas: escoller a cor, o grosor, amosar as frechas de dirección e as iconas de comezo/final.
+\n • Novo menú coa aparencia das pistas: escoller a cor, o grosor, amosar as frechas de dirección e as iconas de inicio e final.
 \n
 \n • Melloras na visibilidade dos nós de bicicleta.
 \n
@@ -3924,11 +3924,11 @@ Lon %2$s</string>
     <string name="number_of_gpx_files_selected_pattern">%s ficheiros de pista seleccionados</string>
     <string name="monitoring_control_start">Gravar</string>
     <string name="disable_recording_once_app_killed_descrp">A gravación da pista deterase ó pechar a aplicación (mediante aplicacións recentes). (A indicación de fondo do OsmAnd, desaparecerá da barra de notificacións do Android.)</string>
-    <string name="save_global_track_interval_descr">Especifica o intre de gravación xeral para pistas (habilitado a través do trebello de gravación no mapa).</string>
+    <string name="save_global_track_interval_descr">Especifica o intre de gravación xeral para pistas (habilitado a través do trebello de \'Gravación no mapa\').</string>
     <string name="sort_last_modified">Última modificación</string>
     <string name="sort_name_descending">Nome: Z – A</string>
     <string name="sort_name_ascending">Nome: A – Z</string>
-    <string name="start_finish_icons">Iconas de comezo/final</string>
+    <string name="start_finish_icons">Iconas de inicio e fin</string>
     <string name="contour_lines_thanks">Grazas por mercar \'Curvas de nivel\'</string>
     <string name="osm_live_payment_desc_hw">Subscrición cobrada por período escollido. Cancélaa na AppGallery en calquera intre.</string>
     <string name="osm_live_payment_subscription_management_hw">O pagamento será cargado na túa conta da AppGallery no mesmo intre da confirmación da compra.
@@ -3946,7 +3946,7 @@ Lon %2$s</string>
     <string name="use_native_pt">Desenvolvemento do transporte público nativo</string>
     <string name="use_native_pt_desc">Activar cálculo de enrutamento de transporte público do Java (seguro)</string>
     <string name="what_is_new">Novidades</string>
-    <string name="perform_oauth_authorization_description">Inicia sesión co OAuth para empregar as funcións de edición do OSM</string>
+    <string name="perform_oauth_authorization_description">Inicia a sesión co OAuth para empregar as funcións de edición do OSM</string>
     <string name="perform_oauth_authorization">Entrar polo OAuth</string>
     <string name="clear_osm_token">Limpar token do OpenStreetMap OAuth</string>
     <string name="osm_edit_logout_success">Sesión rematada</string>
@@ -3977,20 +3977,38 @@ Lon %2$s</string>
     <string name="subscription_expired_title">A subscrición do OsmAnd Live expirou</string>
     <string name="subscription_paused_title">A subscrición do OsmAnd Live foi detida</string>
     <string name="subscription_on_hold_title">A subscrición do OsmAnd Live está en espera</string>
-    <string name="gpx_upload_public_visibility_descr">Público significa que a pista amosarase de xeito público na túa listaxe de pistas e nas listaxes de pistas GPS públicas. Os datos servidos a través da API non farán referencia á túa páxina de pistas. As marcaxes de tempo dos puntos da pista non estarán dispoñíbeis a través da API pública de GPS, aínda que os puntos ordénanse de xeito cronolóxico. Porén, outros usuarios poderán baixar a pista en bruto da listaxe de pistas públicas e as marcaxes de tempo que contén.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Público\" significa que a pista amosarase de xeito público na túa listaxe de pistas e nas listaxes de pistas GPS públicas con marcas de tempo en bruto. Os datos servidos a través da API no farán referencia á túa pácina de pistas. As marcaxes de tempo dos puntos da pista non estarán dispoñíbeis a través da API pública de GPS, aínda que os puntos son ordenados de xeito cronolóxico.</string>
-    <string name="login_open_street_map">Iniciar sesión no OpenStreetMap</string>
+    <string name="login_open_street_map">Iniciar a sesión no OpenStreetMap</string>
-    <string name="login_open_street_map_org">Entrar ó OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Iniciar a sesión no OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">Entrar co OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">Iniciar a sesión co OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Precisas iniciar sesión para subir modificacións novas.
+    <string name="open_street_map_login_mode">Inicia a sesión para subir as modificacións novas,
 \n
-\nPodes iniciar sesión empregando o método seguro de OAuth ou empregar o nome de usuario e contrasinal.</string>
+\nxa sexa co OAuth ou empregando o teu nome de usuario e contrasinal.</string>
-    <string name="use_login_password">Empregar nome de usuario e contrasinal</string>
+    <string name="use_login_password">Iniciar a sesión co nome de usuario e contrasinal</string>
     <string name="login_account">Conta</string>
-    <string name="user_login">Iniciar sesión</string>
+    <string name="user_login">Nome de usuario</string>
     <string name="markers_history">Historial de marcaxes</string>
     <string name="send_files_to_openstreetmap">Enviar ficheiro GPX ó OpenStreetMap</string>
     <string name="enter_text_separated">Insire etiquetas separadas por comas.</string>
-    <string name="gpx_upload_private_visibility_descr">Privado significa que a pista non aparecerá en ningunha listaxe pública, mais o conxunto de puntos seguirá estando dispoñíbel en orde cronolóxica a través da API pública de GPS e sen marcaxes de tempo.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Privado\" significa que a pista non aparecerá en ningunha listaxe pública, pero o conxunto de puntos seguirá estando dispoñíbel en orde cronolóxica a través da API pública de GPS e sen marcas de tempo.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Rastrexábel (ou trazábel) significa que a pista non aparecerá en ningunha listaxe pública pero o conxunto de puntos estarán dispoñíbeis a través da API pública de GPS e con marcaxes de tempo. Outros usuarios só poderán baixar o conxunto de puntos procesados da túa pista que non se poden asociar directamente contigo.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Rastrexábel\" (ou \"trazábel\") significa que a pista non aparece en ningunha listaxe pública, pero o conxunto de puntos procesados con marcas de tempo (non se poden asociar directamente contigo) estarán dispoñíbeis a través da API pública de GPS.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identificábel significa que a pista amosarase de xeito público na túa listaxe de pistas e na listaxe de pistas GPS públicas, é dicir que outros usuarios poderán baixar a pista en bruto e asociala co teu nome de usuario. Os datos servidos a través da API de conxunto de puntos fará referencia á páxina orixinal da pista. As marcaxes de tempo dos puntos da traza estarán dispoñíbeis a través da API pública de GPS.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificábel\" significa que a pista amosarase de xeito público na túa listaxe de pistas e na listaxe de pistas GPS públicas, é dicir que outros usuarios poderán baixar a pista en bruto e asociala co seu nome de usuario. Os datos servidos a través da API de conxunto de puntos fará referencia á páxina orixinal da pista.</string>
+    <string name="osm_edit_close_note">Pechar nota do OSM</string>
+    <string name="osm_edit_comment_note">Comentar nota do OSM</string>
+    <string name="osm_login_descr">Inicia a sesión co método seguro do OAuth ou emprega o nome de usuario e contrasinal.</string>
+    <string name="shared_string_add_photo">Engadir imaxe</string>
+    <string name="register_on_openplacereviews">Rexistrarse no
+\nOpenPlaceReviews.org</string>
+    <string name="register_on_openplacereviews_desc">Inicia a sesión no sitio web do proxecto de datos abertos do OpenPlaceReviews.org para subir máis imaxes.</string>
+    <string name="register_opr_create_new_account">Crear nova conta</string>
+    <string name="register_opr_have_account">Xa teño unha conta</string>
+    <string name="shared_string_search_history">Historial de procura</string>
+    <string name="app_mode_kayak">Caiac</string>
+    <string name="app_mode_motorboat">Lancha a motor</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="approximate_file_size">Tamaño aproximado do ficheiro</string>
+    <string name="select_data_to_export">Marca os datos que serán exportados ó ficheiro.</string>
+    <string name="file_size_needed_for_import">Necesario para importar</string>
+    <string name="export_not_enough_space_descr">O teu dispositivo só ten %1$s libre. Por favor, libera algo de espazo ou desmarca algúns elementos a exportar.</string>
+    <string name="export_not_enough_space">Sen espazo dabondo</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3842,4 +3842,5 @@
     <string name="poi_internet_access_fee_customers">Internetcsatlakozás: ügyfeleknek</string>
     <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>
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -1772,7 +1772,7 @@
     <string name="arrival_distance_descr">Hve snemma viltu fá tilkynningu um komu?</string>
     <string name="rendering_out_of_memory">Ekki nægt vinnsluminni til að birta valið svæði</string>
     <string name="offline_edition">Ónettengdar breytingar</string>
-    <string name="offline_edition_descr">Alltaf nota ónettengdar breytingar.</string>
+    <string name="offline_edition_descr">Ef ónettengdar breytingar eru virkar, þá eru breytingar fyrst vistaðar á tækinu og síðan sendar inn samkvæmt beiðni. Annars gerist þetta jafnóðum.</string>
     <string name="local_openstreetmap_upload">Senda breytingu inn til OSM</string>
     <string name="local_openstreetmap_descr_title">Ósamstilltar (async) OSM-breytingar:</string>
     <string name="free_version_message">Þú getur sótt eða uppfært %1$s kort.</string>
@@ -2164,7 +2164,7 @@
     <string name="routing_attr_no_new_routing_name">Engar v1.9 leiðareglur</string>
     <string name="routing_attr_no_new_routing_description">Ekki nota leiðareglur sem komu til sögunnar í útgáfu 1.9.</string>
     <string name="rendering_attr_shareTaxiRoutes_name">Leiðir deilileigubíla</string>
-    <string name="enter_gpx_name">Nafn GPX skráar:</string>
+    <string name="enter_gpx_name">Heiti GPX-skráar:</string>
     <string name="show_on_map_after_saving">Sýna í korti eftir vistun</string>
     <string name="measurement_tool">Mæla vegalengd</string>
     <string name="store_tracks_in_monthly_directories_descrp">Geyma skráða ferla í undirmöppum fyrir hvern skráningamánuð (svo sem 2018-01).</string>
@@ -2514,7 +2514,7 @@
     <string name="choose_file_type">Veldu skráartegund</string>
     <string name="all_data">Öll gögn</string>
     <string name="show_closed_notes">Sýna lokaða minnispunkta</string>
-    <string name="switch_osm_notes_visibility_desc">Birta/fela OSM-minnispunkta á kortinu.</string>
+    <string name="switch_osm_notes_visibility_desc">Birta eða fela OSM-minnispunkta á kortinu.</string>
     <string name="gpx_file_desc">GPX - hentar til útflutnings fyrir JOSM eða aðra OSM-ritla.</string>
     <string name="osc_file_desc">OSC - hentar til útflutnings í OSM.</string>
     <string name="osm_edits_export_desc">Flytja út sem OSM-minnispunkta, merkisstaði, eða bæði.</string>
@@ -3086,7 +3086,7 @@
     <string name="application_profiles_descr">Veldu notkunarsnið sem eiga að vera sýnileg í forriti.</string>
     <string name="application_profiles">Forritssnið</string>
     <string name="zoom_by_wunderlinq">Nota WunderLINQ við stýringu</string>
-    <string name="routing_attr_piste_type_downhill_name">Brun/svigskíði</string>
+    <string name="routing_attr_piste_type_downhill_name">Brun og svigskíði</string>
     <string name="routing_attr_piste_type_skitour_description">Ferðaleiðir á skíðum.</string>
     <string name="routing_attr_piste_type_sled_description">Brekkur notaðar fyrir sleða.</string>
     <string name="routing_attr_allow_intermediate_name">Leyfa millileiðir</string>
@@ -3105,7 +3105,7 @@
     <string name="zoom_by_wunderlinq_descr">Breyttu aðdrætti á kort með skruni músarhjóls upp og niður. Escape fer aftur með þig inn í WunderLINQ forritið.</string>
     <string name="quick_action_need_to_add_item_to_list">Þú verður að skilgreina a.m.k. eitt atriði í listanum í stillingum flýtiaðgerða</string>
     <string name="routing_attr_piste_type_downhill_description">Brekkur fyrir svigskíði eða brun og aðgangur að skíðalyftum.</string>
-    <string name="routing_attr_piste_type_nordic_name">Gönguskíði/norræn fjallaskíði</string>
+    <string name="routing_attr_piste_type_nordic_name">Gönguskíði og norræn fjallaskíði</string>
     <string name="routing_attr_piste_type_nordic_description">Leiðir fyrir gönguskíði eða norræn fjallaskíði.</string>
     <string name="routing_attr_allow_classic_only_description">Leiðir sem troðnar eru einungis fyrir klassískan stíl en án hluta fyrir skautun. Þetta telur einnig með leiðir sem troðnar eru með minni farartækjum og lausari sporum sem jafnvel eru gerð af skíðagöngufólkinu sjálfu.</string>
     <string name="routing_attr_difficulty_preference_description">Kjósa leiðir á þessu erfiðleikastigi, þótt leiðarval um erfiðari eða auðveldari leiðir séu mögulegar ef um stutta búta sé að ræða.</string>
@@ -3237,7 +3237,7 @@
     <string name="turn_screen_on_info">Birta kort á læsiskjá á meðan leiðsögn stendur.</string>
     <string name="route_parameters_info">Stillingar leiðarvals í valda sniðinu \"%1$s\".</string>
     <string name="wake_time">Tímamörk eftir vöknun</string>
-    <string name="units_and_formats">Einingar og snið þeirra</string>
+    <string name="units_and_formats">Einingar og snið</string>
     <string name="appearance">Útlit</string>
     <string name="map_look_descr">Útlit landakorts</string>
     <string name="map_look">Útlit korts</string>
@@ -3374,7 +3374,7 @@
     <string name="route_start_point">Upphafspunktur</string>
     <string name="default_speed_dialog_msg">Notað til að áætla komutíma á óþekktum gerðum vega og til takmörkunar á hraða á öllum vegum (gæti breytt leiðarvali)</string>
     <string name="track_saved">Ferill vistaður</string>
-    <string name="empty_filename">Skráarheiti er autt</string>
+    <string name="empty_filename">Vantar skráarheiti</string>
     <string name="shared_string_revert">Afturkalla</string>
     <string name="quick_action_directions_from_desc">Hnappur til að gera miðju skjásins að upphafsstað. Mun síðan spyrja um áfangastað eða setja í gang útreikning á leiðum.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Birta hnútanetkerfi fyrir hjólaleiðir</string>
@@ -3582,7 +3582,7 @@
     <string name="terrain_empty_state_text">Virkja til að sjá hæðaskyggingar eða brekkur á korti. Þú getur lesið meira um þessa eiginleika á vefnum okkar.</string>
     <string name="shared_string_hillshade">Hæðaskygging</string>
     <string name="download_slope_maps">Brekkur</string>
-    <string name="quick_action_show_hide_terrain">Birta/fela yfirborð</string>
+    <string name="quick_action_show_hide_terrain">Birta eða fela yfirborð</string>
     <string name="quick_action_terrain_hide">Fela yfirborð</string>
     <string name="quick_action_terrain_show">Sýna yfirborð</string>
     <string name="quick_action_terrain_descr">Hnappur til að birta eða fela yfirborðslag á kortinu.</string>
@@ -3689,7 +3689,7 @@
     <string name="system_screen_timeout">Nota tímamörk kerfis fyrir skjá</string>
     <string name="edit_online_source">Breyta nettengdum gagnagjafa</string>
     <string name="tracker_item">OsmAnd rekjari</string>
-    <string name="create_edit_poi">Búa til / breyta merkisstað</string>
+    <string name="create_edit_poi">Búa til eða breyta merkisstað</string>
     <string name="storage_format">Geymslusnið</string>
     <string name="expire_time">Rennur út</string>
     <string name="quick_action_item">Flýtiaðgerð</string>
@@ -3698,7 +3698,7 @@
     <string name="additional_actions_descr">Þú getur komist í þessar aðgerðir með því að ýta á \"%1$s\"-hnappinn.</string>
     <string name="subscription_osmandlive_item">Áskrift - OsmAnd Live</string>
     <string name="shared_string_always">Alltaf</string>
-    <string name="quick_action_show_hide_transport">Birta/fela almenningssamgöngur</string>
+    <string name="quick_action_show_hide_transport">Birta eða fela almenningssamgöngur</string>
     <string name="reset_deafult_order">Endurheimta sjálfgefna röð atriða</string>
     <string name="unsupported_type_error">Óstudd tegund</string>
     <string name="turn_screen_on_navigation_instructions">Leiðsagnarleiðbeiningar</string>
@@ -3707,7 +3707,7 @@
     <string name="navigation_profiles_item">Leiðsagnarsnið</string>
     <string name="shared_string_resume">Halda áfram</string>
     <string name="mapillary_item">OsmAnd + Mapillary</string>
-    <string name="add_edit_favorite">Bæta við / breyta eftirlæti</string>
+    <string name="add_edit_favorite">Bæta við eða breyta eftirlæti</string>
     <string name="quick_action_transport_show">Birta almenningssamgöngur</string>
     <string name="default_screen_timeout">Sjálfgefin tímamörk fyrir skjá</string>
     <string name="quick_action_transport_descr">Hnappur til að birta eða fela almenningssamgöngur á kortinu.</string>
@@ -3895,7 +3895,7 @@
     <string name="sort_last_modified">Síðast breytt</string>
     <string name="sort_name_descending">Nafn: Ö – A</string>
     <string name="sort_name_ascending">Nafn: A – Ö</string>
-    <string name="start_finish_icons">Tákn við upphaf/enda</string>
+    <string name="start_finish_icons">Tákn við upphaf og enda</string>
     <string name="routing_attr_avoid_footways_description">Forðast gangstéttir</string>
     <string name="routing_attr_avoid_footways_name">Forðast gangstéttir</string>
     <string name="development">Þróun</string>
@@ -3911,12 +3911,12 @@
     <string name="osm_edit_logout_success">Útskráning tókst</string>
     <string name="number_of_gpx_files_selected_pattern">%s GPX-skrár valdar</string>
     <string name="disable_recording_once_app_killed_descrp">Mun setja GPX-skráningu í bið þegar forritið er drepið (slökkt á því í gegnum skjáinn fyrir nýleg forrit - bakgrunnsvísir OsmAnd hverfur þar með úr tilkynningastiku Android-kerfisins.)</string>
-    <string name="save_global_track_interval_descr">Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum fyrir GPX-skráningu á kortinu).</string>
+    <string name="save_global_track_interval_descr">Veldu millibil skráninga í almenna leiðarskráningu (virkjað með viðmótshlutanum \'Skráning ferðar\' á kortinu).</string>
     <string name="gpx_monitoring_stop">Setja skráningu í bið</string>
     <string name="gpx_monitoring_start">Halda áfram með skráningu</string>
     <string name="release_3_8">• Uppfærðar aðgerðir í skipulagningu leiða: mismunandi leiðsögn á hverjum bút auk slóða
 \n
-\n • Ný útlitsvalmynd fyrir slóðir: val á lit, þykkt, birting stefnuörva, táknmynda við upphaf/endi
+\n • Ný útlitsvalmynd fyrir slóðir: val á lit, þykkt, birting stefnuörva, táknmynda við upphaf og endi
 \n
 \n • Bættur sýnileiki hjólreiðahnúta.
 \n
@@ -3975,4 +3975,20 @@
     <string name="mgrs_format_descr">OsmAnd notar MGRS, sem er svipað og UTM-snið NATO.</string>
     <string name="manage_subscription">Sýsla með áskrift</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
+    <string name="gpx_upload_public_visibility_descr">\"Opinbert\" þýðir að ferillinn birtist í GPS-ferlunum þínum og á opinberum listum yfir GPS-ferla, þar sem ferilpunktar eru með tímamerkjum á frumsniði. Gögn sem eru sótt í gegnum opinbert GPS API-forritsviðmót vísa ekki í ferlasíðuna þína. Tímamerki ferilpunkta eru ekki tiltæk í gegnum opinbera GPS API-forritsviðmótið og er ekki raðað í tímaröð.</string>
+    <string name="app_mode_kayak">Kayak</string>
+    <string name="shared_string_add_photo">Bæta við mynd</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Auðkennanlegt\" þýðir að ferillinn birtist í GPS-ferlunum þínum og á opinberum listum yfir GPS-ferla, sem þýðir að aðrir notendur geta sútt frumferilinn og tengt þær upplýsingar við notandanafnið þitt. Opinberir ferilpunktar með tímamerkjum sem eru sóttir í gegnum opinbera GPS API-forritsviðmótið vísa í ferlasíðuna þína.</string>
+    <string name="shared_string_search_history">Leitarferill</string>
+    <string name="gpx_upload_private_visibility_descr">\"Einka\" þýðir að ferillinn birtist ekki á neinum opinberum listum, en ferilpunktar í ótímasettri röð eru tiltækir í gegnum opinbert GPS API-forritsviðmót án tímamerkja.</string>
+    <string name="osm_edit_close_note">Loka OSM-minnispunkti</string>
+    <string name="register_opr_have_account">Ég er nú þegar með notandaaðgang</string>
+    <string name="register_on_openplacereviews">Skráðu þig á
+\nOpenPlaceReviews.org</string>
+    <string name="register_opr_create_new_account">Búa til nýjan notandaaðgang</string>
+    <string name="osm_login_descr">Þú getur skráð þig inn með öruggu OAuth-aðferðinni eða notað notandanafn og lykilorð innskráningar.</string>
+    <string name="app_mode_motorboat">Vélbátar</string>
+    <string name="register_on_openplacereviews_desc">Ljósmyndir eru í boði frá opna gagnaverkefninu OpenPlaceReviews.org. Til að geta sent inn myndir þarftu að skrá þig á vefsvæðinu.</string>
+    <string name="osm_edit_comment_note">Gera athugasemd við OSM-minnispunkt</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Rekjanlegt\" þýðir að ferillinn birtist ekki á neinum opinberum listum, en meðhöndlaðir ferilpunktar með tímamerkjum úr ferlinum (sem ekki er hægt að tengja beint við þig) munu birtast í gögnum sem eru sótt í gegnum opinbert GPS API-forritsviðmót.</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -3417,7 +3417,7 @@
     <string name="photo_notes">Note fotografiche</string>
     <string name="route_recalculation">Ricalcolo del percorso</string>
     <string name="login_and_pass">Nome utente e password</string>
-    <string name="plugin_global_prefs_info">Queste impostazioni del plugin sono globali e si applicano a tutti i profili.</string>
+    <string name="plugin_global_prefs_info">Queste impostazioni del plugin sono globali e si applicano a tutti i profili</string>
     <string name="osm_editing">Modifica di OpenStreetMap</string>
     <string name="osm_edits_view_descr">È possibile visualizzare tutte le modifiche non caricate o le note OSM in %1$s. I punti caricati non vengono visualizzati in OsmAnd.</string>
     <string name="app_mode_osm">OSM</string>
@@ -3945,7 +3945,7 @@
     <string name="icon_group_sport">Sport</string>
     <string name="icon_group_emergency">Emergenza</string>
     <string name="icon_group_travel">Viaggio</string>
-    <string name="message_you_need_add_two_points_to_show_graphs">Devi aggiungere almeno due punti.</string>
+    <string name="message_you_need_add_two_points_to_show_graphs">Devi aggiungere almeno due punti</string>
     <string name="osm_edit_close_note">Chiudi la nota OSM</string>
     <string name="osm_edit_comment_note">Commenta la nota OSM</string>
     <string name="osm_login_descr">Puoi autenticarti con il metodo sicuro OAuth o utilizzare le tue credenziali.</string>
@@ -3955,4 +3955,28 @@
     <string name="register_on_openplacereviews_desc">Le foto sono fornite dal progetto a sorgente aperto OpenPlaceReviews.org. Per contribuire delle tue foto devi registrarti nel sito.</string>
     <string name="register_opr_create_new_account">Crea un nuovo account</string>
     <string name="register_opr_have_account">Ho già un account</string>
+    <string name="shared_string_search_history">Cronologia di ricerca</string>
+    <string name="app_mode_kayak">Kayak</string>
+    <string name="app_mode_motorboat">Motoscafo</string>
+    <string name="login_open_street_map">Connettiti a OpenStreetMap</string>
+    <string name="login_open_street_map_org">Connettiti a OpenStreetMap.org</string>
+    <string name="sign_in_with_open_street_map">Registrati con OpenStreetMap</string>
+    <string name="open_street_map_login_mode">Devi fare il login per inviare nuove modifiche o dei cambiamenti.
+\n
+\nPuoi fare login utilizzando il metodo sicuro OAuth o il nomeutente e password.</string>
+    <string name="use_login_password">Usa login e password</string>
+    <string name="login_account">Account</string>
+    <string name="user_login">Entra</string>
+    <string name="manage_subscription">Gestisci la sottoscrizione</string>
+    <string name="subscription_payment_issue_title">C\'è un problema con la tua sottoscrizione. Clicca sul pulsante per andare alle impostazioni di sottoscrizione di Google Play per correggere il tuo metodo di pagamento.</string>
+    <string name="subscription_expired_title">La sottoscrizione di OsmAnd Live è terminata</string>
+    <string name="subscription_paused_title">La sottoscrizione di OsmAnd Live è stata messa in pausa</string>
+    <string name="subscription_on_hold_title">La sottoscrizione di OsmAnd Live è in sospeso</string>
+    <string name="markers_history">Cronologia dei marcatori</string>
+    <string name="send_files_to_openstreetmap">Invia il file GPX a OpenStreetMap</string>
+    <string name="enter_text_separated">Immetti le etichette separate dalla virgola.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Pubblico\" significa che la traccia è visualizzata pubblicamente nelle tue tracce GPS, nelle liste pubbliche di tracce GPS con le informazioni temporali in forma grezza. I dati forniti attraverso le API non conducono alla tua pagina delle tracce. Le informazioni temporali dei punti traccia non sono disponibili attraverso le API GPS pubbliche, e i punti della traccia non sono ordinati cronologicamente.</string>
+    <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>
 </resources>

OsmAnd/res/values-iw/strings.xml

@@ -3930,7 +3930,7 @@
     <string name="perform_oauth_authorization_description">יש להיכנס עם OAuth כדי להשתמש ביכולות של osmedit</string>
     <string name="perform_oauth_authorization">להיכנס דרך OAuth</string>
     <string name="clear_osm_token">למחוק את אסימון ה־OAuth של OpenStreetMap</string>
-    <string name="osm_edit_logout_success">היציאה הצליחה</string>
+    <string name="osm_edit_logout_success">יצאת</string>
     <string name="file_already_imported">הקובץ כבר ייובא אל OsmAnd</string>
     <string name="use_two_phase_routing">להשתמש באלגוריתם חישוב מסלול דו־שלבי A*‎</string>
     <string name="snowmobile_render_descr">לנהיגה ברכבי שלג עם דרכים ומסלולים יעודיים.</string>
@@ -3952,18 +3952,18 @@
     <string name="navigate_point_mgrs">MGRS</string>
     <string name="navigate_point_format_mgrs">MGRS</string>
     <string name="message_you_need_add_two_points_to_show_graphs">עליך להוסיף שתי נקודות לפחות</string>
-    <string name="login_open_street_map">כניסה ל־OpenStreetMap</string>
+    <string name="login_open_street_map">כניסה עבור OpenStreetMap</string>
-    <string name="login_open_street_map_org">כניסה ל־OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">כניסה עבור OpenStreetMap.org</string>
     <string name="sign_in_with_open_street_map">כניסה עם OpenStreetMap</string>
-    <string name="use_login_password">להשתמש בשם כניסה וססמה</string>
+    <string name="use_login_password">להיכנס עם שם משתמש וססמה</string>
     <string name="login_account">חשבון</string>
-    <string name="user_login">כניסה</string>
+    <string name="user_login">שם משתמש</string>
     <string name="manage_subscription">ניהול מינוי</string>
     <string name="subscription_expired_title">תוקף המינוי ל־OsmAnd Live פג</string>
     <string name="subscription_paused_title">המינוי ל־OsmAnd Live הושהה</string>
-    <string name="open_street_map_login_mode">עליך להיכנס כדי להעלות דברים חדשים או כאלו ששינית.
+    <string name="open_street_map_login_mode">עליך להיכנס כדי להעלות שינויים חדשים או כאלו שנערכו.
 \n
-\nניתן להיכנס בשיטת OAuth המאובטחת או להשתמש בשם הכניסה והססמה שלך.</string>
+\nאו עם OAuth או באמצעות שם המשתמש והססמה שלך.</string>
     <string name="subscription_payment_issue_title">יש בעיה עם המינוי שלך. יש ללחוץ על הכפתור כדי לגשת להגדרות המינוי של Google Play ולתקן את שיטת התשלום שלך.</string>
     <string name="subscription_on_hold_title">המינוי ל־OsmAnd Live מוחזק</string>
     <string name="markers_history">היסטוריית סמנים</string>
@@ -3972,14 +3972,27 @@
     <string name="gpx_upload_trackable_visibility_descr">„ניתן למעקב” משמעו שהמסלול לא מופיע ברישומים ציבוריים אך נקודות המעקב שעובדו עם חותמות זמן ממנו (שלא ניתן לשייך אליך ישירות) תהיינה דרך ההורדות מה־API הציבורי של ה־GPS.</string>
     <string name="osm_edit_close_note">סגירת הערת OSM</string>
     <string name="osm_edit_comment_note">להגיב על הערת OSM</string>
-    <string name="osm_login_descr">ניתן להיכנס באמצעות שיטת האימות המאובטחת OAuth או להיכנס עם שם הכניסה והססמה שלך.</string>
+    <string name="osm_login_descr">ניתן להיכנס באמצעות שיטת האימות המאובטחת OAuth או להיכנס עם שם המשתמש והססמה שלך.</string>
     <string name="shared_string_add_photo">הוספת תמונה</string>
     <string name="register_on_openplacereviews">יש להירשם בכתובת
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">תמונות מסופקות על ידי מיזם הנתונים הפתוחים OpenPlaceReviews.org. כדי להעלות את התמונות שלך עליך להירשם לאתר.</string>
+    <string name="register_on_openplacereviews_desc">יש להיכנס לאתר מיזם הנתונים הפתוחים OpenPlaceReviews.org כדי להעלות אף יותר תמונות.</string>
     <string name="register_opr_create_new_account">יצירת חשבון חדש</string>
     <string name="register_opr_have_account">כבר יש לי חשבון</string>
     <string name="shared_string_search_history">היסטוריית חיפוש</string>
     <string name="app_mode_kayak">קיאק</string>
     <string name="app_mode_motorboat">סירת מנוע</string>
+    <string name="gpx_upload_identifiable_visibility_descr">מגדהי</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>
+    <string name="add_to_mapillary">הוספה ל־Mapillary</string>
+    <string name="add_to_opr">הוספה ל־OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd מציג תמונות ממגוון מקורות:
+\nOpenPlaceReviews - תמונות של נקודות עניין;
+\nMapillary - תמונות ברמת הרחוב;
+\nאינטרנט / ויקימדיה - תמונות נקודות עניין שמצוינות בנתונים של OpenStreetMap.</string>
 </resources>

OsmAnd/res/values-lt/strings.xml

@@ -2777,4 +2777,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="add_hidden_group_info">Pridėtas taškas nebus matomas žemėlapyje, nes pasirinkta grupė yra paslėpta, ją galite rasti \"%s\".</string>
     <string name="gpx_split_interval_descr">Pasirinkite intervalą nuo kurio taškas su atstumu ar laiku bus pavaizduojamas ekrane ant trasos.</string>
     <string name="gpx_split_interval_none_descr">Pasirinkite norima dalinimo variantą: pagal laiką arba pagal atstumą.</string>
+    <string name="shared_string_add_photo">Pridėti nuotrauką</string>
+    <string name="register_opr_create_new_account">Sukurti naują paskyrą</string>
+    <string name="register_opr_have_account">Aš jau turiu paskyrą</string>
 </resources>

OsmAnd/res/values-nb/strings.xml

@@ -1692,7 +1692,7 @@
 \n 
 \n OsmAnd utvikles aktivt, og prosjektet vårt og dets videre framdrift avhenger av finansielle bidrag for å drive utviklingen og testingen av nye funksjoner. Overvei å kjøpe OsmAnd+ eller støtte spesifikke nye funksjoner eller bidra med en generell donasjon på https://osmand.net.</string>
     <string name="upload_osm_note_description">Last opp ditt OSM-notat anonymt eller ved å bruke din profil hos OpenStreetMap.org.</string>
-    <string name="gpx_no_tracks_title">Du har ingen sporfiler ennå</string>
+    <string name="gpx_no_tracks_title">Du har ingen sporfiler enda</string>
     <string name="gpx_no_tracks_title_folder">Du kan også legge til sporfiler i mappen</string>
     <string name="gpx_add_track">Legg til flere…</string>
     <string name="trip_rec_notification_settings">Skru på hurtigopptak</string>
@@ -1792,7 +1792,7 @@
     <string name="live_monitoring_start">Start nettbasert sporing</string>
     <string name="live_monitoring_stop">Stopp nettbasert sporing</string>
     <string name="select_index_file_to_download">Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se https://osmand.net).</string>
-    <string name="none_selected_gpx">Spesifiser først en GPX-fil med et langt trykk.</string>
+    <string name="none_selected_gpx">Spesifiser en GPX-fil med et langt trykk først.</string>
     <string name="gpx_split_interval">Oppdelingsintervall</string>
     <string name="gpx_info_asc_altitude">Nedstigning/stigning: %1$s</string>
     <string name="gpx_timespan">Tidsrom: %1$s</string>
@@ -3887,7 +3887,7 @@
     <string name="icon_group_emergency">Nødsfall</string>
     <string name="icon_group_travel">Reise</string>
     <string name="message_you_need_add_two_points_to_show_graphs">Du må legge til minst to punkter.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Sporbar betyr at sporet ikke vil vises i offentlige lister, men punkter fra det vil fremdeles ikke være tilgjengelige gjennom det offentlige GPS-API-et med tidsstempel. Andre brukere vil kun ha mulighet til å laste ned behandlede punkter fra ditt spor, noe som ikke kan tilknyttes deg direkte.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Sporbar\" betyr at sporet ikke vil vises i offentlige lister, men bearbeidede sporpunkter med tidsstempel (som ikke direkte kan knyttes til deg) vil være tilgjengelig gjennom nedlastinger fra det offentlige GPS-API-et.</string>
     <string name="sign_in_with_open_street_map">Logg inn med OpenStreetMap</string>
     <string name="use_login_password">Bruk innlogging og passord</string>
     <string name="login_account">Konto</string>

OsmAnd/res/values-pl/strings.xml

@@ -1922,7 +1922,7 @@
     <string name="osm_live_header">Subskrypcja umożliwia cogodzinne aktualizacje wszystkich map na całym świecie.
 \n Część dochodów wraca do społeczności OSM i jest wypłacana za każdy wkład OSM.
 \n Jeśli kochasz OsmAnd i OSM i chcesz je wspierać i wspierać, jest to idealny sposób, aby to zrobić.</string>
-    <string name="file_name_containes_illegal_char">Nazwa pliku zawiera niedozwolony znak</string>
+    <string name="file_name_containes_illegal_char">Niedozwolony znak w nazwie pliku</string>
     <string name="access_default_color">Domyślny kolor</string>
     <string name="access_category_choice">Wybierz kategorię</string>
     <string name="access_hint_enter_category">Proszę wprowadzić kategorię</string>
@@ -2526,7 +2526,7 @@
     <string name="last_intermediate_dest_description">Dodaje cel pośredni</string>
     <string name="first_intermediate_dest_description">Dodaje pierwszy cel pośredni</string>
     <string name="show_closed_notes">Wyświetl zamknięte uwagi</string>
-    <string name="switch_osm_notes_visibility_desc">Pokaż/ukryj uwagi OSM na mapie.</string>
+    <string name="switch_osm_notes_visibility_desc">Pokaż lub ukryj uwagi OSM na mapie.</string>
     <string name="gpx_file_desc">GPX - odpowiedni do eksportowania danych do JOSM i innych edytorów OSM.</string>
     <string name="osc_file_desc">OSC - odpowiedni do eksportowania danych do OSM.</string>
     <string name="shared_string_gpx_file">Plik GPX</string>
@@ -3087,7 +3087,7 @@
     <string name="zoom_by_wunderlinq">Użyj WunderLINQ do kontroli</string>
     <string name="quick_action_need_to_add_item_to_list">Dodaj co najmniej jeden element do listy w ustawieniach \"Szybkiej Akcji\"</string>
     <string name="routing_attr_piste_type_downhill_description">Stoki narciarskie do narciarstwa alpejskiego i zjazdowego oraz dostęp do wyciągów narciarskich.</string>
-    <string name="routing_attr_piste_type_nordic_name">Narty biegowe/nordic ski</string>
+    <string name="routing_attr_piste_type_nordic_name">Biegi narciarskie i narciarstwo klasyczne</string>
     <string name="routing_attr_piste_type_nordic_description">Trasy do narciarstwa klasycznego lub biegowego.</string>
     <string name="routing_attr_piste_type_skitour_name">Turystyka narciarska</string>
     <string name="routing_attr_piste_type_skitour_description">Trasy wycieczek narciarskich.</string>
@@ -3570,7 +3570,7 @@
     <string name="quick_action_terrain_descr">Przycisk do wyświetlania lub ukrywania warstwy terenu na mapie.</string>
     <string name="quick_action_terrain_show">Pokaż teren</string>
     <string name="quick_action_terrain_hide">Ukryj teren</string>
-    <string name="quick_action_show_hide_terrain">Pokaż / ukryj teren</string>
+    <string name="quick_action_show_hide_terrain">Pokaż lub ukryj teren</string>
     <string name="download_slope_maps">Nachylenie</string>
     <string name="terrain_empty_state_text">Włącz, aby wyświetlić cieniowanie wzniesień lub stoków. Możesz przeczytać więcej o tego rodzaju mapach na naszej stronie.</string>
     <string name="shared_string_legend">Legenda</string>
@@ -3700,9 +3700,9 @@
     <string name="back_to_editing">Powrót do edycji</string>
     <string name="quick_action_transport_hide">Ukryj transport publiczny</string>
     <string name="quick_action_transport_show">Pokaż transport publiczny</string>
-    <string name="quick_action_show_hide_transport">Pokaż/ukryj transport publiczny</string>
+    <string name="quick_action_show_hide_transport">Pokaż lub ukryj transport publiczny</string>
-    <string name="create_edit_poi">Utwórz / Edytuj użyteczne miejsce</string>
+    <string name="create_edit_poi">Utwórz lub edytuj użyteczne miejsce</string>
-    <string name="add_edit_favorite">Dodaj / Edytuj Ulubione</string>
+    <string name="add_edit_favorite">Dodaj lub edytuj ulubione miejsce</string>
     <string name="quick_action_switch_profile_descr">Przycisk akcji przełącza między wybranymi profilami.</string>
     <string name="shared_string_add_profile">Dodaj profil</string>
     <string name="change_application_profile">Zmiana profilu aplikacji</string>
@@ -3910,7 +3910,7 @@
     <string name="sort_name_descending">Nazwa: Z – A</string>
     <string name="sort_name_ascending">Nazwa: A – Z</string>
     <string name="what_is_new">Co nowego</string>
-    <string name="start_finish_icons">Ikony start/koniec</string>
+    <string name="start_finish_icons">Ikony startu i końca</string>
     <string name="contour_lines_thanks">Dziękujemy za zakup \"Linii konturowych\"</string>
     <string name="osm_live_payment_desc_hw">Subskrypcja naliczona za wybrany okres. Anuluj ją w AppGallery w dowolnym momencie.</string>
     <string name="osm_live_payment_subscription_management_hw">Płatność zostanie pobrana z konta AppGallery po potwierdzeniu zakupu.
@@ -3958,14 +3958,14 @@
     <string name="message_you_need_add_two_points_to_show_graphs">Musisz dodać co najmniej dwa punkty</string>
     <string name="subscription_payment_issue_title">Wystąpił problem z Twoją subskrypcją. Kliknij przycisk, aby przejść do ustawień subskrypcji Google Play i naprawić metodę płatności.</string>
     <string name="subscription_on_hold_title">Subskrypcja OsmAnd Live jest wstrzymana</string>
-    <string name="user_login">Login</string>
+    <string name="user_login">Nazwa użytkownika</string>
     <string name="login_open_street_map">Zaloguj się do OpenStreetMap</string>
     <string name="login_open_street_map_org">Zaloguj się do OpenStreetMap.org</string>
     <string name="sign_in_with_open_street_map">Zaloguj się za pomocą OpenStreetMap</string>
     <string name="open_street_map_login_mode">Musisz się zalogować, aby przesłać nowe lub zmodyfikowane zmiany.
 \n
 \nMożesz zalogować się za pomocą bezpiecznej metody autoryzacji OAuth lub użyć swojego loginu i hasła.</string>
-    <string name="use_login_password">Użyj loginu i hasła</string>
+    <string name="use_login_password">Zaloguj się za pomocą nazwy użytkownika i hasła</string>
     <string name="login_account">Konto</string>
     <string name="osm_edit_close_note">Zamknij uwagę OSM</string>
     <string name="osm_edit_comment_note">Skomentuj uwagę OSM</string>
@@ -3973,7 +3973,7 @@
     <string name="send_files_to_openstreetmap">Wyślij plik GPX do OpenStreetMap</string>
     <string name="enter_text_separated">Wpisz tagi oddzielone przecinkami.</string>
     <string name="gpx_upload_trackable_visibility_descr">Możliwość śledzenia oznacza, że ślad nie pojawi się na żadnej publicznej liście, ale punkty śledzenia będą nadal dostępne za pośrednictwem publicznego API GPS ze znacznikami czasu. Inni użytkownicy będą mogli pobrać tylko te przetworzone punkty śledzenia z Twojego śladu, których nie można powiązać bezpośrednio z Tobą.</string>
-    <string name="osm_login_descr">Możesz zalogować się przy użyciu bezpiecznej metody OAuth lub użyć swojego loginu i hasła.</string>
+    <string name="osm_login_descr">Zaloguj się przy użyciu bezpiecznej metody autoryzacji OAuth lub użyj swojej nazwy użytkownika i hasła.</string>
     <string name="shared_string_add_photo">Dodaj zdjęcie</string>
     <string name="register_on_openplacereviews">Zarejestruj się w
 \nOpenPlaceReviews.org</string>

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

@@ -2389,7 +2389,7 @@
 \n O plugin de mapas de ski Skiing OsmAnd permite que você veja pistas de ski com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras facilidades.</string>
     <string name="live_monitoring_max_interval_to_send">Buffer de tempo para rastreamento on-line</string>
     <string name="save_poi_too_many_uppercase">O nome contém muitas letras maiúsculas. Continuar\?</string>
-    <string name="file_name_containes_illegal_char">O nome do arquivo contém caracteres ilegais</string>
+    <string name="file_name_containes_illegal_char">Caráter ilegal no nome do arquivo</string>
     <string name="configure_screen_quick_action">Ação rápida</string>
     <string name="quick_action_item_action">Ação %d</string>
     <string name="quick_action_item_screen">Tela %d</string>
@@ -2551,7 +2551,7 @@
 \n</string>
     <string name="lang_lo">Laociano</string>
     <string name="show_closed_notes">Mostrar notas encerradas</string>
-    <string name="switch_osm_notes_visibility_desc">Mostrar/ocultar notas OSM no mapa.</string>
+    <string name="switch_osm_notes_visibility_desc">Mostrar ou ocultar notas OSM no mapa.</string>
     <string name="shared_string_gpx_file">Arquivo GPX</string>
     <string name="osc_file">Arquivo OSC</string>
     <string name="choose_file_type">Selecione o tipo de arquivo</string>
@@ -3078,9 +3078,9 @@
     <string name="zoom_by_wunderlinq_descr">Altere o zoom do mapa rolando a roda para cima e para baixo. Escape retorna para o aplicativo WunderLINQ.</string>
     <string name="zoom_by_wunderlinq">Use o WunderLINQ para controle</string>
     <string name="quick_action_need_to_add_item_to_list">Adicionar ao menos um item à lista nas configurações de \'Ação rápida\'</string>
-    <string name="routing_attr_piste_type_downhill_name">Esqui alpino/de declínio</string>
+    <string name="routing_attr_piste_type_downhill_name">Esqui alpino e downhill</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas de esqui alpino ou de declínio e acesso a teleféricos.</string>
-    <string name="routing_attr_piste_type_nordic_name">Cross country/esqui nórdico</string>
+    <string name="routing_attr_piste_type_nordic_name">Cross country e esqui nórdico</string>
     <string name="routing_attr_piste_type_nordic_description">Trilhas para esqui nórdico ou cross-country.</string>
     <string name="routing_attr_piste_type_skitour_name">Turismo de esqui</string>
     <string name="routing_attr_piste_type_skitour_description">Rotas para passeios de esqui.</string>
@@ -3359,7 +3359,7 @@
     <string name="route_start_point">Ponto de partida</string>
     <string name="default_speed_dialog_msg">Estima a hora de chegada de tipos de estradas desconhecidas e limita a velocidade de todas as estradas (pode afetar o roteamento)</string>
     <string name="track_saved">Trilha salva</string>
-    <string name="empty_filename">O nome do arquivo está vazio</string>
+    <string name="empty_filename">Nome de arquivo vazio</string>
     <string name="shared_string_revert">Reverter</string>
     <string name="quick_action_directions_from_desc">Um botão para fazer com que a tela centralize o ponto de partida. Em seguida, solicitará para definir o destino ou acionar o cálculo da rota.</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Mostrar os nós da rede de ciclovias</string>
@@ -3569,7 +3569,7 @@
     <string name="shared_string_hillshade">Sombras de relevo</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Encostas</string>
-    <string name="quick_action_show_hide_terrain">Mostrar / ocultar terreno</string>
+    <string name="quick_action_show_hide_terrain">Mostrar ou ocultar terreno</string>
     <string name="quick_action_terrain_hide">Ocultar terreno</string>
     <string name="quick_action_terrain_show">Mostrar terreno</string>
     <string name="quick_action_terrain_descr">Um botão para mostrar ou ocultar a camada do terreno no mapa.</string>
@@ -3686,11 +3686,11 @@
     <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão “%1$s”.</string>
     <string name="quick_action_transport_hide">Ocultar transporte público</string>
     <string name="quick_action_transport_show">Mostrar transporte público</string>
-    <string name="quick_action_show_hide_transport">Mostrar/ocultar transporte público</string>
+    <string name="quick_action_show_hide_transport">Mostrar ou ocultar transporte público</string>
     <string name="quick_action_transport_descr">Botão que mostra ou oculta o transporte público no mapa.</string>
-    <string name="create_edit_poi">Criar / Editar POI</string>
+    <string name="create_edit_poi">Criar ou editar POI</string>
     <string name="parking_positions">Posições de estacionamento</string>
-    <string name="add_edit_favorite">Adicionar / Editar favorito</string>
+    <string name="add_edit_favorite">Adicionar ou editar favoritos</string>
     <string name="reset_deafult_order">Restaurar ordem de itens padrão</string>
     <string name="back_to_editing">Voltar à edição</string>
     <string name="shared_string_resume">Retomar</string>
@@ -3867,7 +3867,7 @@
     <string name="shared_string_file_name">Nome do arquivo</string>
     <string name="number_of_gpx_files_selected_pattern">%s arquivos de trilha selecionados</string>
     <string name="disable_recording_once_app_killed_descrp">Pausará o registro de rastreamento quando o aplicativo for encerrado (por meio de aplicativos recentes). (A indicação de uso em segundo plano do OsmAnd desaparece da barra de notificação do Android.)</string>
-    <string name="save_global_track_interval_descr">Especifique o intervalo de registro para a gravação geral da trilha (habilitado por meio do widget Gravação de viagem no mapa).</string>
+    <string name="save_global_track_interval_descr">Especifique o intervalo de registro para a gravação geral da trilha (ligado por meio do widget de \'gravação de viagem\' no mapa).</string>
     <string name="gpx_monitoring_stop">Pausar gravação de viagem</string>
     <string name="gpx_monitoring_start">Retomar a gravação da viagem</string>
     <string name="system_default_theme">Padrão do sistema</string>
@@ -3883,7 +3883,7 @@
     <string name="shared_string_redo">Refazer</string>
     <string name="release_3_8">"• Função de planejamento de rota atualizada: permite o uso de diferentes tipos de navegação por segmento e a inclusão de trilhas
 \n
-\n • Novo menu de aparência para trilhas: selecione cor, espessura, setas de direção de exibição, ícones de início / término
+\n • Novo menu de aparência para trilhas: selecione cor, espessura, setas de direção de exibição, ícones de início e término
 \n
 \n  • Melhor visibilidade dos nós da bicicleta.
 \n
@@ -3899,7 +3899,7 @@
     <string name="sort_last_modified">Última modificação</string>
     <string name="sort_name_descending">Nome: Z – A</string>
     <string name="sort_name_ascending">Nome: A – Z</string>
-    <string name="start_finish_icons">Ícones de início/término</string>
+    <string name="start_finish_icons">Ícones de início e término</string>
     <string name="contour_lines_thanks">Obrigado por adquirir \'curvas de nível\'</string>
     <string name="osm_live_payment_desc_hw">Assinatura cobrada por período selecionado. Cancele no AppGallery a qualquer momento.</string>
     <string name="osm_live_payment_subscription_management_hw">O pagamento será cobrado em sua conta AppGallery na confirmação da compra.
@@ -3960,10 +3960,10 @@
     <string name="markers_history">Histórico de marcadores</string>
     <string name="send_files_to_openstreetmap">Enviar arquivo GPX para OpenStreetMap</string>
     <string name="enter_text_separated">Insira as etiquetas separadas por vírgula.</string>
-    <string name="gpx_upload_public_visibility_descr">Público significa que o traçado será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS. Os dados fornecidos por meio da API não fazem referência à sua página de rastreamento. Os carimbos de data/hora dos pontos de rastreamento não estão disponíveis por meio da API GPS pública e os pontos não são ordenados cronologicamente. No entanto, outros usuários ainda podem fazer o download do rastreamento bruto da lista pública de rastreamento e de quaisquer carimbos de data/hora contidos nela.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Público\" significa que o traçado é mostrado publicamente em seus traços GPS e em listagens públicas de traços GPS e na lista pública de traços com carimbos de data/hora em formato bruto. Os dados fornecidos por meio da API não fazem referência à sua página de rastreamento. Os carimbos de data/hora do ponto de rastreamento não estão disponíveis por meio da API GPS pública e os pontos de rastreamento não são ordenados cronologicamente.</string>
-    <string name="gpx_upload_private_visibility_descr">Privado significa que o rastreamento não aparecerá em nenhuma lista pública, mas os pontos de trilha dele ainda estarão disponíveis por meio da API GPS pública sem carimbos de data/hora, mas não serão ordenados cronologicamente.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Privado\" significa que o rastreamento não aparece em nenhuma listagem pública, mas os pontos de trilha dele em ordem não sincronizada estão disponíveis por meio da API GPS pública sem carimbos de data/hora.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identificável significa que o traço será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS, ou seja, outros usuários poderão fazer download do traço bruto e associá-lo ao seu nome de usuário. Os dados fornecidos por meio da API de pontos de trilha farão referência à sua página de rastreamento original. Os carimbos de data/hora dos pontos de rastreamento estão disponíveis por meio da API GPS pública.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificável\" significa que o traço será mostrado publicamente em Seus traços de GPS e em listas públicas de traços de GPS, ou seja, outros usuários poderão fazer download do traço bruto e associá-lo ao seu nome de usuário. Os dados de pontos de rastreamento com carimbo de data/hora públicos da API GPS servidos por meio da API de pontos de rastreamento farão referência à sua página de rastreamento original.</string>
-    <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 trilha dele ainda estarão disponíveis por meio da API GPS pública com carimbos de data/hora. Outros usuários só poderão baixar pontos de trilha processados de seu trace, que não podem ser associados a você diretamente.</string>
+    <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>
@@ -3973,4 +3973,7 @@
     <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_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>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -3835,4 +3835,34 @@
     <string name="poi_gpx_point">Ponto GPX</string>
     <string name="poi_radar_tower">Torre de radar</string>
     <string name="poi_parking_layby">Área de repouso</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">Cônsul 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">Liderado 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">Secção de interesses</string>
+    <string name="poi_embassy_high_commission">Alta comissão</string>
+    <string name="poi_embassy_delegation">Delegação</string>
+    <string name="poi_embassy_branch_embassy">Secção</string>
+    <string name="poi_embassy_yes">Liderado 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 imigrantes</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_filter">Vistos de não-imigrantes</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/strings.xml

@@ -3980,4 +3980,13 @@
     <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_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>
+    <string name="app_mode_kayak">Caiaque</string>
+    <string name="app_mode_motorboat">Barco a motor</string>
+    <string name="shared_string_resources">Recursos</string>
+    <string name="approximate_file_size">Tamanho aproximado do ficheiro</string>
+    <string name="select_data_to_export">Selecione os dados a serem exportados para o ficheiro.</string>
+    <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>
 </resources>

OsmAnd/res/values-ru/phrases.xml

@@ -3836,4 +3836,6 @@
     <string name="poi_parking_sheds">Навесы</string>
     <string name="poi_gpx_point">Точка GPX</string>
     <string name="poi_radar_tower">Радиолокационная вышка</string>
+    <string name="poi_parking_layby">Придорожная стоянка</string>
+    <string name="poi_parking_rooftop">На крыше</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -398,7 +398,7 @@
     <string name="use_fluorescent_overlays">Флуоресцентные цвета</string>
     <string name="use_fluorescent_overlays_descr">Использовать флуоресцентные цвета для отображения треков и маршрутов.</string>
     <string name="offline_edition">Локальное редактирование</string>
-    <string name="offline_edition_descr">Всегда использовать редактирование на устройстве.</string>
+    <string name="offline_edition_descr">Если используется редактирование на устройстве, то изменения будут сохранены локально и загружены на сервер только по запросу, иначе они будут загружаться немедленно.</string>
     <string name="update_poi_does_not_change_indexes">Изменение POI в приложении не меняет POI загруженные из интернета, однако все изменения сохраняются в локальный файл на устройстве.</string>
     <string name="local_openstreetmap_uploading">Отправка…</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/заметок отправлено</string>
@@ -3107,7 +3107,7 @@
     <string name="settings_derived_routing_mode_string">Режим пользователя, полученный из: %s</string>
     <string name="profile_alert_duplicate_name_title">Повторяющееся имя</string>
     <string name="routing_profile_broutrer">BRouter (локально)</string>
-    <string name="routing_attr_piste_type_downhill_name">Горнолыжные спуски</string>
+    <string name="routing_attr_piste_type_downhill_name">Альпийские и горные лыжи</string>
     <string name="routing_attr_piste_type_downhill_description">Склоны для катания и спуска на горных лыжах и доступ к подъёмникам.</string>
     <string name="routing_attr_piste_type_skitour_name">Лыжные туры</string>
     <string name="routing_attr_piste_type_sled_name">Сани</string>
@@ -3334,7 +3334,7 @@
     <string name="layer_osm_edits">Правки OSM</string>
     <string name="swap_two_places">Поменять местами %1$s и %2$s</string>
     <string name="track_saved">Трек сохранён</string>
-    <string name="empty_filename">Не указано имя файла</string>
+    <string name="empty_filename">Пустое имя файла</string>
     <string name="clear_confirmation_msg">Очистить %1$s\?</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Узловые сети</string>
     <string name="suggested_maps">Предлагаемые карты</string>
@@ -3561,7 +3561,7 @@
     <string name="recalculate_route_in_deviation">Пересчитывать маршрут в случае отклонения</string>
     <string name="n_items_of_z">%1$s из %2$s</string>
     <string name="terrain_slider_description">Настройка минимального и максимального уровней масштабирования, при которых слой будет отображаться.</string>
-    <string name="quick_action_show_hide_terrain">Показать/скрыть рельеф</string>
+    <string name="quick_action_show_hide_terrain">Показать или скрыть рельеф</string>
     <string name="quick_action_terrain_descr">Переключатель, чтобы показать или скрыть слой рельефа местности на карте.</string>
     <string name="quick_action_terrain_show">Показать рельеф</string>
     <string name="quick_action_terrain_hide">Скрыть рельеф</string>
@@ -3691,8 +3691,8 @@
     <string name="quick_action_transport_hide">Скрыть общественный транспорт</string>
     <string name="quick_action_transport_show">Показать общественный транспорт</string>
     <string name="quick_action_show_hide_transport">Показать/скрыть общественный транспорт</string>
-    <string name="add_edit_favorite">Добавить/изменить место</string>
+    <string name="add_edit_favorite">Добавить или изменить избранное</string>
-    <string name="create_edit_poi">Создать/изменить POI</string>
+    <string name="create_edit_poi">Создать или изменить POI</string>
     <string name="back_to_editing">Возврат к редактированию</string>
     <string name="parking_positions">Парковки</string>
     <string name="quick_action_transport_descr">Переключатель, чтобы показать или скрыть общественный транспорт на карте.</string>
@@ -3961,4 +3961,24 @@
     <string name="subscription_on_hold_title">Подписка OsmAnd Live приостановлена</string>
     <string name="markers_history">История маркеров</string>
     <string name="send_files_to_openstreetmap">Отправить GPX-файл в OpenStreetMap</string>
+    <string name="osm_edit_close_note">Закрыть заметку OSM</string>
+    <string name="shared_string_add_photo">Добавить фото</string>
+    <string name="register_on_openplacereviews">Зарегистрироваться на
+\nOpenPlaceReviews.org</string>
+    <string name="register_opr_create_new_account">Создать новый аккаунт</string>
+    <string name="register_opr_have_account">У меня уже есть аккаунт</string>
+    <string name="shared_string_search_history">История поиска</string>
+    <string name="app_mode_motorboat">Моторная лодка</string>
+    <string name="add_to_opr">Добавить в OpenPlaceReviews</string>
+    <string name="add_to_mapillary">Добавить в Mapillary</string>
+    <string name="add_photos_descr">OsmAnd показывает фотографии из нескольких источников:
+\nOpenPlaceReviews — фотогорафии POI;
+\nMapillary — изображения улиц;
+\nWeb / Wikimedia — фотографии POI, указанные в данных OpenStreetMap.</string>
+    <string name="shared_string_resources">Ресурсы</string>
+    <string name="approximate_file_size">Примерный размер файла</string>
+    <string name="file_size_needed_for_import">Требуется для импорта</string>
+    <string name="select_data_to_export">Выберите данные для экспорта в файл.</string>
+    <string name="export_not_enough_space_descr">На устройстве свободно только %1$s. Освободите место в хранилище или снимите выбор с некоторых экспортируемых элементов.</string>
+    <string name="export_not_enough_space">Недостаточно места</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3846,4 +3846,19 @@
     <string name="poi_parking_rooftop">Cobertura</string>
     <string name="poi_gpx_point">Puntu GPX</string>
     <string name="poi_radar_tower">Torre ràdar</string>
+    <string name="poi_diplomatic_services_citizen_services_no">Nono</string>
+    <string name="poi_diplomatic_services_citizen_services_yes">Eja</string>
+    <string name="poi_diplomatic_services_immigrant_visas_no">Nono</string>
+    <string name="poi_diplomatic_services_immigrant_visas_yes">Eja</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_no">Nono</string>
+    <string name="poi_diplomatic_services_non_immigrant_visas_yes">Eja</string>
+    <string name="poi_liaison_liaison_office">Ufìtziu</string>
+    <string name="poi_consulate_consulate_general">Consoladu generale</string>
+    <string name="poi_embassy_residence">Residèntzia</string>
+    <string name="poi_embassy_mission">Missione</string>
+    <string name="poi_embassy_high_commission">Commissione arta</string>
+    <string name="poi_embassy_delegation">Delegatzione</string>
+    <string name="poi_diplomatic_embassy">Ambassada</string>
+    <string name="poi_consulate_filter">Consoladu</string>
+    <string name="poi_embassy_filter">Ambassada</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -786,7 +786,7 @@
     <string name="use_fluorescent_overlays">Subrapositziones fluorescentes</string>
     <string name="use_fluorescent_overlays_descr">Imprea colores fluorescentes pro visualizzare rastas e àndalas.</string>
     <string name="offline_edition">Modìficas chene lìnia</string>
-    <string name="offline_edition_descr">Si sa sa modìfica chene lìnia est abilitada, sas modìficas ant a èssere sarvadas in locale, in antis, e carrigadas si benit pedidu. Si nono, ant a èssere carrigadas immediatamente.</string>
+    <string name="offline_edition_descr">Si sa modìfica chene lìnia est abilitada, sas modìficas ant a èssere sarvadas in locale, in antis, e carrigadas si benit pedidu. Si nono, ant a èssere carrigadas immediatamente.</string>
     <string name="update_poi_does_not_change_indexes">Sa modìficas de sos PDI intre s’aplicatzione non tenent efetos in sas mapas iscarrigadas, sunt imbetzes sarvadas in su dispositivu.</string>
     <string name="local_openstreetmap_were_uploaded">{0} PDI/notas carrigados/as</string>
     <string name="local_openstreetmap_upload">Càrriga sa modìfica in OSM</string>
@@ -2639,7 +2639,7 @@
     <string name="copy_location_name">Còpia sa positzione/su nùmene de su PDI</string>
     <string name="toast_empty_name_error">Logu chene nùmene</string>
     <string name="show_closed_notes">Ammustra sas notas serradas</string>
-    <string name="switch_osm_notes_visibility_desc">Ammustra/cua sas notas OSM in sa mapa.</string>
+    <string name="switch_osm_notes_visibility_desc">Ammustra o cua sas notas OSM in sa mapa.</string>
     <string name="gpx_file_desc">GPX - adatu pro s\'esportatzione a JOSM o a àteros editores OSM.</string>
     <string name="osc_file_desc">OSC - adatu pro s\'esportatzione in OpenStreetmap.</string>
     <string name="shared_string_gpx_file">Documentu GPX</string>
@@ -3084,9 +3084,9 @@
     <string name="application_profiles_descr">Ischerta sos profilos chi cheres chi siant visìbiles in s’aplicatzione.</string>
     <string name="application_profiles">Profilos de s\'aplicatzione</string>
     <string name="quick_action_need_to_add_item_to_list">Annanghe a su mancu un\'elementu a sa lista in sas impostatziones pro sas atziones lestras</string>
-    <string name="routing_attr_piste_type_downhill_name">Iscì alpinu/de achirrada</string>
+    <string name="routing_attr_piste_type_downhill_name">Iscì alpinu e de achirrada</string>
     <string name="routing_attr_piste_type_downhill_description">Pistas pro iscì alpinu o de achirrada e atzessu a sos impiantos de artiada.</string>
-    <string name="routing_attr_piste_type_nordic_name">Iscì de fundu/nòrdicu</string>
+    <string name="routing_attr_piste_type_nordic_name">Iscì de fundu e nòrdicu</string>
     <string name="routing_attr_piste_type_nordic_description">Pistas pro s\'iscì nòrdicu o de fundu.</string>
     <string name="routing_attr_piste_type_skitour_name">Iscì-alpinismu</string>
     <string name="routing_attr_piste_type_skitour_description">Àndalas pro s\'iscì-alpinismu.</string>
@@ -3577,7 +3577,7 @@
     <string name="shared_string_hillshade">Umbraduras de sos rilievos</string>
     <string name="n_items_of_z">%1$s de %2$s</string>
     <string name="download_slope_maps">Pistas</string>
-    <string name="quick_action_show_hide_terrain">Ammustra / cua su terrinu</string>
+    <string name="quick_action_show_hide_terrain">Ammustra o cua su terrinu</string>
     <string name="quick_action_terrain_hide">Cua su terrinu</string>
     <string name="quick_action_terrain_show">Ammustra su terrinu</string>
     <string name="quick_action_terrain_descr">Unu butone pro ammustrare o cuare s\'istratu de su terrinu in sa mapa.</string>
@@ -3695,11 +3695,11 @@
     <string name="additional_actions_descr">Podes atzèdere a custas atziones incarchende su butone \"%1$s\".</string>
     <string name="quick_action_transport_hide">Cua sos trasportos pùblicos</string>
     <string name="quick_action_transport_show">Ammustra sos trasportos pùblicos</string>
-    <string name="quick_action_show_hide_transport">Ammustra/cua sos trasportos pùblicos</string>
+    <string name="quick_action_show_hide_transport">Ammustra o cua sos trasportos pùblicos</string>
     <string name="quick_action_transport_descr">Butone pro ammustrare o cuare sos trasportos pùblicos in sa mapa.</string>
-    <string name="create_edit_poi">Crea / Modìfica unu PDI</string>
+    <string name="create_edit_poi">Crea o modìfica unu PDI</string>
     <string name="parking_positions">Logos de parchègiu</string>
-    <string name="add_edit_favorite">Annanghe / Modìfica unu preferidu</string>
+    <string name="add_edit_favorite">Annanghe o modìfica unu preferidu</string>
     <string name="reset_deafult_order">Riprìstina s\'òrdine predefinidu de sos elementos</string>
     <string name="back_to_editing">Torra a modificare</string>
     <string name="quick_action_switch_profile_descr">Su butone de atzione faghet colare dae unu profilu ischertadu a s\'àteru.</string>
@@ -3852,7 +3852,7 @@
     <string name="gpx_monitoring_start">Sighi cun sa registratzione de su biàgiu</string>
     <string name="marker_save_as_track">Sarva comente documentu de rasta</string>
     <string name="number_of_gpx_files_selected_pattern">%s documentos de rasta ischertados</string>
-    <string name="save_global_track_interval_descr">Dislinda s’intervallu pro sa registratzione generale de sas rastas (abilitadu pro mèdiu de su widget registratzione GPX in sa mapa).</string>
+    <string name="save_global_track_interval_descr">Dislinda s’intervallu pro sa registratzione generale de sas rastas (allutu pro mèdiu de su widget \'Registratzione GPX\' in sa mapa).</string>
     <string name="monitoring_control_start">Registra</string>
     <string name="shared_string_gpx_route">Àndala de una rasta</string>
     <string name="follow_track">Sighi sa rasta</string>
@@ -3887,7 +3887,7 @@
     <string name="shared_string_redo">Torra a fàghere</string>
     <string name="release_3_8">• Funtzionalidade de pranificatione de un\'àndala agiornada: permitit de impreare castas diferentes de navigatzione pro segmentu e s\'inclusione de rastas
 \n
-\n • Menù de Aparèntzia nou pro sas rastas: ischerta su colore, grussària, visulaizatzione de sas fritzas de diretzione, iconas de incumintzu/fine
+\n • Menù de Aparèntzia nou pro sas rastas: ischerta su colore, grussària, visulaizatzione de sas fritzas de diretzione, iconas de incumintzu e fine
 \n
 \n • Visibilidade megiorada de sos nodos pro sas bitzicletas.
 \n
@@ -3903,7 +3903,7 @@
     <string name="sort_last_modified">Ùrtima modìfica</string>
     <string name="sort_name_descending">Nùmene: Z – A</string>
     <string name="sort_name_ascending">Nùmene: A – Z</string>
-    <string name="start_finish_icons">Iconas de incumintzu/fine</string>
+    <string name="start_finish_icons">Iconas de incumintzu e fine</string>
     <string name="contour_lines_thanks">Gràtzias pro àere comporadu \'Curvas de livellu\'</string>
     <string name="osm_live_payment_desc_hw">Costu periòdicu de s\'abbonamentu. Lu podes anullare in AppGallery cando boles.</string>
     <string name="osm_live_payment_subscription_management_hw">Su pagamentu at a èssere addebitadu a su contu tuo de AppGallery cando sa còmpora at a èssere cunfirmada. 
@@ -3923,7 +3923,7 @@
     <string name="perform_oauth_authorization_description">Intra cun OAuth pro impreare sas funtzionalidades osmedit</string>
     <string name="perform_oauth_authorization">Intra impreende OAuth</string>
     <string name="clear_osm_token">Iscantzella su getone OAuth de OpenStreetMap</string>
-    <string name="osm_edit_logout_success">Essida fata chene problemas</string>
+    <string name="osm_edit_logout_success">Essidu</string>
     <string name="file_already_imported">Su documentu est giai importadu in OsmAnd</string>
     <string name="use_two_phase_routing">Imprea un\'algoritmu de càrculu de s\'àndala A* a duas fases</string>
     <string name="snowmobile_render_descr">Pro sa ghia de motoislitas cun caminos e rastas dedicados.</string>
@@ -3947,13 +3947,13 @@
     <string name="message_you_need_add_two_points_to_show_graphs">Depes annànghere a su mancu duos puntos</string>
     <string name="login_open_street_map">Intra in OpenStreetMap</string>
     <string name="login_open_street_map_org">Intra in OpenStreetMap.org</string>
-    <string name="sign_in_with_open_street_map">Identìfica·ti cun OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">Intra cun OpenStreetMap</string>
-    <string name="open_street_map_login_mode">Depes intrare pro pòdere carrigare modìficas noas o mudadas.
+    <string name="open_street_map_login_mode">Intra pro carrigare modìficas noas o mudadas,
 \n
-\nPodes intrare impreende su mètodu seguru OAuth o cun s\'identificadore (su nùmene de impreadore) tuo e sa crae de intrada tua.</string>
+\nimpreende su mètodu seguru OAuth o cun su nùmene de impreadore tuo e sa crae de intrada tua.</string>
-    <string name="use_login_password">Imprea un\'identificadore e una crae de intrada</string>
+    <string name="use_login_password">Intra cun unu nùmene de impreadore e una crae de intrada</string>
     <string name="login_account">Contu</string>
-    <string name="user_login">Identificadore</string>
+    <string name="user_login">Nùmene impreadore</string>
     <string name="manage_subscription">Amministra s\'abbonamentu</string>
     <string name="subscription_payment_issue_title">B\'at unu problema cun s\'abbonamentu tuo. Incarca su butone pro andare a sas impostatziones de sos abbonamentos de Google Play pro acontzare sa manera de pagamentu tua.</string>
     <string name="subscription_expired_title">S\'abbonamentu de OsmAnd Live est iscadidu</string>
@@ -3962,17 +3962,32 @@
     <string name="markers_history">Cronologia de sos marcadores</string>
     <string name="send_files_to_openstreetmap">Imbia unu documentu GPX a OpenStreetMap</string>
     <string name="enter_text_separated">Inserta sas etichetas iscrobadas dae vìrgulas.</string>
-    <string name="gpx_upload_public_visibility_descr">Pùblica cheret nàrrere chi sa rasta at a èssere ammustrada in manera pùblica in sas rastas GPS tuas e in sas listas de rastas GPS pùblicas. Sos datos frunidos pro mèdiu de s\'API non sunt ligados a sa pàgina de sa rasta tua. Sas datas integradas in sos puntos de rasta no ant a èssere a disponimentu pro mèdiu de s\'API GPS, e sos puntos no ant a èssere ordinados in manera cronològica. Nointames custu sos àteros impreadores ant a pòdere iscarrigare sa rasta su matessi dae sa lista pùblica de sas rastas cun totu sas datas e sas oras integradas.</string>
+    <string name="gpx_upload_public_visibility_descr">\"Pùblica\" cheret nàrrere chi sa rasta at a èssere ammustrada in manera pùblica in sas rastas GPS tuas, in sas listas de rastas GPS pùblicas e in sa lista de rastas pùblicas cun datas e oras in forma originale. Sos datos frunidos pro mèdiu de s\'API non sunt ligados a sa pàgina de sa rasta tua. Sas datas e sas oras integradas in sos puntos de rasta no ant a èssere a disponimentu pro mèdiu de s\'API GPS, e sos puntos no ant a èssere ordinados in manera cronològica.</string>
-    <string name="gpx_upload_private_visibility_descr">Privada cheret nàrrere chi sa rasta no at a èssere ammustrada in peruna lista, ma sos puntos suos ant a èssere a disponimentu su matessi pro mèdiu de s\'API GPS pùblicu chene datas e oras ma no ant a èssere ordinados in manera cronològica.</string>
+    <string name="gpx_upload_private_visibility_descr">\"Privada\" cheret nàrrere chi sa rasta no at a èssere ammustrada in peruna lista, ma sos puntos suos ant a èssere a disponimentu su matessi, in òrdine cronològicu, pro mèdiu de s\'API GPS pùblica chene datas e oras.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Identificàbile cheret nàrrere chi sa rasta at a èssere ammustrada in manera pùblica in sas rastas GPS tuas e in sas listas de rastas GPS pùblicas. Est a nàrrere chi àteros impreadores ant a pòdere iscarrigare sa rasta e l\'ant a pòdere assotziare a su nùmene de impreadore tuo. Sos datos frunidos pro mèdiu de s\'API de sos puntos de sas rastas ant a èssere ligados a sa pàgina de sa rasta originale tua. Sas datas e sas oras de sos puntos ant a èssere a disponimentu pro mèdiu de s\'API GPS pùblicu.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">\"Identificàbile\" cheret nàrrere chi sa rasta at a èssere ammustrada in manera pùblica in sas rastas GPS tuas e in sas listas de rastas GPS pùblicas. Est a nàrrere chi àteros impreadores ant a pòdere iscarrigare sa rasta e l\'ant a pòdere assotziare a su nùmene de impreadore tuo. Sos puntos de rastas cun datas e oras dae s\'API GPS frunidos pro mèdiu de s\'API de sos puntos de sas rastas ant a èssere ligados a sa pàgina de sa rasta originale tua.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Arrastàbile cheret nàrrere chi sa rasta no at a èssere ammustrada in peruna lista pùblica ma sos puntos suos ant a èssere a disponimentu su matessi pro mèdiu de s\'API GPS pùblicu cun sas datas. Àteros impreadores ant a pòdere iscarrigare petzi puntos de rasta protzessados dae sa rasta tua chi no ant a èssere assotziados diretamente cun tie.</string>
+    <string name="gpx_upload_trackable_visibility_descr">\"Arrastàbile\" cheret nàrrere chi sa rasta no at a èssere ammustrada in peruna lista pùblica, ma sos puntos suos cun sas datas (no ant a èssere assotziados diretamente cun tie) l\'ant a èssere pro mèdiu de iscarrigamentos dae s\'API GPS pùblica.</string>
     <string name="osm_edit_close_note">Serra sa nota de OSM</string>
     <string name="osm_edit_comment_note">Cummenta sa nota de OSM</string>
-    <string name="osm_login_descr">Podes intrare impreende su mètodu seguru OAuth o cun su nùmene tuo e sa crae de intrada tua.</string>
+    <string name="osm_login_descr">Intra impreende su mètodu seguru OAuth o cun su nùmene de impreadore tuo e sa crae de intrada tua.</string>
     <string name="shared_string_add_photo">Annanghe una fotografia</string>
     <string name="register_on_openplacereviews">Registra·ti in
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Sas fotografias benint frunidas dae su progetu a datos abertos OpenPlaceReviews.org. Pro pòdere carrigare sas fotografias tuas ti depes registrare in su situ.</string>
+    <string name="register_on_openplacereviews_desc">Intra in su situ de su progetu a datos abertos OpenPlaceReviews.org. pro carrigare fintzas àteras fotografias.</string>
     <string name="register_opr_create_new_account">Crea unu contu nou</string>
     <string name="register_opr_have_account">Tèngio giai unu contu</string>
+    <string name="shared_string_search_history">Cronologia de chirca</string>
+    <string name="app_mode_kayak">Kàyak</string>
+    <string name="app_mode_motorboat">Motoscafu</string>
+    <string name="add_to_mapillary">Annanghe a Mapillary</string>
+    <string name="add_to_opr">Annanghe a OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd ammustrat fotografias dae fontes medas:
+\nOpenPlaceReviews - fotografias de sos PDI;
+\nMapillary - immàgines a livellu de su caminu;
+\nWeb / Wikimedia - fotografias de sos PDI dillindadas in sos datos de OpenStreetMap.</string>
+    <string name="shared_string_resources">Risursas</string>
+    <string name="approximate_file_size">Mannària aprossimativa de su documentu</string>
+    <string name="select_data_to_export">Ischerta sos datos de esportare in su documentu.</string>
+    <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>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1919,7 +1919,7 @@
     <string name="storage_permission_restart_is_required">Aplikácia teraz má povolenie zapisovať do externého úložiska, ale je potrebný reštart aplikácie.</string>
     <string name="full_report">Podrobný prehľad</string>
     <string name="open_street_map_login_and_pass">Meno a heslo pre OSM</string>
-    <string name="file_name_containes_illegal_char">Názov súboru obsahuje nepovolený znak</string>
+    <string name="file_name_containes_illegal_char">Nepovolený znak v názve súboru</string>
     <string name="rendering_value_thin_name">Tenké</string>
     <string name="rendering_value_medium_name">Stredné</string>
     <string name="rendering_value_bold_name">Tučné</string>
@@ -2636,7 +2636,7 @@
     <string name="copy_location_name">Kopírovať názov bodu/umiestnenia</string>
     <string name="toast_empty_name_error">Nepomenované miesto</string>
     <string name="show_closed_notes">Zobraziť uzavreté poznámky</string>
-    <string name="switch_osm_notes_visibility_desc">Zobraziť/skryť OSM poznámky na mape.</string>
+    <string name="switch_osm_notes_visibility_desc">Zobraziť alebo skryť OSM poznámky na mape.</string>
     <string name="gpx_file_desc">GPX - vhodné na export do JOSM a iných editorov OSM.</string>
     <string name="osc_file_desc">OSC - vhodné na export do OSM.</string>
     <string name="shared_string_gpx_file">Súbor GPX</string>
@@ -3080,7 +3080,7 @@
     <string name="zoom_by_wunderlinq_descr">Zmeňte priblíženie mapy pomocou posúvania kolieskom nahor a nadol. Esc vás vráti do aplikácie WunderLINQ.</string>
     <string name="zoom_by_wunderlinq">Použiť WunderLINQ na približovanie</string>
     <string name="quick_action_need_to_add_item_to_list">Pridajte aspoň jednu položku do zoznamu v nastaveniach \'Rýchlej akcie\'</string>
-    <string name="routing_attr_piste_type_downhill_name">Alpské/zjazdové lyžovanie</string>
+    <string name="routing_attr_piste_type_downhill_name">Alpské alebo zjazdové lyžovanie</string>
     <string name="routing_attr_piste_type_downhill_description">Svahy pre alpské a zjazdové lyžovanie a prístup k vlekom.</string>
     <string name="routing_attr_piste_type_nordic_name">Bežkovanie</string>
     <string name="routing_attr_piste_type_nordic_description">Trasy pre beh na lyžiach.</string>
@@ -3346,7 +3346,7 @@
     <string name="swap_two_places">Zameniť %1$s a %2$s</string>
     <string name="route_start_point">Východzí bod</string>
     <string name="track_saved">Stopa uložená</string>
-    <string name="empty_filename">Názov súboru je prázdny</string>
+    <string name="empty_filename">Prázdny názov súboru</string>
     <string name="shared_string_revert">Vrátiť späť</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Zobraziť sieť cyklotrás</string>
     <string name="clear_confirmation_msg">Vymazať %1$s\?</string>
@@ -3574,7 +3574,7 @@
     <string name="recalculate_route_distance_promo">Trasa bude prepočítaná ak vzdialenosť od trasy k aktuálnej polohe je väčšia ako zvolená hodnota.</string>
     <string name="n_items_of_z">%1$s z %2$s</string>
     <string name="download_slope_maps">Sklony svahov</string>
-    <string name="quick_action_show_hide_terrain">Zobraziť / skryť terén</string>
+    <string name="quick_action_show_hide_terrain">Zobraziť alebo skryť terén</string>
     <string name="quick_action_terrain_hide">Skryť terén</string>
     <string name="quick_action_terrain_show">Zobraziť terén</string>
     <string name="quick_action_terrain_descr">Tlačidlo pre zobrazenie alebo skrytie vrstvy terénu na mape.</string>
@@ -3693,11 +3693,11 @@
 \n</string>
     <string name="quick_action_transport_hide">Skryť verejnú dopravu</string>
     <string name="quick_action_transport_show">Zobraziť verejnú dopravu</string>
-    <string name="quick_action_show_hide_transport">Zobraziť/skryť verejnú dopravu</string>
+    <string name="quick_action_show_hide_transport">Zobraziť alebo skryť verejnú dopravu</string>
     <string name="quick_action_transport_descr">Tlačidlo na zobrazenie alebo skrytie verejnej dopravy na mape.</string>
-    <string name="create_edit_poi">Vytvoriť / Upraviť bod záujmu</string>
+    <string name="create_edit_poi">Vytvoriť alebo upraviť bod záujmu</string>
     <string name="parking_positions">Parkovacie miesta</string>
-    <string name="add_edit_favorite">Pridať / Upraviť obľúbený bod</string>
+    <string name="add_edit_favorite">Pridať alebo upraviť obľúbený bod</string>
     <string name="reset_deafult_order">Obnoviť predvolené poradie položiek</string>
     <string name="back_to_editing">Naspäť k úpravám</string>
     <string name="additional_actions_descr">K týmto akciám sa dostanete stlačením tlačidla “%1$s”.</string>
@@ -3904,7 +3904,7 @@
     <string name="sort_last_modified">Naposledy zmenené</string>
     <string name="sort_name_descending">Názov: Z – A</string>
     <string name="sort_name_ascending">Názov: A – Z</string>
-    <string name="start_finish_icons">Ikony štartu/cieľa</string>
+    <string name="start_finish_icons">Ikony štartu a cieľa</string>
     <string name="contour_lines_thanks">Ďakujeme za zakúpenie modulu \'Vrstevnice\'</string>
     <string name="osm_live_payment_desc_hw">Predplatné bude spoplatnené v zvolenom intervale. Predplatné zrušte kedykoľvek na AppGallery.</string>
     <string name="osm_live_payment_subscription_management_hw">Platba bude stiahnutá z vášho účtu AppGallery po potvrdení nákupu.
@@ -3974,4 +3974,7 @@
     <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_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>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3838,4 +3838,34 @@
     <string name="poi_parking_rooftop">Дах</string>
     <string name="poi_gpx_point">Точка GPX</string>
     <string name="poi_radar_tower">Радіолокаційна вежа</string>
+    <string name="poi_liaison_subnational">Багатонаціональне</string>
+    <string name="poi_embassy_nunciature">Нунціатура</string>
+    <string name="poi_embassy_interests_section">Розділ інтересів</string>
+    <string name="poi_diplomatic_liaison">Зв\'язок</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_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_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_mission">Місія</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_embassy">Посольство</string>
+    <string name="poi_consulate_filter">Консульство</string>
+    <string name="poi_embassy_filter">Посольство</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -59,7 +59,7 @@
     <string name="gpx_visibility_txt">Видимість</string>
     <string name="gpx_tags_txt">Теги</string>
     <string name="gpx_description_txt">Опис</string>
-    <string name="validate_gpx_upload_name_pwd">Для вивантаження GPX-файлів, будь ласка, вкажіть Ваше ім\'я користувача і пароль в OSM.</string>
+    <string name="validate_gpx_upload_name_pwd">Для вивантаження GPX-файлів вкажіть ваше ім\'я користувача і пароль в OSM.</string>
     <string name="default_buttons_support">Підтримка</string>
     <string name="support_new_features">Підтримати розробку нових функцій</string>
     <string name="show_ruler_level">Відображати масштаб</string>
@@ -1946,7 +1946,7 @@
     <string name="osm_live_email_desc">Це потрібно, щоб надавати Вам відомості про зміни на мапі.</string>
     <string name="osm_live_user_public_name">Прилюдне імʼя</string>
     <string name="osm_live_support_region">Територія</string>
-    <string name="osm_live_enter_user_name">Будь ласка, введіть прилюдне ім\'я</string>
+    <string name="osm_live_enter_user_name">Введіть загальнодоступне ім\'я</string>
     <string name="osm_live_thanks">Дякуємо за підтримку OsmAnd! 
 \nЩоб задіяти усі нові можливості Вам потрібно перезапустити застосунок.</string>
     <string name="osm_live_region_desc">Частина коштів буде спрямована землеписцям OSM, що внесли зміни до мапи в цьому місці.</string>
@@ -1956,7 +1956,7 @@
 \nЯкщо Вам подобається OsmAnd та OSM, і хочете підтримати і бути підтриманими ними, це ідеальний спосіб зробити це.</string>
     <string name="upload_osm_note_description">Надішліть Вашу OSM-нотатку таємно, або скориставшись обліковим записом на OSM.org.</string>
     <string name="upload_osm_note">Надіслати нотатку в OSM</string>
-    <string name="file_name_containes_illegal_char">Ім\'я файлу містить неприпустимі знаки</string>
+    <string name="file_name_containes_illegal_char">Неприпустимі знаки в назві файлу</string>
     <string name="follow_us">Слідкуйте за нами</string>
     <string name="access_direction_audio_feedback">Звукові напрямки</string>
     <string name="access_direction_audio_feedback_descr">Індикація звуком напряму на цільову точку.</string>
@@ -2243,7 +2243,7 @@
     <string name="display_zoom_level">Рівень масштабування: %1$s</string>
     <string name="favorite_group_name">Назва групи</string>
     <string name="change_color">Зміна кольору</string>
-    <string name="edit_name">Редагувати ім\'я</string>
+    <string name="edit_name">Змінити ім\'я</string>
     <string name="shared_string_overview">Огляд</string>
     <string name="select_street">Виберіть вулицю</string>
     <string name="shared_string_in_name">у %1$s</string>
@@ -2433,7 +2433,7 @@
     <string name="shared_string_reload">Перезавантажити</string>
     <string name="mapillary_menu_descr_tile_cache">Перезавантажити тайли, щоб переглянути актуальні дані.</string>
     <string name="mapillary_menu_title_tile_cache">Тайловий кеш</string>
-    <string name="wrong_user_name">Невірне ім\'я користувача</string>
+    <string name="wrong_user_name">Неправильне ім\'я користувача</string>
     <string name="shared_string_to">до</string>
     <string name="mapillary_menu_date_from">від</string>
     <string name="mapillary_menu_descr_dates">Показувати лише додані зображення</string>
@@ -2464,7 +2464,7 @@
     <string name="measurement_tool_action_bar">Перегляньте мапу і додайте точки</string>
     <string name="measurement_tool">Вимірювання відстані</string>
     <string name="none_point_error">Необхідно додати хоча б одну точку.</string>
-    <string name="enter_gpx_name">Ім’я GPX файлу:</string>
+    <string name="enter_gpx_name">Назва GPX файлу:</string>
     <string name="show_on_map_after_saving">Показати на мапі після збереження</string>
     <string name="add_waypoint">Додати шляхову точку</string>
     <string name="save_gpx_waypoint">Зберегти GPX-точку шляху</string>
@@ -2633,7 +2633,7 @@
     <string name="first_intermediate_dest_description">Додає першу зупинку</string>
     <string name="subsequent_dest_description">Пересунути призначення далі і створити його</string>
     <string name="show_closed_notes">Показати закриті нотатки</string>
-    <string name="switch_osm_notes_visibility_desc">Показати/приховати OSM-нотатки на мапі.</string>
+    <string name="switch_osm_notes_visibility_desc">Показати чи приховати примітки OSM на мапі.</string>
     <string name="gpx_file_desc">GPX — підходить для експорту в JOSM та інші OSM-редактори.</string>
     <string name="osc_file_desc">OSC — підходить для експорту в OSM.</string>
     <string name="shared_string_gpx_file">GPX-файл</string>
@@ -2663,7 +2663,7 @@
     <string name="west_abbreviation">Зх</string>
     <string name="south_abbreviation">Пд</string>
     <string name="north_abbreviation">Пн</string>
-    <string name="optional_point_name">Необов\'язкове ім\'я точки</string>
+    <string name="optional_point_name">Необов\'язкова назва точки</string>
     <string name="transport_nearby_routes_within">Близькі маршрути в межах</string>
     <string name="transport_nearby_routes">В межах</string>
     <string name="distance_farthest">Відстань: спочатку найдальше</string>
@@ -3122,7 +3122,7 @@
     <string name="zoom_by_wunderlinq_descr">Змінюйте масштабування мапи прокручуванням колеса вгору і вниз. Клавіша Escape поверне вас до додатку WunderLINQ.</string>
     <string name="zoom_by_wunderlinq">Використовувати WunderLINQ для контролю</string>
     <string name="quick_action_need_to_add_item_to_list">Потрібно додати принаймні одну річ до списку у налаштуваннях \'Швидкої дії\'</string>
-    <string name="routing_attr_piste_type_downhill_name">Високогір\'я / гірські лижі</string>
+    <string name="routing_attr_piste_type_downhill_name">Альпійські та гірські лижі</string>
     <string name="routing_attr_piste_type_downhill_description">Траси для високогірних і гірських лиж та доступ до лижних підіймачів.</string>
     <string name="app_mode_offroad">Бездоріжжя</string>
     <string name="edit_profile_setup_title">Налаштувати профіль</string>
@@ -3132,7 +3132,7 @@
     <string name="edit_profile_nav_settings_subtitle">Оберіть налаштування навігації для профілю</string>
     <string name="routing_attr_max_num_changes_description">Вкажіть верхню межу змін</string>
     <string name="routing_attr_max_num_changes_name">Кількість змін</string>
-    <string name="routing_attr_piste_type_nordic_name">Бігові лижі / скандинавська ходьба</string>
+    <string name="routing_attr_piste_type_nordic_name">Бігові лижі та скандинавські лижі</string>
     <string name="routing_attr_piste_type_nordic_description">Траси для скандинавської ходьби або бігу на лижах.</string>
     <string name="routing_attr_piste_type_skitour_name">Лижні тури</string>
     <string name="routing_attr_piste_type_skitour_description">Маршрути для лижних турів.</string>
@@ -3364,7 +3364,7 @@
     <string name="swap_two_places">Змінити місцями %1$s та %2$s</string>
     <string name="route_start_point">Початкова точка</string>
     <string name="track_saved">Трек збережено</string>
-    <string name="empty_filename">Ім\'я файлу порожнє</string>
+    <string name="empty_filename">Порожня назва файлу</string>
     <string name="shared_string_revert">Повернутися</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Показати мережеві маршрути циклу вузлів</string>
     <string name="clear_confirmation_msg">Очистити %1$s\?</string>
@@ -3574,7 +3574,7 @@
     <string name="shared_string_hillshade">Пагорб</string>
     <string name="n_items_of_z">%1$s з %2$s</string>
     <string name="download_slope_maps">Схили</string>
-    <string name="quick_action_show_hide_terrain">Показати / приховати місцевість</string>
+    <string name="quick_action_show_hide_terrain">Показати чи приховати рельєф</string>
     <string name="quick_action_terrain_hide">Сховати місцевість</string>
     <string name="quick_action_terrain_show">Показати місцевість</string>
     <string name="quick_action_terrain_descr">Кнопка для відображення або приховування шару місцевості на мапі.</string>
@@ -3691,10 +3691,10 @@
     <string name="parking_positions">Розташування припаркованого авто</string>
     <string name="quick_action_transport_hide">Приховати громадський транспорт</string>
     <string name="quick_action_transport_show">Показати громадський транспорт</string>
-    <string name="quick_action_show_hide_transport">Показати/приховати громадський транспорт</string>
+    <string name="quick_action_show_hide_transport">Показати чи приховати громадський транспорт</string>
     <string name="quick_action_transport_descr">Кнопка показу або приховування громадського транспорту на мапі.</string>
-    <string name="create_edit_poi">Створити / змінити POI</string>
+    <string name="create_edit_poi">Створити чи змінити POI</string>
-    <string name="add_edit_favorite">Додати / правити вибране</string>
+    <string name="add_edit_favorite">Додати чи змінити вибране</string>
     <string name="reset_deafult_order">Відновити усталене впорядкування</string>
     <string name="back_to_editing">Повернутися до редагування</string>
     <string name="additional_actions_descr">Ви можете отримати доступ до цих дій, торкнувшись кнопки “%1$s”.</string>
@@ -3863,7 +3863,7 @@
     <string name="plan_route_trim_after">Обрізати після</string>
     <string name="plan_route_change_route_type_before">Змінити вид маршруту раніше</string>
     <string name="plan_route_change_route_type_after">Змінити вид маршруту після</string>
-    <string name="save_global_track_interval_descr">Вкажіть інтервал для загального запису поїздки (включається через віджет запису подорожі на мапі).</string>
+    <string name="save_global_track_interval_descr">Вкажіть інтервал для загального запису поїздки (увімкнено через віджет «Запис подорожі» на мапі).</string>
     <string name="system_default_theme">Усталена системна</string>
     <string name="all_next_segments">Всі наступні сегменти</string>
     <string name="previous_segment">Попередній сегмент</string>
@@ -3884,7 +3884,7 @@
     <string name="shared_string_redo">Повторити</string>
     <string name="release_3_8">• Оновлено функції планування маршруту: дозволено застосувати різні типи переходів для кожного сегмента і прив\'язати будь-який трек до доріг
 \n
-\n• Нове меню вигляду треків: вибір кольору, товщина, вигляд стрілки напрямку, значки початку/завершення
+\n• Нове меню вигляду треків: вибір кольору, товщина, вигляд стрілки напрямку, піктограми початку та завершення
 \n
 \n• Покращено оглядовість велосипедних вузлів
 \n
@@ -3900,7 +3900,7 @@
     <string name="sort_last_modified">Востаннє змінено</string>
     <string name="sort_name_descending">За назвою: Я — А</string>
     <string name="sort_name_ascending">За назвою: А — Я</string>
-    <string name="start_finish_icons">Значки початку/завершення</string>
+    <string name="start_finish_icons">Піктограми початку та завершення</string>
     <string name="contour_lines_thanks">Дякуємо за придбання «Горизонталей»</string>
     <string name="what_is_new">Що нового</string>
     <string name="osm_live_payment_desc_hw">Передплата стягується за вибраний період. Скасуйте її в AppGallery у будь-який час.</string>
@@ -3914,10 +3914,10 @@
     <string name="complex_routing_descr">Двофазна маршрутизація для автомобільної навігації.</string>
     <string name="use_native_pt">Розвиток власного громадського транспорту</string>
     <string name="use_native_pt_desc">Перемкнутися на розрахунок маршруту громадським транспортом за допомогою Java (безпечний)</string>
-    <string name="perform_oauth_authorization_description">Виконати вхід OAuth для користування функцією osmedit</string>
+    <string name="perform_oauth_authorization_description">Увійти за допомогою OAuth для користування функцією osmedit</string>
     <string name="perform_oauth_authorization">Увійти через OAuth</string>
     <string name="clear_osm_token">Очистити токен OAuth OpenStreetMap</string>
-    <string name="osm_edit_logout_success">Ви успішно вийшли</string>
+    <string name="osm_edit_logout_success">Ви вийшли</string>
     <string name="use_live_public_transport">OsmAnd дані в реальному часі</string>
     <string name="routing_attr_avoid_footways_description">Уникати пішохідних шляхів</string>
     <string name="routing_attr_avoid_footways_name">Уникати пішохідних шляхів</string>
@@ -3951,27 +3951,42 @@
     <string name="subscription_on_hold_title">Передплата OsmAnd Live на утриманні</string>
     <string name="login_open_street_map">Увійти до OpenStreetMap.org</string>
     <string name="login_open_street_map_org">Увійти до OpenStreetMap.org</string>
-    <string name="open_street_map_login_mode">Увійдіть, щоб вивантажити нові або внесені зміни.
+    <string name="open_street_map_login_mode">Увійдіть, щоб вивантажити нові або внесені зміни,
 \n
-\nВи можете увійти, за допомогою безпечного методу OAuth, або скористатися своїм ім\'ям та паролем.</string>
+\nабо за допомогою безпечного методу OAuth або свого ім\'я та паролю.</string>
-    <string name="use_login_password">Використовувати ім\'я і пароль</string>
+    <string name="use_login_password">Увійти за допомогою імені користувача і паролю</string>
     <string name="login_account">Обліковий запис</string>
     <string name="user_login">Ім\'я користувача</string>
     <string name="sign_in_with_open_street_map">Увійти за допомогою OpenStreetMap</string>
     <string name="markers_history">Історія маркерів</string>
     <string name="send_files_to_openstreetmap">Надіслати файл GPX на OpenStreetMap</string>
     <string name="enter_text_separated">Введіть мітки через коми.</string>
-    <string name="gpx_upload_public_visibility_descr">Загальнодоступне означає, що трасування буде показано загальнодоступно у ваших GPS-трасуваннях та у загальнодоступних списках GPS-трасування. Дані, що подаються через API, не посилаються на вашу сторінку трасування. Мітки часу точок трасування недоступні через загальнодоступний API GPS і не впорядковані хронологічно. Однак інші користувачі все ще можуть завантажувати необроблену трасування із загальнодоступного списку трасування та будь-які часові позначки, що містяться всередині.</string>
+    <string name="gpx_upload_public_visibility_descr">«Загальнодоступне» означає, що трасування показано загальнодоступно у ваших GPS-трасуваннях та у загальнодоступних списках GPS-трасування, а також у загальнодоступному списку трасування з позначками часу в необробленому вигляді.. Дані, що подаються через API, не посилаються на вашу сторінку трасування. Мітки часу точок трасування недоступні через загальнодоступний API GPS і не впорядковані хронологічно.</string>
-    <string name="gpx_upload_private_visibility_descr">Приватне означає, що трасування не з\'являтиметься в жодному загальнодоступному списку, але контрольні точки з нього все одно будуть доступні через загальнодоступний API GPS без позначок часу та не впорядковані за хронологією.</string>
+    <string name="gpx_upload_private_visibility_descr">«Приватне» означає, що трасування не з\'являється в жодному загальнодоступному списку, але контрольні точки з нього в нехронологічному порядку доступні через загальнодоступний API GPS без позначок часу.</string>
-    <string name="gpx_upload_identifiable_visibility_descr">Ідентифікований означає, що трасування буде показано публічно у вашому трасуванні GPS і в загальнодоступних списках трасування GPS, тобто інші користувачі зможуть завантажити необроблене трасування та пов\'язати його з вашим ім\'ям користувача. Дані, подані за допомогою API точок відстеження, посилаються на вихідну сторінку трасування. Позначки часу точок трасування доступні через загальнодоступний GPS API.</string>
+    <string name="gpx_upload_identifiable_visibility_descr">«Ідентифікований» означає, що трасування буде показано публічно у вашому трасуванні GPS і в загальнодоступних списках трасування GPS, тобто інші користувачі зможуть завантажити необроблене трасування та пов\'язати його з вашим ім\'ям користувача. Загальнодоступні дані трасування з GPS API, що обслуговуються за допомогою API точок відстеження, посилаються на початкову сторінку трасування.</string>
-    <string name="gpx_upload_trackable_visibility_descr">Відстежуваний означає, що трасування не з\'явиться в жодному загальнодоступному списку, але точки від нього все одно будуть доступні через загальнодоступний API GPS із позначками часу. Інші користувачі зможуть завантажувати лише оброблені контрольні точки з вашого трасування, які не можуть бути безпосередньо пов’язані з вами.</string>
+    <string name="gpx_upload_trackable_visibility_descr">«Відстежуваний» означає, що трек не з\'явиться в жодному загальнодоступному списку, але обробка точок з позначками часу від нього (які не можуть бути безпосередньо пов’язані з вами) виконується за допомогою завантажень із загальнодоступного API GPS.</string>
     <string name="osm_edit_close_note">Закрити примітку OSM</string>
     <string name="osm_edit_comment_note">Коментувати примітку OSM</string>
-    <string name="osm_login_descr">Ви можете увійти за допомогою безпечного методу OAuth або застосувавши свої ім\'я користувача й пароль.</string>
+    <string name="osm_login_descr">Увійдіть за допомогою безпечного методу OAuth або застосувавши свої ім\'я користувача й пароль.</string>
     <string name="shared_string_add_photo">Додати світлини</string>
     <string name="register_on_openplacereviews">Зареєструватися на
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">Світлини надаються проєктом відкритих даних OpenPlaceReviews.org. Щоб завантажити світлини зареєструйтеся на сайті.</string>
+    <string name="register_on_openplacereviews_desc">Увійдіть на вебсайт проєкту відкритих даних OpenPlaceReviews.org, щоб завантажити ще більше світлин.</string>
     <string name="register_opr_create_new_account">Створити обліковий запис</string>
     <string name="register_opr_have_account">У мене вже є обліковий запис</string>
+    <string name="shared_string_search_history">Журнал пошуку</string>
+    <string name="app_mode_kayak">Каяк</string>
+    <string name="app_mode_motorboat">Моторний човен</string>
+    <string name="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>
+    <string name="add_to_mapillary">Додати до Mapillary</string>
+    <string name="add_to_opr">Додати до OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd демонструє світлини з кількох джерел:
+\nOpenPlaceReviews — світлини POI;
+\nMapillary - зображення вулиць;
+\nМережа / Вікімедіа — світлини POI, вказані в даних OpenStreetMap.</string>
 </resources>

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

@@ -1579,7 +1579,7 @@
     <string name="poi_vending_toys">玩具</string>
     <string name="poi_vending_ice_cream">冰淇淋</string>
     <string name="poi_vending_sim_cards">SIM 卡</string>
-    <string name="poi_branch">分公司</string>
+    <string name="poi_branch">分公司／分店</string>
     <string name="poi_memorial_war">戰爭紀念碑</string>
     <string name="poi_memorial_plaque">牌匾</string>
     <string name="poi_memorial_statue">雕像</string>
@@ -3849,4 +3849,34 @@
     <string name="poi_parking_rooftop">屋頂</string>
     <string name="poi_gpx_point">GPX 點</string>
     <string name="poi_radar_tower">雷達塔</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_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>
 </resources>

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

@@ -1913,7 +1913,7 @@
     <string name="full_report">完整報告</string>
     <string name="open_street_map_login_and_pass">OSM 的使用者名稱與密碼</string>
     <string name="report">報告</string>
-    <string name="file_name_containes_illegal_char">檔案名稱包含非法字元</string>
+    <string name="file_name_containes_illegal_char">檔案名稱中有非法字元</string>
     <string name="storage_permission_restart_is_required">現在應用程式允許寫入外部記憶體。但是需要重新啟動程式。</string>
     <string name="no_map_markers_found">請透過地圖增加地圖標記</string>
     <string name="no_waypoints_found">未發現任何航點</string>
@@ -2632,7 +2632,7 @@
     <string name="copy_location_name">複製地點／POI 名稱</string>
     <string name="toast_empty_name_error">無名稱的位置</string>
     <string name="show_closed_notes">顯示已關閉的註解</string>
-    <string name="switch_osm_notes_visibility_desc">在地圖上顯示/隱藏 OSM 的註解。</string>
+    <string name="switch_osm_notes_visibility_desc">在地圖上顯示或隱藏 OSM 的註解。</string>
     <string name="gpx_file_desc">GPX - 適合匯出到 JOSM 或其他 OSM 編輯。</string>
     <string name="osc_file_desc">OSC - 適合匯出到 OSM。</string>
     <string name="shared_string_gpx_file">GPX 檔案</string>
@@ -3078,7 +3078,7 @@
     <string name="zoom_by_wunderlinq_descr">透過向上或向下捲以變更地圖縮放。Esc 會將您帶回 WunderLINQ 應用程式。</string>
     <string name="zoom_by_wunderlinq">使用 WunderLINQ 來控制</string>
     <string name="quick_action_need_to_add_item_to_list">至少在「快速動作」設定中新增一個項目</string>
-    <string name="routing_attr_piste_type_downhill_name">高山／下坡滑雪</string>
+    <string name="routing_attr_piste_type_downhill_name">高山與下坡滑雪</string>
     <string name="routing_attr_piste_type_downhill_description">適合高山或下山滑雪的斜坡與滑雪纜車。</string>
     <string name="routing_attr_piste_type_nordic_name">越野滑雪</string>
     <string name="routing_attr_piste_type_nordic_description">越野滑雪的路線。</string>
@@ -3360,7 +3360,7 @@
     <string name="route_start_point">起點</string>
     <string name="default_speed_dialog_msg">估計未知道路類型的到達時間，並限制所有道路的速度（可能會影響路徑）</string>
     <string name="track_saved">已儲存軌跡</string>
-    <string name="empty_filename">檔案名稱為空</string>
+    <string name="empty_filename">空的檔案名稱</string>
     <string name="shared_string_revert">還原</string>
     <string name="quick_action_directions_from_desc">讓出發點置於畫面中央的按鈕。</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">顯示節點網路自行車路徑</string>
@@ -3571,7 +3571,7 @@
     <string name="terrain_empty_state_text">啟用以檢視地形陰影或坡度圖。您可以在我們的網站上閱讀更多關於這些地圖類型的資訊。</string>
     <string name="shared_string_hillshade">地形陰影</string>
     <string name="download_slope_maps">坡度</string>
-    <string name="quick_action_show_hide_terrain">顯示／隱藏地形</string>
+    <string name="quick_action_show_hide_terrain">顯示或隱藏地形</string>
     <string name="quick_action_terrain_hide">隱藏地形</string>
     <string name="quick_action_terrain_show">顯示地形</string>
     <string name="quick_action_terrain_descr">用於顯示或隱藏地圖上地形圖層的按鈕。</string>
@@ -3689,10 +3689,10 @@
     <string name="additional_actions_descr">您可以透過點選「%1$s」按鈕存取這些動作。</string>
     <string name="quick_action_transport_hide">隱藏大眾運輸</string>
     <string name="quick_action_transport_descr">在地圖上顯示或隱藏大眾運輸的按鈕。</string>
-    <string name="quick_action_show_hide_transport">顯示／隱藏大眾運輸</string>
+    <string name="quick_action_show_hide_transport">顯示或隱藏大眾運輸</string>
-    <string name="create_edit_poi">建立／編輯 POI</string>
+    <string name="create_edit_poi">建立或編輯 POI</string>
     <string name="parking_positions">停車位置</string>
-    <string name="add_edit_favorite">新增／編輯收藏</string>
+    <string name="add_edit_favorite">新增與編輯收藏</string>
     <string name="reset_deafult_order">恢復預設項目排序</string>
     <string name="back_to_editing">返回編輯</string>
     <string name="shared_string_resume">恢復</string>
@@ -3867,7 +3867,7 @@
     <string name="shared_string_file_name">檔案名稱</string>
     <string name="number_of_gpx_files_selected_pattern">已選定 %s 軌跡檔案</string>
     <string name="disable_recording_once_app_killed_descrp">將會在應用程式被砍除時（透過最近的應用程式）暫停軌跡錄製。（OsmAnd 背景指示會從 Android 通知列中消失。）</string>
-    <string name="save_global_track_interval_descr">指定一般軌跡錄製的記錄間隔（透過地圖上的旅程錄製小工具啟用）。</string>
+    <string name="save_global_track_interval_descr">指定一般軌跡錄製的記錄間隔（透過地圖上的旅程錄製小工具開啟）。</string>
     <string name="gpx_monitoring_stop">暫停旅程錄製</string>
     <string name="gpx_monitoring_start">恢復旅程錄製</string>
     <string name="system_default_theme">系統預設</string>
@@ -3883,7 +3883,7 @@
     <string name="shared_string_redo">重做</string>
     <string name="release_3_8">• 更新「規劃路線」功能：允許每個路段使用不同的導航類型並包含軌跡
 \n
-\n • 新的軌跡外觀選項：選取顏色、厚度、開啟方向箭頭與開始／結束圖示
+\n • 新的軌跡外觀選項：選取顏色、厚度、開啟方向箭頭與開始與結束圖示
 \n
 \n • 改善自行車節點的能見度
 \n
@@ -3899,7 +3899,7 @@
     <string name="sort_last_modified">最後修改時間</string>
     <string name="sort_name_descending">名稱：Z – A</string>
     <string name="sort_name_ascending">名稱：A – Z</string>
-    <string name="start_finish_icons">開始／結束圖示</string>
+    <string name="start_finish_icons">開始與結束圖示</string>
     <string name="contour_lines_thanks">感謝您購買 \'Contour lines\'</string>
     <string name="osm_live_payment_desc_hw">按選定週期收取訂閱費用。隨時在 AppGallery 上取消。</string>
     <string name="osm_live_payment_subscription_management_hw">確認購買後將會從您的 AppGallery 帳號中付款。
@@ -3917,10 +3917,10 @@
     <string name="use_native_pt">原生公共運輸發展</string>
     <string name="use_native_pt_desc">切換到 Java（安全）公共運輸路線計算</string>
     <string name="what_is_new">有什麼新鮮事</string>
-    <string name="perform_oauth_authorization_description">執行 OAuth 登入以使用 osmedit 功能</string>
+    <string name="perform_oauth_authorization_description">以 OAuth 登入以使用 osmedit 功能</string>
     <string name="perform_oauth_authorization">透過 OAuth 登入</string>
     <string name="clear_osm_token">清除 OpenStreetMap OAuth 權杖</string>
-    <string name="osm_edit_logout_success">成功登出</string>
+    <string name="osm_edit_logout_success">已登出</string>
     <string name="snowmobile_render_descr">適用於有專用道路與軌道的雪地摩托車駕駛。</string>
     <string name="file_already_imported">檔案已在 OsmAnd 匯入</string>
     <string name="use_two_phase_routing">使用 2 相的 A* 路線演算法</string>
@@ -3948,29 +3948,44 @@
     <string name="subscription_expired_title">OsmAnd Live 訂閱已過期</string>
     <string name="subscription_paused_title">OsmAnd Live 訂閱已暫停</string>
     <string name="subscription_on_hold_title">OsmAnd Live 訂閱已暫停</string>
-    <string name="login_open_street_map">登入到 OpenStreetMap</string>
+    <string name="login_open_street_map">登入 OpenStreetMap</string>
-    <string name="login_open_street_map_org">登入到 OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">登入 OpenStreetMap.org</string>
-    <string name="open_street_map_login_mode">您必須登入以上傳新的或修正過的變更。
+    <string name="open_street_map_login_mode">登入以上傳新的或修正過的變更，
 \n
-\n您可以使用安全的 OAuth 方法或使用您的登入與密碼來登入。</string>
+\n以 OAuth 或使用您的使用者名稱與密碼來登入。</string>
-    <string name="use_login_password">使用登入與密碼</string>
+    <string name="use_login_password">以使用者名稱與密碼登入</string>
     <string name="login_account">帳號</string>
-    <string name="user_login">登入</string>
+    <string name="user_login">使用者名稱</string>
     <string name="sign_in_with_open_street_map">使用 OpenStreetMap 登入</string>
     <string name="markers_history">標記歷史</string>
     <string name="send_files_to_openstreetmap">傳送 GPX 檔案到 OpenStreetMap</string>
     <string name="enter_text_separated">輸入以逗號分隔的標籤。</string>
-    <string name="gpx_upload_public_visibility_descr">公開代表軌跡將會公開顯示在您的 GPS 軌跡與公開的 GPS 軌跡清單中。透過 API 取得的 API 不會參考您的軌跡頁面。軌跡點的時間戳不會透過公開的 GPS API 提供，也不會按時間排序。不過，其他使用者仍可以從公開的軌跡清單下載原始軌跡與任何其中包含的時間戳。</string>
+    <string name="gpx_upload_public_visibility_descr">「公開」代表軌跡將會公開顯示在您的 GPS 軌跡與公開的 GPS 軌跡清單中，且在公開軌跡清單中會以帶有原始形式的時間戳顯示。透過 API 取得的資料不會引用您的軌跡頁面。軌跡點的時間戳不會透過公開的 GPS API 提供，也不會按時間排序。</string>
-    <string name="gpx_upload_private_visibility_descr">私有代表了軌跡不會顯示在任何公開的清單中，但其軌跡點仍可透過公開的 GPS API 取得，但沒有時間戳，也不會按時間順序排列。</string>
+    <string name="gpx_upload_private_visibility_descr">「私有」代表軌跡不會顯示在任何公開的清單中，但其軌跡點仍可透過公開的 GPS API 取得，但沒有時間戳，也不會按時間順序排列。</string>
-    <string name="gpx_upload_identifiable_visibility_descr">可識別代表軌跡將會在您的 GPS 軌跡與公開 GPS 軌跡清單中顯示，亦即其他使用者將可以下載原始軌跡並將其與您的使用者名稱相關聯。透過軌跡點 API 提供的資料將會參考您的原始軌跡頁面。軌跡點的時間戳可透過公開的 GPS API 取得。</string>
+    <string name="gpx_upload_identifiable_visibility_descr">「可識別」代表軌跡將會在您的 GPS 軌跡與公開 GPS 軌跡清單中顯示，亦即其他使用者將可以下載原始軌跡並將其與您的使用者名稱相關聯。透過追蹤點 API 提供的 GPS API 中帶有公開時間戳的追蹤點資料將會引用您的原始追蹤頁面。</string>
-    <string name="gpx_upload_trackable_visibility_descr">可追蹤代表軌跡不會顯示在任何公開的清單中，但其追蹤點仍可以透過帶有時間戳的公開 GPS API 使用。其他使用者將只能從您的軌跡中下載處理過的追蹤點，但這些追蹤點無法直接與與您相關聯。</string>
+    <string name="gpx_upload_trackable_visibility_descr">「可追蹤」代表軌跡不會在任何公開的清單中顯示，但帶有時間戳（這並不會與您直接相關聯）的已處理追蹤點可從公開的 GPS API 下載。</string>
     <string name="osm_edit_close_note">關閉 OSM 註記</string>
     <string name="osm_edit_comment_note">評論 OSM 註記</string>
-    <string name="osm_login_descr">您可以使用安全的 OAuth 方式或是使用您的帳號與密碼來登入。</string>
+    <string name="osm_login_descr">使用安全的 OAuth 方式或是使用您的使用者名稱與密碼來登入。</string>
     <string name="shared_string_add_photo">新增照片</string>
     <string name="register_on_openplacereviews">註冊於
 \nOpenPlaceReviews.org</string>
-    <string name="register_on_openplacereviews_desc">照片由開放資料專案 OpenPlaceReviews.org 提供。為了上傳您的照片，您必須在網站上註冊。</string>
+    <string name="register_on_openplacereviews_desc">登入開放資料專案網站 OpenPlaceReviews.org 以上傳更多照片。</string>
     <string name="register_opr_create_new_account">建立新帳號</string>
     <string name="register_opr_have_account">我已經有帳號了</string>
+    <string name="shared_string_search_history">搜尋歷史紀錄</string>
+    <string name="app_mode_kayak">皮艇</string>
+    <string name="app_mode_motorboat">快艇</string>
+    <string name="add_to_mapillary">新增到 Mapillary</string>
+    <string name="add_to_opr">新增到 OpenPlaceReviews</string>
+    <string name="add_photos_descr">OsmAnd 從多個來源顯示照片：
+\nOpenPlaceReviews - POI 照片；
+\nMapillary - 街景；
+\n網路／維基媒體 - 特定 OpenStreetMap 資料的 POI 照片。</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/sizes.xml

@@ -289,6 +289,7 @@
 	<dimen name="bottom_sheet_info_spacing_multiplier" format="float">1.5</dimen>
 	<dimen name="bottom_sheet_big_item_height">128dp</dimen>
 	<dimen name="bottom_sheet_top_shadow_height">8dp</dimen>
+	<dimen name="bottom_sheet_button_divider_height">28dp</dimen>
 
 	<dimen name="action_bar_image_width_land">236dp</dimen>
 	<dimen name="action_bar_image_top_margin_land">68dp</dimen>

OsmAnd/res/values/strings.xml

@@ -11,21 +11,26 @@
 	Thx - Hardy
 
 -->
+    <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>
     <string name="export_not_enough_space_descr">Your device only has %1$s free. Please free up some space or unselect some items to export.</string>
     <string name="file_size_needed_for_import">Needed for import</string>
     <string name="select_data_to_export">Select the data to be exported to the file.</string>
     <string name="approximate_file_size">Approximate file size</string>
     <string name="shared_string_resources">Resources</string>
+    <string name="add_photos_descr">OsmAnd shows photos from several sources:\nOpenPlaceReviews - POI photos;\nMapillary - street-level imagery;\nWeb / Wikimedia - POI photos specified in OpenStreetMap data.</string>
+    <string name="add_to_opr">Add to OpenPlaceReviews</string>
+    <string name="add_to_mapillary">Add to Mapillary</string>
     <string name="app_mode_motorboat">Motorboat</string>
     <string name="app_mode_kayak">Kayak</string>
     <string name="shared_string_search_history">Search history</string>
     <string name="register_opr_have_account">I already have an account</string>
     <string name="register_opr_create_new_account">Create new account</string>
-    <string name="register_on_openplacereviews_desc">Photos are provided by open data project OpenPlaceReviews.org. In order to upload your photos you need to sign up on website.</string>
+    <string name="register_on_openplacereviews_desc">Log in on the open data project website OpenPlaceReviews.org to upload even more photos.</string>
     <string name="register_on_openplacereviews">Register on\nOpenPlaceReviews.org</string>
     <string name="shared_string_add_photo">Add photo</string>
-    <string name="osm_login_descr">You can log in using the safe OAuth method or use your login and password.</string>
+    <string name="osm_login_descr">Log in using the safe OAuth method or use your username and password.</string>
     <string name="osm_edit_comment_note">Comment OSM Note</string>
     <string name="osm_edit_close_note">Close OSM Note</string>
     <string name="gpx_upload_trackable_visibility_descr">\"Trackable\" means the trace does not show up in any public listings, but processed trackpoints with timestamps from it (that can\'t be associated with you directly) do through downloads from the public GPS API.</string>
@@ -40,15 +45,15 @@
     <string name="subscription_expired_title">OsmAnd Live subscription has been expired</string>
     <string name="subscription_payment_issue_title">There is a problem with your subscription. Click the button to go to the Google Play subscription settings to fix your payment method.</string>
     <string name="manage_subscription">Manage subscription</string>
-    <string name="user_login">Login</string>
+    <string name="user_login">Username</string>
     <string name="user_password">Password</string>
     <string name="login_account">Account</string>
-    <string name="use_login_password">Use login and password</string>
+    <string name="use_login_password">Log in with username and password</string>
-    <string name="open_street_map_login_mode">You need to login to upload new or modified changes. \n\nYou can log in using the safe OAuth method or use your login and password.</string>
+    <string name="open_street_map_login_mode">Log in to upload new or modified changes,\n\neither with OAuth or using your username and password.</string>
     <string name="osm_edits_view_descr">You can view all your not yet uploaded edits or OSM bugs in %1$s. Uploaded points don’t show in OsmAnd.</string>
-    <string name="sign_in_with_open_street_map">Sign in with OpenStreetMap</string>
+    <string name="sign_in_with_open_street_map">Log in with OpenStreetMap</string>
-    <string name="login_open_street_map_org">Login to OpenStreetMap.org</string>
+    <string name="login_open_street_map_org">Login for OpenStreetMap.org</string>
-    <string name="login_open_street_map">Login to OpenStreetMap</string>
+    <string name="login_open_street_map">Login for OpenStreetMap</string>
     <string name="plugin_global_prefs_info">These plugin setting are global, and apply to all profiles</string>
     <string name="message_you_need_add_two_points_to_show_graphs">You need to add at least two points</string>
     <string name="icon_group_travel">Travel</string>
@@ -67,10 +72,10 @@
     <string name="shared_string_graph">Graph</string>
     <string name="use_two_phase_routing">Use 2-phase A* routing algorithm</string>
     <string name="file_already_imported">File is already imported in OsmAnd</string>
-    <string name="osm_edit_logout_success">Logout successful</string>
+    <string name="osm_edit_logout_success">Logged out</string>
     <string name="clear_osm_token">Clear OpenStreetMap OAuth token</string>
     <string name="perform_oauth_authorization">Log in via OAuth</string>
-    <string name="perform_oauth_authorization_description">Perform an OAuth Login to use osmedit features</string>
+    <string name="perform_oauth_authorization_description">Log in with OAuth to use osmedit features</string>
     <string name="use_native_pt_desc">Switch to Java (safe) Public Transport routing calculation</string>
     <string name="use_native_pt">Native Public Transport development</string>
     <string name="use_fast_recalculation_desc">Recalculates only the initial part of the route. Can be used for long trips.</string>

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

@@ -14,11 +14,11 @@ import net.osmand.osm.AbstractPoiType;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
-import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.helpers.enums.AngularConstants;
 import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.helpers.enums.SpeedConstants;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.util.Algorithms;
 
 import java.text.DateFormatSymbols;
@@ -30,7 +30,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map.Entry;
 
 import static net.osmand.data.PointDescription.getLocationOlcName;
 
@@ -417,7 +416,7 @@ public class OsmAndFormatter {
 		String typeName = amenity.getSubType();
 		if (pt != null) {
 			typeName = pt.getTranslation();
-		} else if(typeName != null){
+		} else if (typeName != null) {
 			typeName = Algorithms.capitalizeFirstLetterAndLowercase(typeName.replace('_', ' '));
 		}
 		List<String> res = new ArrayList<>();
@@ -426,7 +425,7 @@ public class OsmAndFormatter {
 		for (String name : amenity.getAllNames(true)) {
 			addPoiString(typeName, name, res);
 		}
-		for (String name : amenity.getAdditionalInfo().values()) {
+		for (String name : amenity.getAdditionalInfoValues(false)) {
 			addPoiString(typeName, name, res);
 		}
 		return res;
@@ -444,36 +443,34 @@ public class OsmAndFormatter {
 
 	public static String getAmenityDescriptionContent(OsmandApplication ctx, Amenity amenity, boolean shortDescription) {
 		StringBuilder d = new StringBuilder();
-		if(amenity.getType().isWiki()) {
+		if (amenity.getType().isWiki()) {
 			return "";
 		}
 		MapPoiTypes poiTypes = ctx.getPoiTypes();
-		for(Entry<String, String>  e : amenity.getAdditionalInfo().entrySet()) {
+		for (String key : amenity.getAdditionalInfoKeys()) {
-			String key = e.getKey();
+			String vl = amenity.getAdditionalInfo(key);
-			String vl = e.getValue();
+			if (key.startsWith("name:")) {
-			if(key.startsWith("name:")) {
 				continue;
-			} else if(vl.length() >= 150) {
+			} else if (vl.length() >= 150) {
-				if(shortDescription) {
+				if (shortDescription) {
 					continue;
 				}
-			} else if(Amenity.OPENING_HOURS.equals(key)) {
+			} else if (Amenity.OPENING_HOURS.equals(key)) {
 				d.append(ctx.getString(R.string.opening_hours) + ": ");
-			} else if(Amenity.PHONE.equals(key)) {
+			} else if (Amenity.PHONE.equals(key)) {
 				d.append(ctx.getString(R.string.phone) + ": ");
-			} else if(Amenity.WEBSITE.equals(key)) {
+			} else if (Amenity.WEBSITE.equals(key)) {
 				d.append(ctx.getString(R.string.website) + ": ");
 			} else {
-				AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(e.getKey());
+				AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(key);
 				if (pt != null) {
-					if(pt instanceof PoiType && !((PoiType) pt).isText()) {
+					if (pt instanceof PoiType && !((PoiType) pt).isText()) {
 						vl = pt.getTranslation();
 					} else {
-						vl = pt.getTranslation() + ": " + amenity.unzipContent(e.getValue());
+						vl = pt.getTranslation() + ": " + vl;
 					}
 				} else {
-					vl = Algorithms.capitalizeFirstLetterAndLowercase(e.getKey()) +
+					vl = Algorithms.capitalizeFirstLetterAndLowercase(key) + ": " + vl;
-					 ": " + amenity.unzipContent(e.getValue());
 				}
 			}
 			d.append(vl).append('\n');

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

@@ -304,9 +304,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 		}
 		mapActions = new MapActivityActions(this);
 		mapLayers = new MapActivityLayers(this);
-		if (mapViewTrackingUtilities == null) {
-			mapViewTrackingUtilities = new MapViewTrackingUtilities(app);
-		}
 		dashboardOnMap.createDashboardView();
 		checkAppInitialization();
 

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

@@ -819,7 +819,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 					}
 				}
 			});
-			mapInfoLayer.registerSideWidget(recordControl, new AudioVideoNotesWidgetState(app), "audionotes", false, 32);
+			mapInfoLayer.registerSideWidget(recordControl, new AudioVideoNotesWidgetState(app, AV_DEFAULT_ACTION), "audionotes", false, 32);
 			mapInfoLayer.recreateControls();
 		}
 	}
@@ -2153,20 +2153,23 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 		return DashAudioVideoNotesFragment.FRAGMENT_DATA;
 	}
 
-	public class AudioVideoNotesWidgetState extends WidgetState {
+	public static class AudioVideoNotesWidgetState extends WidgetState {
+
+		private final CommonPreference<Integer> defaultActionSetting;
 
 		private static final int AV_WIDGET_STATE_ASK = R.id.av_notes_widget_state_ask;
 		private static final int AV_WIDGET_STATE_AUDIO = R.id.av_notes_widget_state_audio;
 		private static final int AV_WIDGET_STATE_VIDEO = R.id.av_notes_widget_state_video;
 		private static final int AV_WIDGET_STATE_PHOTO = R.id.av_notes_widget_state_photo;
 
-		AudioVideoNotesWidgetState(OsmandApplication ctx) {
+		AudioVideoNotesWidgetState(OsmandApplication ctx, CommonPreference<Integer> defaultActionSetting) {
 			super(ctx);
+			this.defaultActionSetting = defaultActionSetting;
 		}
 
 		@Override
 		public int getMenuTitleId() {
-			Integer action = AV_DEFAULT_ACTION.get();
+			Integer action = defaultActionSetting.get();
 			switch (action) {
 				case AV_DEFAULT_ACTION_AUDIO:
 					return R.string.av_def_action_audio;
@@ -2181,7 +2184,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 		@Override
 		public int getMenuIconId() {
-			Integer action = AV_DEFAULT_ACTION.get();
+			Integer action = defaultActionSetting.get();
 			switch (action) {
 				case AV_DEFAULT_ACTION_AUDIO:
 					return R.drawable.ic_action_micro_dark;
@@ -2196,7 +2199,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 		@Override
 		public int getMenuItemId() {
-			Integer action = AV_DEFAULT_ACTION.get();
+			Integer action = defaultActionSetting.get();
 			switch (action) {
 				case AV_DEFAULT_ACTION_AUDIO:
 					return AV_WIDGET_STATE_AUDIO;
@@ -2226,19 +2229,14 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 
 		@Override
 		public void changeState(int stateId) {
-			switch (stateId) {
+			if (stateId == AV_WIDGET_STATE_AUDIO) {
-				case AV_WIDGET_STATE_AUDIO:
+				defaultActionSetting.set(AV_DEFAULT_ACTION_AUDIO);
-					AV_DEFAULT_ACTION.set(AV_DEFAULT_ACTION_AUDIO);
+			} else if (stateId == AV_WIDGET_STATE_VIDEO) {
-					break;
+				defaultActionSetting.set(AV_DEFAULT_ACTION_VIDEO);
-				case AV_WIDGET_STATE_VIDEO:
+			} else if (stateId == AV_WIDGET_STATE_PHOTO) {
-					AV_DEFAULT_ACTION.set(AV_DEFAULT_ACTION_VIDEO);
+				defaultActionSetting.set(AV_DEFAULT_ACTION_TAKEPICTURE);
-					break;
+			} else {
-				case AV_WIDGET_STATE_PHOTO:
+				defaultActionSetting.set(AV_DEFAULT_ACTION_CHOOSE);
-					AV_DEFAULT_ACTION.set(AV_DEFAULT_ACTION_TAKEPICTURE);
-					break;
-				default:
-					AV_DEFAULT_ACTION.set(AV_DEFAULT_ACTION_CHOOSE);
-					break;
 			}
 		}
 	}

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

@@ -46,7 +46,7 @@ import net.osmand.plus.mapcontextmenu.builders.cards.ImageCard;
 import net.osmand.plus.mapcontextmenu.builders.cards.ImageCard.GetImageCardsTask;
 import net.osmand.plus.mapcontextmenu.builders.cards.NoImagesCard;
 import net.osmand.plus.mapcontextmenu.controllers.TransportStopController;
-import net.osmand.plus.openplacereviews.OprStartFragment;
+import net.osmand.plus.openplacereviews.AddPhotosBottomSheetDialogFragment;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.transport.TransportStopRoute;
@@ -316,7 +316,7 @@ public class MenuBuilder {
 		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				OprStartFragment.showInstance(mapActivity.getSupportFragmentManager());
+				AddPhotosBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager());
 			}
 		});
 		b.setTypeface(FontCache.getRobotoRegular(context));
@@ -337,7 +337,7 @@ public class MenuBuilder {
 		b.setText(context.getResources().getString(R.string.shared_string_add_photo));
 		b.setBackgroundResource(R.drawable.btn_border_light);
 		//TODO This feature is under development
-		b.setVisibility(View.GONE);
+		b.setVisibility(View.VISIBLE);
 		b.setTextColor(ContextCompat.getColor(context, R.color.preference_category_title));
 		return b;
 	}

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

@@ -32,11 +32,11 @@ import net.osmand.plus.R;
 import net.osmand.plus.Version;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.mapcontextmenu.CollapsableView;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.poi.PoiUIFilter;
-import net.osmand.plus.helpers.enums.MetricsConstants;
 import net.osmand.plus.views.layers.POIMapLayer;
 import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.plus.widgets.tools.ClickableSpanTouchListener;
@@ -344,12 +344,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
 
 		boolean osmEditingEnabled = OsmandPlugin.getEnabledPlugin(OsmEditingPlugin.class) != null;
 
-		for (Map.Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) {
+		for (String key : amenity.getAdditionalInfoKeys()) {
 			int iconId = 0;
 			Drawable icon = null;
 			int textColor = 0;
-			String key = e.getKey();
+			String vl = amenity.getAdditionalInfo(key);
-			String vl = e.getValue();
 
 			if (key.equals("image")
 					|| key.equals("mapillary")
@@ -460,7 +459,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 				isCuisine = true;
 				iconId = R.drawable.ic_action_cuisine;
 				StringBuilder sb = new StringBuilder();
-				for (String c : e.getValue().split(";")) {
+				for (String c : vl.split(";")) {
 					if (sb.length() > 0) {
 						sb.append(", ");
 						sb.append(poiTypes.getPoiTranslation("cuisine_" + c).toLowerCase());
@@ -502,7 +501,6 @@ public class AmenityMenuBuilder extends MenuBuilder {
 						isText = true;
 						isDescription = iconId == R.drawable.ic_action_note_dark;
 						textPrefix = pType.getTranslation();
-						vl = amenity.unzipContent(e.getValue());
 						if (needIntFormatting) {
 							vl = getFormattedInt(vl);
 						}
@@ -519,8 +517,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 				} else if (poiType != null) {
 					collectedPoiTypes.add(poiType);
 				} else {
-					textPrefix = Algorithms.capitalizeFirstLetterAndLowercase(e.getKey());
+					textPrefix = Algorithms.capitalizeFirstLetterAndLowercase(key);
-					vl = amenity.unzipContent(e.getValue());
 				}
 			}
 
@@ -782,11 +779,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
 	@Override
 	protected Map<String, String> getAdditionalCardParams() {
 		Map<String, String> params = new HashMap<>();
-		Map<String, String> additionalInfo = amenity.getAdditionalInfo();
+		String imageValue = amenity.getAdditionalInfo("image");
-		String imageValue = additionalInfo.get("image");
+		String mapillaryValue = amenity.getAdditionalInfo("mapillary");
-		String mapillaryValue = additionalInfo.get("mapillary");
+		String wikidataValue = amenity.getAdditionalInfo(Amenity.WIKIDATA);
-		String wikidataValue = additionalInfo.get(Amenity.WIKIDATA);
+		String wikimediaValue = amenity.getAdditionalInfo(Amenity.WIKIMEDIA_COMMONS);
-		String wikimediaValue = additionalInfo.get(Amenity.WIKIMEDIA_COMMONS);
 		if (!Algorithms.isEmpty(imageValue)) {
 			params.put("osm_image", imageValue);
 		}

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

@@ -12,13 +12,13 @@ import net.osmand.data.TransportStop;
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiFilter;
 import net.osmand.osm.PoiType;
-import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.plus.mapcontextmenu.builders.AmenityMenuBuilder;
+import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.render.RenderingIcons;
 import net.osmand.plus.transport.TransportStopRoute;
 import net.osmand.plus.wikipedia.WikipediaDialogFragment;
@@ -26,7 +26,6 @@ import net.osmand.util.Algorithms;
 import net.osmand.util.OpeningHoursParser;
 
 import java.util.List;
-import java.util.Map;
 
 public class AmenityMenuController extends MenuController {
 
@@ -160,12 +159,9 @@ public class AmenityMenuController extends MenuController {
 		String preferredLang = OsmandPlugin.onGetMapObjectPreferredLang(amenity,
 				getPreferredMapAppLang(), getPreferredMapLang());
 		String name = amenity.getName(preferredLang, isTransliterateNames());
-		Map<String, String> additionalInfo = amenity.getAdditionalInfo();
+		String ref = amenity.getAdditionalInfo("ref");
-		if (additionalInfo != null) {
+		if (!TextUtils.isEmpty(ref) && !ref.equals(name)) {
-			String ref = additionalInfo.get("ref");
+			return name + " (" + ref + ")";
-			if (!TextUtils.isEmpty(ref) && !ref.equals(name)) {
-				return name + " (" + ref + ")";
-			}
 		}
 		if (Algorithms.isEmpty(name) && amenity.getSubType().equalsIgnoreCase("atm")) {
 			String operator = amenity.getAdditionalInfo("operator");
@@ -247,12 +243,9 @@ public class AmenityMenuController extends MenuController {
 
 	@Override
 	public Drawable getRightIcon() {
-		Map<String, String> addTypes = amenity.getAdditionalInfo();
+		String region = amenity.getAdditionalInfo("subway_region");
-		if (addTypes != null) {
+		if (region != null) {
-			String region = addTypes.get("subway_region");
+			return RenderingIcons.getBigIcon(getMapActivity(), "subway_" + region);
-			if (region != null) {
-				return RenderingIcons.getBigIcon(getMapActivity(), "subway_" + region);
-			}
 		}
 		return null;
 	}

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

@@ -1083,6 +1083,7 @@ public class MapMarkersHelper {
 			String creationDateStr = point.getExtensionsToRead().get(CREATION_DATE);
 			marker.visitedDate = parseTime(visitedDateStr, format);
 			marker.creationDate = parseTime(creationDateStr, format);
+			marker.history = history;
 			marker.nextKey = history ? MapMarkersDbHelper.HISTORY_NEXT_VALUE : MapMarkersDbHelper.TAIL_NEXT_VALUE;
 
 			mapMarkers.add(marker);

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

@@ -722,7 +722,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
 			if (editingCtx.getPointsCount() > 0) {
-				if (editingCtx.isNewData() || isInEditMode()) {
+				if (editingCtx.isNewData()) {
 					if (showDialog) {
 						openSaveAsNewTrackMenu(mapActivity);
 					} else {

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

@@ -60,6 +60,8 @@ public class FavoritesActivity extends TabActivity {
 	private int tabSize;
 	private ImportHelper importHelper;
 
+	private ViewPager viewPager;
+
 	private Bundle intentParams = null;
 
 	@Override
@@ -80,7 +82,7 @@ public class FavoritesActivity extends TabActivity {
 		List<TabItem> mTabs = getTabItems();
 		setTabs(mTabs);
 
-		ViewPager mViewPager = (ViewPager) findViewById(R.id.pager);
+		viewPager = findViewById(R.id.pager);
 		if (savedInstanceState == null) {
 			Intent intent = getIntent();
 			if (intent != null && intent.hasExtra(MapActivity.INTENT_PARAMS)) {
@@ -93,7 +95,7 @@ public class FavoritesActivity extends TabActivity {
 						break;
 					}
 				}
-				mViewPager.setCurrentItem(pagerItem, false);
+				viewPager.setCurrentItem(pagerItem, false);
 			}
 		}
 	}
@@ -191,6 +193,17 @@ public class FavoritesActivity extends TabActivity {
 		return mTabs;
 	}
 
+	public Bundle storeCurrentState() {
+		int currentItem = viewPager.getCurrentItem();
+		if (currentItem >= 0 && currentItem < fragList.size()) {
+			FavoritesFragmentStateHolder stateHolder = fragList.get(currentItem).get();
+			if (stateHolder != null) {
+				return stateHolder.storeState();
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public void onAttachFragment(Fragment fragment) {
 		if (fragment instanceof FavoritesFragmentStateHolder) {

OsmAnd/src/net/osmand/plus/openplacereviews/AddPhotosBottomSheetDialogFragment.java

@@ -0,0 +1,143 @@
+package net.osmand.plus.openplacereviews;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
+import net.osmand.PlatformUtil;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.UiUtilities.DialogButtonType;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
+import net.osmand.plus.helpers.FontCache;
+import net.osmand.plus.mapillary.MapillaryPlugin;
+import net.osmand.plus.widgets.style.CustomTypefaceSpan;
+
+import org.apache.commons.logging.Log;
+
+public class AddPhotosBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = AddPhotosBottomSheetDialogFragment.class.getSimpleName();
+	private static final Log LOG = PlatformUtil.getLog(AddPhotosBottomSheetDialogFragment.class);
+
+	public static final String OPEN_PLACE_REVIEWS = "OpenPlaceReviews";
+	public static final String MAPILLARY = "Mapillary";
+	public static final String WEB_WIKIMEDIA = "Web / Wikimedia";
+	public static final String OPEN_STREET_MAP = "OpenStreetMap";
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+
+		OsmandApplication app = getMyApplication();
+		if (app == null) {
+			return;
+		}
+		View view = View.inflate(UiUtilities.getThemedContext(app, nightMode),
+				R.layout.opr_add_photo, null);
+		setDescriptionSpan(view);
+		items.add(new SimpleBottomSheetItem.Builder()
+				.setCustomView(view)
+				.create());
+		items.add(new DividerSpaceItem(app, app.getResources().getDimensionPixelSize(R.dimen.text_margin_small)));
+	}
+
+	private void setDescriptionSpan(View view) {
+		String desc = requireContext().getString(R.string.add_photos_descr);
+		BoldSpannableString ss = new BoldSpannableString(desc, view.getContext());
+		ss.setBold(OPEN_PLACE_REVIEWS);
+		ss.setBold(MAPILLARY);
+		ss.setBold(WEB_WIKIMEDIA);
+		ss.setBold(OPEN_STREET_MAP);
+		view.<TextView>findViewById(R.id.add_photos_descr).setText(ss);
+	}
+
+	static class BoldSpannableString extends SpannableString {
+		Context ctx;
+
+		public BoldSpannableString(CharSequence source, Context ctx) {
+			super(source);
+			this.ctx = ctx;
+		}
+
+		public void setBold(String boldText) {
+			String source = toString();
+			setSpan(new CustomTypefaceSpan(FontCache.getRobotoMedium(ctx)),
+					source.indexOf(boldText), source.indexOf(boldText) + boldText.length(),
+					Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+		}
+	}
+
+	@Override
+	protected int getThirdBottomButtonTextId() {
+		return R.string.add_to_opr;
+	}
+
+	@Override
+	protected DialogButtonType getThirdBottomButtonType() {
+		return DialogButtonType.SECONDARY;
+	}
+
+	@Override
+	protected int getFirstDividerHeight() {
+		return getResources().getDimensionPixelSize(R.dimen.bottom_sheet_button_divider_height);
+	}
+
+	@Override
+	protected void onThirdBottomButtonClick() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			OprStartFragment.showInstance(activity.getSupportFragmentManager());
+		}
+		dismiss();
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.add_to_mapillary;
+	}
+
+	@Override
+	protected DialogButtonType getRightBottomButtonType() {
+		return DialogButtonType.SECONDARY;
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		FragmentActivity activity = getActivity();
+		if (activity != null) {
+			MapillaryPlugin.openMapillary(activity, null);
+		}
+		dismiss();
+	}
+
+	@Override
+	protected int getSecondDividerHeight() {
+		return getResources().getDimensionPixelSize(R.dimen.content_padding_small);
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_cancel;
+	}
+
+	public static void showInstance(@NonNull FragmentManager fm) {
+		try {
+			if (!fm.isStateSaved()) {
+				AddPhotosBottomSheetDialogFragment fragment = new AddPhotosBottomSheetDialogFragment();
+				fragment.show(fm, TAG);
+			}
+		} catch (RuntimeException e) {
+			LOG.error("showInstance", e);
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/openplacereviews/OprStartFragment.java

@@ -1,6 +1,7 @@
 package net.osmand.plus.openplacereviews;
 
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -11,23 +12,41 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
+
 import net.osmand.PlatformUtil;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.BaseOsmAndFragment;
+
 import org.apache.commons.logging.Log;
 
 public class OprStartFragment extends BaseOsmAndFragment {
-	private static final String TAG = "fragment_oprstart";
+	private static final String TAG = OprStartFragment.class.getSimpleName();
 	private static final Log LOG = PlatformUtil.getLog(OprStartFragment.class);
 	private static final String openPlaceReviewsUrl = "OpenPlaceReviews.org";
 
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+		boolean nightMode = getMyApplication().getDaynightHelper().isNightModeForMapControls();
 		View v = inflater.inflate(R.layout.fragment_opr_login, container, false);
-		v.findViewById(R.id.register_opr_create_account).setOnClickListener(new View.OnClickListener() {
+		View createAccount = v.findViewById(R.id.register_opr_create_account);
+		v.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				FragmentActivity activity = getActivity();
+				if (activity != null) {
+					activity.getSupportFragmentManager().popBackStack();
+				}
+			}
+		});
+		UiUtilities.setupDialogButton(nightMode, createAccount, UiUtilities.DialogButtonType.PRIMARY,
+				R.string.register_opr_create_new_account);
+		createAccount.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				Intent i = new Intent(requireContext(), OPRWebviewActivity.class);
@@ -36,13 +55,10 @@ public class OprStartFragment extends BaseOsmAndFragment {
 				startActivity(i);
 			}
 		});
-		v.findViewById(R.id.back_button).setOnClickListener(new View.OnClickListener() {
+		View haveAccount = v.findViewById(R.id.register_opr_have_account);
-			@Override
+		UiUtilities.setupDialogButton(nightMode, haveAccount, UiUtilities.DialogButtonType.SECONDARY,
-			public void onClick(View view) {
+				R.string.register_opr_have_account);
-				getActivity().getSupportFragmentManager().popBackStack();
+		haveAccount.setOnClickListener(new View.OnClickListener() {
-			}
-		});
-		v.findViewById(R.id.register_opr_have_account).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
 				Intent i = new Intent(requireContext(), OPRWebviewActivity.class);
@@ -71,9 +87,10 @@ public class OprStartFragment extends BaseOsmAndFragment {
 		}
 
 		@Override
-		public void updateDrawState(TextPaint ds) {
+		public void updateDrawState(@NonNull TextPaint ds) {
 			super.updateDrawState(ds);
 			ds.setUnderlineText(false);
+			ds.setTypeface(Typeface.DEFAULT_BOLD);
 		}
 	}
 

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

@@ -21,7 +21,6 @@ import org.apache.commons.logging.Log;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import static net.osmand.osm.edit.Entity.POI_TYPE_TAG;
@@ -136,12 +135,12 @@ public class OpenstreetmapLocalUtil implements OpenstreetmapUtil {
 			if (!Algorithms.isEmpty(amenity.getOpeningHours())) {
 				entity.putTagNoLC(OSMTagKey.OPENING_HOURS.getValue(), amenity.getOpeningHours());
 			}
-			for (Map.Entry<String, String> entry : amenity.getAdditionalInfo().entrySet()) {
+			for (String key : amenity.getAdditionalInfoKeys()) {
-				AbstractPoiType abstractPoi = MapPoiTypes.getDefault().getAnyPoiAdditionalTypeByKey(entry.getKey());
+				AbstractPoiType abstractPoi = MapPoiTypes.getDefault().getAnyPoiAdditionalTypeByKey(key);
-				if (abstractPoi != null && abstractPoi instanceof PoiType) {
+				if (abstractPoi instanceof PoiType) {
 					PoiType p = (PoiType) abstractPoi;
 					if (!p.isNotEditableOsm() && !Algorithms.isEmpty(p.getEditOsmTag())) {
-						entity.putTagNoLC(p.getEditOsmTag(), entry.getValue());
+						entity.putTagNoLC(p.getEditOsmTag(), amenity.getAdditionalInfo(key));
 					}
 				}
 			}

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

@@ -9,6 +9,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.activity.OnBackPressedCallback;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
@@ -50,6 +52,17 @@ public class OsmEditingFragment extends BaseSettingsFragment implements OnPrefer
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		authorizationAdapter = app.getOsmOAuthHelper().getAuthorizationAdapter();
+
+		FragmentActivity activity = requireMyActivity();
+		activity.getOnBackPressedDispatcher().addCallback(this, new OnBackPressedCallback(true) {
+			public void handleOnBackPressed() {
+				MapActivity mapActivity = getMapActivity();
+				if (mapActivity != null) {
+					mapActivity.launchPrevActivityIntent();
+				}
+				dismiss();
+			}
+		});
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendGpxBottomSheetFragment.java

@@ -1,10 +1,16 @@
 package net.osmand.plus.osmedit.dialogs;
 
+import android.graphics.Rect;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -21,21 +27,26 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.UiUtilities.DialogButtonType;
+import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.MenuBottomSheetDialogFragment;
 import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionAdapterListener;
 import net.osmand.plus.mapcontextmenu.other.HorizontalSelectionAdapter.HorizontalSelectionItem;
 import net.osmand.plus.myplaces.AvailableGPXFragment.GpxInfo;
+import net.osmand.plus.myplaces.FavoritesActivity;
 import net.osmand.plus.osmedit.OsmEditingPlugin;
 import net.osmand.plus.osmedit.OsmEditingPlugin.UploadVisibility;
 import net.osmand.plus.osmedit.UploadGPXFilesTask;
 import net.osmand.plus.settings.backend.OsmandSettings;
+import net.osmand.plus.settings.fragments.BaseSettingsFragment;
 import net.osmand.util.Algorithms;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.osmand.plus.settings.fragments.BaseSettingsFragment.SettingsScreenType.OPEN_STREET_MAP_EDITING;
+
 public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
 	public static final String TAG = SendGpxBottomSheetFragment.class.getSimpleName();
@@ -45,6 +56,7 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
 	private TextInputEditText tagsField;
 	private TextInputEditText messageField;
+	private int contentHeightPrevious = 0;
 
 	public void setGpxInfos(GpxInfo[] gpxInfos) {
 		this.gpxInfos = gpxInfos;
@@ -57,6 +69,7 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
 		LayoutInflater themedInflater = UiUtilities.getInflater(app, nightMode);
 		View sendOsmPoiView = themedInflater.inflate(R.layout.send_gpx_fragment, null);
+		sendOsmPoiView.getViewTreeObserver().addOnGlobalLayoutListener(getOnGlobalLayoutListener());
 
 		tagsField = sendOsmPoiView.findViewById(R.id.tags_field);
 		messageField = sendOsmPoiView.findViewById(R.id.message_field);
@@ -95,9 +108,18 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 				visibilityDescription.setText(selectedUploadVisibility.getDescriptionId());
 				horizontalSelectionAdapter.notifyDataSetChanged();
 			}
-
 		});
-
+		LinearLayout account = sendOsmPoiView.findViewById(R.id.account_container);
+		account.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				FragmentActivity activity = getActivity();
+				if (activity != null) {
+					showOpenStreetMapScreen(activity);
+				}
+				dismiss();
+			}
+		});
 		RecyclerView iconCategoriesRecyclerView = sendOsmPoiView.findViewById(R.id.description_view);
 		iconCategoriesRecyclerView.setAdapter(horizontalSelectionAdapter);
 		iconCategoriesRecyclerView.setLayoutManager(new LinearLayoutManager(app, RecyclerView.HORIZONTAL, false));
@@ -109,6 +131,53 @@ public class SendGpxBottomSheetFragment extends MenuBottomSheetDialogFragment {
 		items.add(titleItem);
 	}
 
+	private ViewTreeObserver.OnGlobalLayoutListener getOnGlobalLayoutListener() {
+		return new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				Rect visibleDisplayFrame = new Rect();
+				int buttonsHeight = getResources().getDimensionPixelSize(R.dimen.dialog_button_ex_max_width);
+				int shadowHeight = getResources().getDimensionPixelSize(R.dimen.bottom_sheet_top_shadow_height);
+				final ScrollView scrollView = getView().findViewById(R.id.scroll_view);
+				scrollView.getWindowVisibleDisplayFrame(visibleDisplayFrame);
+				int height = scrollView.getHeight();
+				int contentHeight = visibleDisplayFrame.bottom - visibleDisplayFrame.top - buttonsHeight;
+				if (contentHeightPrevious != contentHeight || contentHeight < height) {
+					if (scrollView.getHeight() + shadowHeight > contentHeight) {
+						scrollView.getLayoutParams().height = contentHeight;
+					} else {
+						scrollView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+					}
+					scrollView.requestLayout();
+					int delay = Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP ? 300 : 1000;
+					scrollView.postDelayed(new Runnable() {
+						public void run() {
+							scrollView.scrollTo(0, scrollView.getHeight());
+						}
+					}, delay);
+					contentHeightPrevious = contentHeight;
+				}
+			}
+		};
+	}
+
+	protected static void showOpenStreetMapScreen(@NonNull FragmentActivity activity) {
+		if (activity instanceof MapActivity) {
+			BaseSettingsFragment.showInstance(activity, OPEN_STREET_MAP_EDITING);
+		} else {
+			Bundle prevIntentParams = null;
+			if (activity instanceof FavoritesActivity) {
+				prevIntentParams = ((FavoritesActivity) activity).storeCurrentState();
+			} else if (activity.getIntent() != null) {
+				prevIntentParams = activity.getIntent().getExtras();
+			}
+			Bundle params = new Bundle();
+			params.putString(BaseSettingsFragment.OPEN_SETTINGS, OPEN_STREET_MAP_EDITING.name());
+
+			MapActivity.launchMapActivityMoveToTop(activity, prevIntentParams, null, params);
+		}
+	}
+
 	@Override
 	protected DialogButtonType getRightBottomButtonType() {
 		return DialogButtonType.PRIMARY;

OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendOsmNoteBottomSheetFragment.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import com.google.android.material.textfield.TextInputLayout;
@@ -40,6 +41,7 @@ import org.apache.commons.logging.Log;
 import static net.osmand.plus.UiUtilities.setupDialogButton;
 import static net.osmand.plus.osmedit.OsmEditingFragment.OSM_LOGIN_DATA;
 import static net.osmand.plus.osmedit.ValidateOsmLoginDetailsTask.ValidateOsmLoginListener;
+import static net.osmand.plus.osmedit.dialogs.SendGpxBottomSheetFragment.showOpenStreetMapScreen;
 import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.OPENSTREETMAP_POINT;
 import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.ProgressDialogPoiUploader;
 import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.SimpleProgressDialogPoiUploader;
@@ -129,6 +131,17 @@ public class SendOsmNoteBottomSheetFragment extends MenuBottomSheetDialogFragmen
 				uploadAnonymously.setPadding(paddingSmall, 0, paddingSmall, 0);
 			}
 		});
+		LinearLayout account = accountBlockView.findViewById(R.id.account_container);
+		account.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				FragmentActivity activity = getActivity();
+				if (activity != null) {
+					showOpenStreetMapScreen(activity);
+				}
+				dismiss();
+			}
+		});
 		final SimpleBottomSheetItem bottomSheetItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
 				.setCustomView(sendOsmNoteView)
 				.create();

OsmAnd/src/net/osmand/plus/osmedit/dialogs/SendPoiBottomSheetFragment.java

@@ -6,10 +6,12 @@ import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.PlatformUtil;
@@ -31,7 +33,10 @@ import org.apache.commons.logging.Log;
 import java.util.HashMap;
 import java.util.Map;
 
-import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.*;
+import static net.osmand.plus.osmedit.dialogs.SendGpxBottomSheetFragment.showOpenStreetMapScreen;
+import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.OPENSTREETMAP_POINT;
+import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.ProgressDialogPoiUploader;
+import static net.osmand.plus.osmedit.dialogs.SendPoiDialogFragment.SimpleProgressDialogPoiUploader;
 
 public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
 
@@ -84,6 +89,17 @@ public class SendPoiBottomSheetFragment extends MenuBottomSheetDialogFragment {
                 closeChangeSet.setPadding(paddingSmall, 0, paddingSmall, 0);
             }
         });
+        LinearLayout account = sendOsmPoiView.findViewById(R.id.account_container);
+        account.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentActivity activity = getActivity();
+                if (activity != null) {
+                    showOpenStreetMapScreen(activity);
+                }
+                dismiss();
+            }
+        });
         final SimpleBottomSheetItem titleItem = (SimpleBottomSheetItem) new SimpleBottomSheetItem.Builder()
                 .setCustomView(sendOsmPoiView)
                 .create();

OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java

@@ -259,6 +259,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 							 Bundle savedInstanceState) {
 		final MapActivity mapActivity = getMapActivity();
+		final UiUtilities iconsCache = app.getUIUtilities();
 		final View view = inflater.inflate(R.layout.search_dialog_fragment, container, false);
 
 		toolbarController = new QuickSearchToolbarController();
@@ -325,9 +326,9 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 
 		buttonToolbarView = view.findViewById(R.id.button_toolbar_layout);
 		buttonToolbarImage = (ImageView) view.findViewById(R.id.buttonToolbarImage);
-		buttonToolbarImage.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_marker_dark));
+		buttonToolbarImage.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_marker_dark));
 		buttonToolbarFilter = (ImageButton) view.findViewById(R.id.filterButton);
-		buttonToolbarFilter.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_filter));
+		buttonToolbarFilter.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_filter));
 		buttonToolbarFilter.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -474,7 +475,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		if (!app.getSettings().isLightContent()) {
 			toolbar.setBackgroundColor(ContextCompat.getColor(mapActivity, R.color.app_bar_color_dark));
 		}
-		Drawable icBack = app.getUIUtilities().getThemedIcon(AndroidUtils.getNavigationIconResId(app));
+		Drawable icBack = iconsCache.getThemedIcon(AndroidUtils.getNavigationIconResId(app));
 		toolbar.setNavigationIcon(icBack);
 		toolbar.setNavigationContentDescription(R.string.access_shared_string_navigate_up);
 		toolbar.setNavigationOnClickListener(
@@ -489,7 +490,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		);
 
 		toolbarEdit = (Toolbar) view.findViewById(R.id.toolbar_edit);
-		toolbarEdit.setNavigationIcon(app.getUIUtilities().getIcon(R.drawable.ic_action_remove_dark));
+		toolbarEdit.setNavigationIcon(iconsCache.getIcon(R.drawable.ic_action_remove_dark));
 		toolbarEdit.setNavigationContentDescription(R.string.shared_string_cancel);
 		toolbarEdit.setNavigationOnClickListener(
 				new OnClickListener() {
@@ -501,8 +502,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		);
 
 		titleEdit = (TextView) view.findViewById(R.id.titleEdit);
-		Drawable shareIcon = app.getUIUtilities().getIcon(R.drawable.ic_action_gshare_dark,
+		Drawable shareIcon = iconsCache.getIcon(R.drawable.ic_action_gshare_dark, R.color.color_white);
-				nightMode ? R.color.text_color_secondary_dark : R.color.text_color_secondary_light);
 		shareIcon = AndroidUtils.getDrawableForDirection(app, shareIcon);
 		ImageView shareButton = (ImageView) view.findViewById(R.id.shareButton);
 		shareButton.setImageDrawable(shareIcon);
@@ -644,7 +644,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 
 		progressBar = (ProgressBar) view.findViewById(R.id.searchProgressBar);
 		clearButton = (ImageButton) view.findViewById(R.id.clearButton);
-		clearButton.setImageDrawable(app.getUIUtilities().getThemedIcon(R.drawable.ic_action_remove_dark));
+		clearButton.setImageDrawable(iconsCache.getThemedIcon(R.drawable.ic_action_remove_dark));
 		clearButton.setOnClickListener(
 				new OnClickListener() {
 					@Override

OsmAnd/src/net/osmand/plus/search/QuickSearchHelper.java

@@ -436,7 +436,12 @@ public class QuickSearchHelper implements ResourceListener {
 				SearchResult sr = new SearchResult(phrase);
 				PointDescription pd = point.getName();
 				if (pd.isPoiType()) {
-					AbstractPoiType pt = MapPoiTypes.getDefault().getAnyPoiTypeByKey(pd.getName());
+					String name = pd.getName();
+					MapPoiTypes mapPoiTypes = MapPoiTypes.getDefault();
+					AbstractPoiType pt = mapPoiTypes.getAnyPoiTypeByKey(name);
+					if (pt == null) {
+						pt = mapPoiTypes.getAnyPoiAdditionalTypeByKey(name);
+					}
 					if (pt != null) {
 						sr.localeName = pt.getTranslation();
 						sr.object = pt;

OsmAnd/src/net/osmand/plus/settings/backend/backup/CollectionSettingsItem.java

@@ -68,6 +68,10 @@ public abstract class CollectionSettingsItem<T> extends SettingsItem {
 		return res;
 	}
 
+	public boolean shouldShowDuplicates() {
+		return true;
+	}
+
 	public abstract boolean isDuplicate(@NonNull T item);
 
 	@NonNull

OsmAnd/src/net/osmand/plus/settings/backend/backup/HistoryMarkersSettingsItem.java

@@ -87,7 +87,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 			}
 
 			for (MapMarker marker : appliedItems) {
-				markersHelper.moveMapMarkerToHistory(marker);
+				markersHelper.addMarker(marker);
 			}
 		}
 	}
@@ -96,7 +96,7 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 	public boolean isDuplicate(@NonNull MapMarker mapMarker) {
 		for (MapMarker marker : existingItems) {
 			if (marker.equals(mapMarker)
-					&& Algorithms.objectEquals(marker.getOriginalPointDescription(), mapMarker.getOriginalPointDescription())) {
+					&& Algorithms.objectEquals(marker.getOnlyName(), mapMarker.getOnlyName())) {
 				return true;
 			}
 		}
@@ -114,10 +114,13 @@ public class HistoryMarkersSettingsItem extends CollectionSettingsItem<MapMarker
 		int number = 0;
 		while (true) {
 			number++;
-			String name = item.getOnlyName() + "_" + number;
+			String name = item.getOnlyName() + " " + number;
 			PointDescription description = new PointDescription(PointDescription.POINT_TYPE_LOCATION, name);
-			MapMarker renamedMarker = new MapMarker(item.point, description, item.getColor(), item.selected, item.index);
+			MapMarker renamedMarker = new MapMarker(item.point, description, item.colorIndex, item.selected, item.index);
 			if (!isDuplicate(renamedMarker)) {
+				renamedMarker.history = true;
+				renamedMarker.visitedDate = item.visitedDate;
+				renamedMarker.creationDate = item.creationDate;
 				renamedMarker.nextKey = MapMarkersDbHelper.HISTORY_NEXT_VALUE;
 				return renamedMarker;
 			}

OsmAnd/src/net/osmand/plus/settings/backend/backup/MarkersSettingsItem.java

@@ -96,7 +96,7 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
 	public boolean isDuplicate(@NonNull MapMarker mapMarker) {
 		for (MapMarker marker : existingItems) {
 			if (marker.equals(mapMarker)
-					&& Algorithms.objectEquals(marker.getOriginalPointDescription(), mapMarker.getOriginalPointDescription())) {
+					&& Algorithms.objectEquals(marker.getOnlyName(), mapMarker.getOnlyName())) {
 				return true;
 			}
 		}
@@ -114,10 +114,13 @@ public class MarkersSettingsItem extends CollectionSettingsItem<MapMarker> {
 		int number = 0;
 		while (true) {
 			number++;
-			String name = item.getOnlyName() + "_" + number;
+			String name = item.getOnlyName() + " " + number;
 			PointDescription description = new PointDescription(PointDescription.POINT_TYPE_LOCATION, name);
-			MapMarker renamedMarker = new MapMarker(item.point, description, item.getColor(), item.selected, item.index);
+			MapMarker renamedMarker = new MapMarker(item.point, description, item.colorIndex, item.selected, item.index);
 			if (!isDuplicate(renamedMarker)) {
+				renamedMarker.history = false;
+				renamedMarker.visitedDate = item.visitedDate;
+				renamedMarker.creationDate = item.creationDate;
 				renamedMarker.nextKey = MapMarkersDbHelper.TAIL_NEXT_VALUE;
 				return renamedMarker;
 			}

OsmAnd/src/net/osmand/plus/settings/backend/backup/SearchHistorySettingsItem.java

@@ -143,6 +143,11 @@ public class SearchHistorySettingsItem extends CollectionSettingsItem<HistoryEnt
 		return false;
 	}
 
+	@Override
+	public boolean shouldShowDuplicates() {
+		return false;
+	}
+
 	@Override
 	public boolean shouldReadOnCollecting() {
 		return true;

OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java

@@ -43,7 +43,7 @@ import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
 import net.osmand.plus.settings.backend.ExportSettingsCategory;
 import net.osmand.plus.settings.backend.ExportSettingsType;
-import net.osmand.plus.settings.fragments.ExportDataObject;
+import net.osmand.plus.settings.fragments.SettingsCategoryItems;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -431,8 +431,9 @@ public class SettingsHelper {
 						duplicateItems.add(((ProfileSettingsItem) item).getModeBean());
 					}
 				} else if (item instanceof CollectionSettingsItem<?>) {
-					List<?> duplicates = ((CollectionSettingsItem<?>) item).processDuplicateItems();
+					CollectionSettingsItem settingsItem = (CollectionSettingsItem) item;
-					if (!duplicates.isEmpty()) {
+					List<?> duplicates = settingsItem.processDuplicateItems();
+					if (!duplicates.isEmpty() && settingsItem.shouldShowDuplicates()) {
 						duplicateItems.addAll(duplicates);
 					}
 				} else if (item instanceof FileSettingsItem) {
@@ -471,13 +472,11 @@ public class SettingsHelper {
 	}
 
 	public List<SettingsItem> getFilteredSettingsItems(List<ExportSettingsType> settingsTypes, boolean globalExport) {
-		Map<ExportSettingsCategory, List<ExportDataObject>> dataList = getAdditionalData(globalExport);
 		Map<ExportSettingsType, List<?>> typesMap = new HashMap<>();
-		for (List<ExportDataObject> objects : dataList.values()) {
+		typesMap.putAll(getSettingsItems(globalExport));
-			for (ExportDataObject exportObject : objects) {
+		typesMap.putAll(getMyPlacesItems());
-				typesMap.put(exportObject.getType(), exportObject.getItems());
+		typesMap.putAll(getResourcesItems());
-			}
+
-		}
 		return getFilteredSettingsItems(typesMap, settingsTypes);
 	}
 
@@ -498,67 +497,64 @@ public class SettingsHelper {
 		return settingsItems;
 	}
 
-	public Map<ExportSettingsCategory, List<ExportDataObject>> getAdditionalData(boolean globalExport) {
+	public Map<ExportSettingsCategory, SettingsCategoryItems> getAdditionalData(boolean globalExport) {
-		Map<ExportSettingsCategory, List<ExportDataObject>> dataList = new LinkedHashMap<>();
+		Map<ExportSettingsCategory, SettingsCategoryItems> dataList = new LinkedHashMap<>();
 
-		List<ExportDataObject> settingsItems = getSettingsItems(globalExport);
+		Map<ExportSettingsType, List<?>> settingsItems = getSettingsItems(globalExport);
-		List<ExportDataObject> myPlacesItems = getMyPlacesItems();
+		Map<ExportSettingsType, List<?>> myPlacesItems = getMyPlacesItems();
-		List<ExportDataObject> resourcesItems = getResourcesItems();
+		Map<ExportSettingsType, List<?>> resourcesItems = getResourcesItems();
 
 		if (!settingsItems.isEmpty()) {
-			sortExportSettingsObjects(settingsItems);
+			dataList.put(ExportSettingsCategory.SETTINGS, new SettingsCategoryItems(settingsItems));
-			dataList.put(ExportSettingsCategory.SETTINGS, settingsItems);
 		}
 		if (!myPlacesItems.isEmpty()) {
-			sortExportSettingsObjects(myPlacesItems);
+			dataList.put(ExportSettingsCategory.MY_PLACES, new SettingsCategoryItems(myPlacesItems));
-			dataList.put(ExportSettingsCategory.MY_PLACES, myPlacesItems);
 		}
 		if (!resourcesItems.isEmpty()) {
-			sortExportSettingsObjects(resourcesItems);
+			dataList.put(ExportSettingsCategory.RESOURCES, new SettingsCategoryItems(resourcesItems));
-			dataList.put(ExportSettingsCategory.RESOURCES, resourcesItems);
 		}
 
 		return dataList;
 	}
 
-	private List<ExportDataObject> getSettingsItems(boolean globalExport) {
+	private Map<ExportSettingsType, List<?>> getSettingsItems(boolean globalExport) {
-		List<ExportDataObject> settingsItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> settingsItems = new LinkedHashMap<>();
 
 		if (globalExport) {
 			List<ApplicationModeBean> appModeBeans = new ArrayList<>();
 			for (ApplicationMode mode : ApplicationMode.allPossibleValues()) {
 				appModeBeans.add(mode.toModeBean());
 			}
-			settingsItems.add(new ExportDataObject(ExportSettingsType.PROFILE, appModeBeans));
+			settingsItems.put(ExportSettingsType.PROFILE, appModeBeans);
 		}
-		settingsItems.add(new ExportDataObject(ExportSettingsType.GLOBAL, Collections.singletonList(new GlobalSettingsItem(app.getSettings()))));
+		settingsItems.put(ExportSettingsType.GLOBAL, Collections.singletonList(new GlobalSettingsItem(app.getSettings())));
 
 		QuickActionRegistry registry = app.getQuickActionRegistry();
 		List<QuickAction> actionsList = registry.getQuickActions();
 		if (!actionsList.isEmpty()) {
-			settingsItems.add(new ExportDataObject(ExportSettingsType.QUICK_ACTIONS, actionsList));
+			settingsItems.put(ExportSettingsType.QUICK_ACTIONS, actionsList);
 		}
 		List<PoiUIFilter> poiList = app.getPoiFilters().getUserDefinedPoiFilters(false);
 		if (!poiList.isEmpty()) {
-			settingsItems.add(new ExportDataObject(ExportSettingsType.POI_TYPES, poiList));
+			settingsItems.put(ExportSettingsType.POI_TYPES, poiList);
 		}
 		List<HistoryEntry> historyEntries = SearchHistoryHelper.getInstance(app).getHistoryEntries(false);
 		if (!historyEntries.isEmpty()) {
-			settingsItems.add(new ExportDataObject(ExportSettingsType.SEARCH_HISTORY, historyEntries));
+			settingsItems.put(ExportSettingsType.SEARCH_HISTORY, historyEntries);
 		}
 		Map<LatLon, AvoidRoadInfo> impassableRoads = app.getAvoidSpecificRoads().getImpassableRoads();
 		if (!impassableRoads.isEmpty()) {
-			settingsItems.add(new ExportDataObject(ExportSettingsType.AVOID_ROADS, new ArrayList<>(impassableRoads.values())));
+			settingsItems.put(ExportSettingsType.AVOID_ROADS, new ArrayList<>(impassableRoads.values()));
 		}
 		return settingsItems;
 	}
 
-	private List<ExportDataObject> getMyPlacesItems() {
+	private Map<ExportSettingsType, List<?>> getMyPlacesItems() {
-		List<ExportDataObject> myPlacesItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> myPlacesItems = new LinkedHashMap<>();
 
 		List<FavoriteGroup> favoriteGroups = app.getFavorites().getFavoriteGroups();
 		if (!favoriteGroups.isEmpty()) {
-			myPlacesItems.add(new ExportDataObject(ExportSettingsType.FAVORITES, favoriteGroups));
+			myPlacesItems.put(ExportSettingsType.FAVORITES, favoriteGroups);
 		}
 		File gpxDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR);
 		List<GPXInfo> gpxInfoList = GpxUiHelper.getSortedGPXFilesInfo(gpxDir, null, true);
@@ -571,18 +567,18 @@ public class SettingsHelper {
 				}
 			}
 			if (!files.isEmpty()) {
-				myPlacesItems.add(new ExportDataObject(ExportSettingsType.TRACKS, files));
+				myPlacesItems.put(ExportSettingsType.TRACKS, files);
 			}
 		}
 		OsmEditingPlugin osmEditingPlugin = OsmandPlugin.getPlugin(OsmEditingPlugin.class);
 		if (osmEditingPlugin != null) {
 			List<OsmNotesPoint> notesPointList = osmEditingPlugin.getDBBug().getOsmbugsPoints();
 			if (!notesPointList.isEmpty()) {
-				myPlacesItems.add(new ExportDataObject(ExportSettingsType.OSM_NOTES, notesPointList));
+				myPlacesItems.put(ExportSettingsType.OSM_NOTES, notesPointList);
 			}
 			List<OpenstreetmapPoint> editsPointList = osmEditingPlugin.getDBPOI().getOpenstreetmapPoints();
 			if (!editsPointList.isEmpty()) {
-				myPlacesItems.add(new ExportDataObject(ExportSettingsType.OSM_EDITS, editsPointList));
+				myPlacesItems.put(ExportSettingsType.OSM_EDITS, editsPointList);
 			}
 		}
 		AudioVideoNotesPlugin plugin = OsmandPlugin.getPlugin(AudioVideoNotesPlugin.class);
@@ -595,7 +591,7 @@ public class SettingsHelper {
 				}
 			}
 			if (!files.isEmpty()) {
-				myPlacesItems.add(new ExportDataObject(ExportSettingsType.MULTIMEDIA_NOTES, files));
+				myPlacesItems.put(ExportSettingsType.MULTIMEDIA_NOTES, files);
 			}
 		}
 		List<MapMarker> mapMarkers = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(false);
@@ -604,7 +600,7 @@ public class SettingsHelper {
 			String groupId = ExportSettingsType.ACTIVE_MARKERS.name();
 			MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 			markersGroup.setMarkers(mapMarkers);
-			myPlacesItems.add(new ExportDataObject(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup)));
+			myPlacesItems.put(ExportSettingsType.ACTIVE_MARKERS, Collections.singletonList(markersGroup));
 		}
 		List<MapMarker> markersHistory = app.getMapMarkersHelper().getMapMarkersFromDefaultGroups(true);
 		if (!markersHistory.isEmpty()) {
@@ -612,23 +608,23 @@ public class SettingsHelper {
 			String groupId = ExportSettingsType.HISTORY_MARKERS.name();
 			MapMarkersGroup markersGroup = new MapMarkersGroup(groupId, name, MapMarkersGroup.ANY_TYPE);
 			markersGroup.setMarkers(markersHistory);
-			myPlacesItems.add(new ExportDataObject(ExportSettingsType.HISTORY_MARKERS, Collections.singletonList(markersGroup)));
+			myPlacesItems.put(ExportSettingsType.HISTORY_MARKERS, Collections.singletonList(markersGroup));
 		}
 		return myPlacesItems;
 	}
 
-	private List<ExportDataObject> getResourcesItems() {
+	private Map<ExportSettingsType, List<?>> getResourcesItems() {
-		List<ExportDataObject> resourcesItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> resourcesItems = new LinkedHashMap<>();
 
 		Map<String, File> externalRenderers = app.getRendererRegistry().getExternalRenderers();
 		if (!externalRenderers.isEmpty()) {
-			resourcesItems.add(new ExportDataObject(ExportSettingsType.CUSTOM_RENDER_STYLE, new ArrayList<>(externalRenderers.values())));
+			resourcesItems.put(ExportSettingsType.CUSTOM_RENDER_STYLE, new ArrayList<>(externalRenderers.values()));
 		}
 		File routingProfilesFolder = app.getAppPath(IndexConstants.ROUTING_PROFILES_DIR);
 		if (routingProfilesFolder.exists() && routingProfilesFolder.isDirectory()) {
 			File[] fl = routingProfilesFolder.listFiles();
 			if (fl != null && fl.length > 0) {
-				resourcesItems.add(new ExportDataObject(ExportSettingsType.CUSTOM_ROUTING, Arrays.asList(fl)));
+				resourcesItems.put(ExportSettingsType.CUSTOM_ROUTING, Arrays.asList(fl));
 			}
 		}
 		List<ITileSource> iTileSources = new ArrayList<>();
@@ -648,22 +644,22 @@ public class SettingsHelper {
 			}
 		}
 		if (!iTileSources.isEmpty()) {
-			resourcesItems.add(new ExportDataObject(ExportSettingsType.MAP_SOURCES, iTileSources));
+			resourcesItems.put(ExportSettingsType.MAP_SOURCES, iTileSources);
 		}
 		List<LocalIndexInfo> localIndexInfoList = getLocalIndexData();
 		List<File> files = getFilesByType(localIndexInfoList, LocalIndexType.MAP_DATA, LocalIndexType.TILES_DATA,
 				LocalIndexType.SRTM_DATA, LocalIndexType.WIKI_DATA);
 		if (!files.isEmpty()) {
 			sortLocalFiles(files);
-			resourcesItems.add(new ExportDataObject(ExportSettingsType.OFFLINE_MAPS, files));
+			resourcesItems.put(ExportSettingsType.OFFLINE_MAPS, files);
 		}
 		files = getFilesByType(localIndexInfoList, LocalIndexType.TTS_VOICE_DATA);
 		if (!files.isEmpty()) {
-			resourcesItems.add(new ExportDataObject(ExportSettingsType.TTS_VOICE, files));
+			resourcesItems.put(ExportSettingsType.TTS_VOICE, files);
 		}
 		files = getFilesByType(localIndexInfoList, LocalIndexType.VOICE_DATA);
 		if (!files.isEmpty()) {
-			resourcesItems.add(new ExportDataObject(ExportSettingsType.VOICE, files));
+			resourcesItems.put(ExportSettingsType.VOICE, files);
 		}
 
 		return resourcesItems;
@@ -792,35 +788,32 @@ public class SettingsHelper {
 		return settingsItems;
 	}
 
-	public static Map<ExportSettingsCategory, List<ExportDataObject>> getSettingsToOperateByCategory(List<SettingsItem> items, boolean importComplete) {
+	public static Map<ExportSettingsCategory, SettingsCategoryItems> getSettingsToOperateByCategory(List<SettingsItem> items, boolean importComplete) {
-		Map<ExportSettingsCategory, List<ExportDataObject>> exportMap = new LinkedHashMap<>();
+		Map<ExportSettingsCategory, SettingsCategoryItems> exportMap = new LinkedHashMap<>();
 		Map<ExportSettingsType, List<?>> settingsToOperate = getSettingsToOperate(items, importComplete);
 
-		List<ExportDataObject> settingsItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> settingsItems = new LinkedHashMap<>();
-		List<ExportDataObject> myPlacesItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> myPlacesItems = new LinkedHashMap<>();
-		List<ExportDataObject> resourcesItems = new ArrayList<>();
+		Map<ExportSettingsType, List<?>> resourcesItems = new LinkedHashMap<>();
 
 		for (Map.Entry<ExportSettingsType, List<?>> entry : settingsToOperate.entrySet()) {
 			ExportSettingsType type = entry.getKey();
 			if (type.isSettingsCategory()) {
-				settingsItems.add(new ExportDataObject(type, entry.getValue()));
+				settingsItems.put(type, entry.getValue());
 			} else if (type.isMyPlacesCategory()) {
-				myPlacesItems.add(new ExportDataObject(type, entry.getValue()));
+				myPlacesItems.put(type, entry.getValue());
 			} else if (type.isResourcesCategory()) {
-				resourcesItems.add(new ExportDataObject(type, entry.getValue()));
+				resourcesItems.put(type, entry.getValue());
 			}
 		}
 		if (!settingsItems.isEmpty()) {
-			sortExportSettingsObjects(settingsItems);
+			exportMap.put(ExportSettingsCategory.SETTINGS, new SettingsCategoryItems(settingsItems));
-			exportMap.put(ExportSettingsCategory.SETTINGS, settingsItems);
 		}
 		if (!myPlacesItems.isEmpty()) {
-			sortExportSettingsObjects(myPlacesItems);
+			exportMap.put(ExportSettingsCategory.MY_PLACES, new SettingsCategoryItems(myPlacesItems));
-			exportMap.put(ExportSettingsCategory.MY_PLACES, myPlacesItems);
 		}
 		if (!resourcesItems.isEmpty()) {
-			sortExportSettingsObjects(resourcesItems);
+			exportMap.put(ExportSettingsCategory.RESOURCES, new SettingsCategoryItems(resourcesItems));
-			exportMap.put(ExportSettingsCategory.RESOURCES, resourcesItems);
 		}
 
 		return exportMap;
@@ -1016,15 +1009,4 @@ public class SettingsHelper {
 			}
 		});
 	}
-
-	private static void sortExportSettingsObjects(List<ExportDataObject> items) {
-		Collections.sort(items, new Comparator<ExportDataObject>() {
-			@Override
-			public int compare(ExportDataObject lhs, ExportDataObject rhs) {
-				int order1 = lhs.getType().ordinal();
-				int order2 = rhs.getType().ordinal();
-				return (order1 < order2) ? -1 : ((order1 == order2) ? 0 : 1);
-			}
-		});
-	}
 }

OsmAnd/src/net/osmand/plus/settings/fragments/DuplicatesSettingsAdapter.java

@@ -14,22 +14,22 @@ import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.map.ITileSource;
 import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
-import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
-import net.osmand.plus.helpers.FileNameTranslationHelper;
-import net.osmand.plus.helpers.GpxUiHelper;
-import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
-import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
+import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
+import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.profiles.ProfileIconColors;
 import net.osmand.plus.profiles.RoutingProfileDataObject.RoutingProfilesResources;
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.render.RenderingIcons;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -157,9 +157,9 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter<RecyclerView
 			} else if (currentItem instanceof FavoriteGroup) {
 				itemHolder.title.setText(((FavoriteGroup) currentItem).getDisplayName(app));
 				itemHolder.icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_favorite, activeColorRes));
-			} else if (currentItem instanceof MapMarkersGroup) {
+			} else if (currentItem instanceof MapMarker) {
-				MapMarkersGroup markersGroup = (MapMarkersGroup) currentItem;
+				MapMarker mapMarker = (MapMarker) currentItem;
-				itemHolder.title.setText(markersGroup.getName());
+				itemHolder.title.setText(mapMarker.getName(app));
 				itemHolder.icon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_flag, activeColorRes));
 			} else if (currentItem instanceof HistoryEntry) {
 				itemHolder.title.setText(((HistoryEntry) currentItem).getName().getName());

OsmAnd/src/net/osmand/plus/settings/fragments/ExportDataObject.java

@@ -1,26 +0,0 @@
-package net.osmand.plus.settings.fragments;
-
-import androidx.annotation.NonNull;
-
-import net.osmand.plus.settings.backend.ExportSettingsType;
-
-import java.util.List;
-
-public class ExportDataObject {
-
-	private ExportSettingsType type;
-	private List<?> items;
-
-	public ExportDataObject(@NonNull ExportSettingsType type, @NonNull List<?> items) {
-		this.type = type;
-		this.items = items;
-	}
-
-	public ExportSettingsType getType() {
-		return type;
-	}
-
-	public List<?> getItems() {
-		return items;
-	}
-}

OsmAnd/src/net/osmand/plus/settings/fragments/ExportItemsBottomSheet.java

@@ -0,0 +1,321 @@
+package net.osmand.plus.settings.fragments;
+
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.CompoundButtonCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import net.osmand.AndroidUtils;
+import net.osmand.IndexConstants;
+import net.osmand.PlatformUtil;
+import net.osmand.map.ITileSource;
+import net.osmand.map.TileSourceManager.TileSourceTemplate;
+import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
+import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.R;
+import net.osmand.plus.SQLiteTileSource;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.audionotes.AudioVideoNotesPlugin;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemWithCompoundButton.Builder;
+import net.osmand.plus.base.bottomsheetmenu.SimpleBottomSheetItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.SimpleDividerItem;
+import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
+import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.helpers.GpxUiHelper;
+import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.osmedit.OpenstreetmapPoint;
+import net.osmand.plus.osmedit.OsmEditingPlugin;
+import net.osmand.plus.osmedit.OsmNotesPoint;
+import net.osmand.plus.poi.PoiUIFilter;
+import net.osmand.plus.profiles.ProfileIconColors;
+import net.osmand.plus.profiles.RoutingProfileDataObject.RoutingProfilesResources;
+import net.osmand.plus.quickaction.QuickAction;
+import net.osmand.plus.render.RenderingIcons;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.plus.settings.backend.ApplicationMode.ApplicationModeBean;
+import net.osmand.plus.settings.backend.ExportSettingsType;
+import net.osmand.plus.settings.backend.backup.FileSettingsItem;
+import net.osmand.plus.settings.backend.backup.GlobalSettingsItem;
+import net.osmand.plus.settings.fragments.ExportSettingsAdapter.OnItemSelectedListener;
+import net.osmand.util.Algorithms;
+import net.osmand.view.ThreeStateCheckbox;
+
+import org.apache.commons.logging.Log;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.osmand.view.ThreeStateCheckbox.State.CHECKED;
+import static net.osmand.view.ThreeStateCheckbox.State.MISC;
+import static net.osmand.view.ThreeStateCheckbox.State.UNCHECKED;
+
+public class ExportItemsBottomSheet extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = ExportItemsBottomSheet.class.getSimpleName();
+	private static final Log LOG = PlatformUtil.getLog(ExportItemsBottomSheet.class);
+
+	private OsmandApplication app;
+	private UiUtilities uiUtilities;
+
+	private ExportSettingsType type;
+	private List<Object> allItems;
+	private List<Object> selectedItems = new ArrayList<>();
+
+	private TextView selectedSize;
+	private ThreeStateCheckbox checkBox;
+
+	private int activeColorRes;
+	private int secondaryColorRes;
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+		app = requiredMyApplication();
+		uiUtilities = app.getUIUtilities();
+		activeColorRes = nightMode ? R.color.icon_color_active_dark : R.color.icon_color_active_light;
+		secondaryColorRes = nightMode ? R.color.icon_color_secondary_dark : R.color.icon_color_secondary_light;
+
+		items.add(createTitleItem());
+		items.add(new SimpleDividerItem(app));
+
+		for (Object object : allItems) {
+			final BottomSheetItemWithCompoundButton[] item = new BottomSheetItemWithCompoundButton[1];
+			Builder builder = (BottomSheetItemWithCompoundButton.Builder) new Builder()
+					.setChecked(selectedItems.contains(object))
+					.setButtonTintList(AndroidUtils.createCheckedColorStateList(app, secondaryColorRes, activeColorRes))
+					.setLayoutId(R.layout.bottom_sheet_item_with_descr_and_checkbox_56dp)
+					.setOnClickListener(new View.OnClickListener() {
+						@Override
+						public void onClick(View v) {
+							boolean checked = !item[0].isChecked();
+							item[0].setChecked(checked);
+							if (checked) {
+								selectedItems.add(item[0].getTag());
+							} else {
+								selectedItems.remove(item[0].getTag());
+							}
+							updateTitleView();
+						}
+					})
+					.setTag(object);
+			setupBottomSheetItem(builder, object);
+			item[0] = (BottomSheetItemWithCompoundButton) builder.create();
+			items.add(item[0]);
+		}
+	}
+
+	private BaseBottomSheetItem createTitleItem() {
+		LayoutInflater themedInflater = UiUtilities.getInflater(requireContext(), nightMode);
+		View view = themedInflater.inflate(R.layout.settings_group_title, null);
+
+		checkBox = view.findViewById(R.id.check_box);
+		selectedSize = view.findViewById(R.id.selected_size);
+		TextView textView = view.findViewById(R.id.title);
+		textView.setText(type.getTitleId());
+		view.findViewById(R.id.select_all_button).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				checkBox.performClick();
+				boolean checked = checkBox.getState() == CHECKED;
+				if (checked) {
+					selectedItems.addAll(allItems);
+				} else {
+					selectedItems.clear();
+				}
+				updateTitleView();
+				updateItems(checked);
+			}
+		});
+		setupDescription(view);
+		updateTitleView();
+
+		return new SimpleBottomSheetItem.Builder().setCustomView(view).create();
+	}
+
+	private void updateTitleView() {
+		if (Algorithms.isEmpty(selectedItems)) {
+			checkBox.setState(UNCHECKED);
+		} else {
+			checkBox.setState(selectedItems.containsAll(allItems) ? CHECKED : MISC);
+		}
+		int checkBoxColor = checkBox.getState() == UNCHECKED ? secondaryColorRes : activeColorRes;
+		CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, checkBoxColor)));
+
+		selectedSize.setText(getString(R.string.ltr_or_rtl_combine_via_slash, selectedItems.size(), allItems.size()));
+	}
+
+	private void updateItems(boolean checked) {
+		for (BaseBottomSheetItem item : items) {
+			if (item instanceof BottomSheetItemWithCompoundButton) {
+				((BottomSheetItemWithCompoundButton) item).setChecked(checked);
+			}
+		}
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_cancel;
+	}
+
+	@Override
+	protected int getRightBottomButtonTextId() {
+		return R.string.shared_string_apply;
+	}
+
+	@Override
+	protected void onRightBottomButtonClick() {
+		Fragment target = getTargetFragment();
+		if (target instanceof OnItemSelectedListener) {
+			OnItemSelectedListener listener = (OnItemSelectedListener) target;
+			listener.onItemsSelected(type, selectedItems);
+		}
+		dismiss();
+	}
+
+	public static void showInstance(@NonNull ExportSettingsType type, List<Object> selectedItems, List<?> allItems, @NonNull FragmentManager fm, @Nullable Fragment target) {
+		try {
+			if (!fm.isStateSaved() && fm.findFragmentByTag(TAG) == null) {
+				ExportItemsBottomSheet fragment = new ExportItemsBottomSheet();
+				fragment.type = type;
+				fragment.allItems = (List<Object>) allItems;
+				if (selectedItems != null) {
+					fragment.selectedItems.addAll(selectedItems);
+				}
+				fragment.setTargetFragment(target, 0);
+				fragment.show(fm, TAG);
+			}
+		} catch (RuntimeException e) {
+			LOG.error("showInstance", e);
+		}
+	}
+
+	private String setupDescription(View view) {
+		TextView description = view.findViewById(R.id.description);
+		if (type == ExportSettingsType.FAVORITES) {
+			description.setText(R.string.select_groups_for_import);
+		} else {
+			description.setText(R.string.select_items_for_import);
+		}
+		return null;
+	}
+
+	private void setupBottomSheetItem(BottomSheetItemWithCompoundButton.Builder builder, Object object) {
+		if (object instanceof ApplicationModeBean) {
+			ApplicationModeBean modeBean = (ApplicationModeBean) object;
+			String profileName = modeBean.userProfileName;
+			if (Algorithms.isEmpty(profileName)) {
+				ApplicationMode appMode = ApplicationMode.valueOfStringKey(modeBean.stringKey, null);
+				profileName = getString(appMode.getNameKeyResource());
+			}
+			builder.setTitle(profileName);
+
+			String routingProfile = "";
+			String routingProfileValue = modeBean.routingProfile;
+			if (!routingProfileValue.isEmpty()) {
+				try {
+					routingProfile = getString(RoutingProfilesResources.valueOf(routingProfileValue.toUpperCase()).getStringRes());
+					routingProfile = Algorithms.capitalizeFirstLetterAndLowercase(routingProfile);
+				} catch (IllegalArgumentException e) {
+					routingProfile = Algorithms.capitalizeFirstLetterAndLowercase(routingProfileValue);
+					LOG.error("Error trying to get routing resource for " + routingProfileValue + "\n" + e);
+				}
+			}
+			if (!Algorithms.isEmpty(routingProfile)) {
+				builder.setDescription(getString(R.string.ltr_or_rtl_combine_via_colon, getString(R.string.nav_type_hint), routingProfile));
+			} else {
+				builder.setDescription(getString(R.string.profile_type_base_string));
+			}
+			int profileIconRes = AndroidUtils.getDrawableId(app, modeBean.iconName);
+			ProfileIconColors iconColor = modeBean.iconColor;
+			builder.setIcon(uiUtilities.getIcon(profileIconRes, iconColor.getColor(nightMode)));
+		} else if (object instanceof QuickAction) {
+			QuickAction quickAction = (QuickAction) object;
+			builder.setTitle(quickAction.getName(app));
+			builder.setIcon(uiUtilities.getIcon(quickAction.getIconRes(), activeColorRes));
+		} else if (object instanceof PoiUIFilter) {
+			PoiUIFilter poiUIFilter = (PoiUIFilter) object;
+			builder.setTitle(poiUIFilter.getName());
+			int iconRes = RenderingIcons.getBigIconResourceId(poiUIFilter.getIconId());
+			builder.setIcon(uiUtilities.getIcon(iconRes != 0 ? iconRes : R.drawable.ic_action_user, activeColorRes));
+		} else if (object instanceof TileSourceTemplate || object instanceof SQLiteTileSource) {
+			ITileSource tileSource = (ITileSource) object;
+			builder.setTitle(tileSource.getName());
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_map, activeColorRes));
+		} else if (object instanceof File) {
+			setupBottomSheetItemForFile(builder, (File) object);
+		} else if (object instanceof FileSettingsItem) {
+			FileSettingsItem fileSettingsItem = (FileSettingsItem) object;
+			setupBottomSheetItemForFile(builder, fileSettingsItem.getFile());
+		} else if (object instanceof AvoidRoadInfo) {
+			AvoidRoadInfo avoidRoadInfo = (AvoidRoadInfo) object;
+			builder.setTitle(avoidRoadInfo.name);
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_alert, activeColorRes));
+		} else if (object instanceof OsmNotesPoint) {
+			OsmNotesPoint osmNotesPoint = (OsmNotesPoint) object;
+			builder.setTitle(osmNotesPoint.getText());
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_osm_note_add, activeColorRes));
+		} else if (object instanceof OpenstreetmapPoint) {
+			OpenstreetmapPoint openstreetmapPoint = (OpenstreetmapPoint) object;
+			builder.setTitle(OsmEditingPlugin.getTitle(openstreetmapPoint, app));
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_info_dark, activeColorRes));
+		} else if (object instanceof FavoriteGroup) {
+			FavoriteGroup group = (FavoriteGroup) object;
+			builder.setTitle(group.getDisplayName(app));
+			int color = group.getColor() == 0 ? ContextCompat.getColor(app, R.color.color_favorite) : group.getColor();
+			builder.setIcon(uiUtilities.getPaintedIcon(R.drawable.ic_action_folder, color));
+		} else if (object instanceof GlobalSettingsItem) {
+			GlobalSettingsItem globalSettingsItem = (GlobalSettingsItem) object;
+			builder.setTitle(globalSettingsItem.getPublicName(app));
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_settings, activeColorRes));
+		} else if (object instanceof MapMarkersGroup) {
+			MapMarkersGroup markersGroup = (MapMarkersGroup) object;
+			if (ExportSettingsType.ACTIVE_MARKERS.name().equals(markersGroup.getId())) {
+				builder.setTitle(getString(R.string.map_markers));
+				builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_flag, activeColorRes));
+			} else if (ExportSettingsType.HISTORY_MARKERS.name().equals(markersGroup.getId())) {
+				builder.setTitle(getString(R.string.map_markers));
+				builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_history, activeColorRes));
+			}
+		} else if (object instanceof HistoryEntry) {
+			HistoryEntry historyEntry = (HistoryEntry) object;
+			builder.setTitle(historyEntry.getName().getName());
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_history, activeColorRes));
+		}
+	}
+
+	private void setupBottomSheetItemForFile(Builder builder, File file) {
+		FileSettingsItem.FileSubtype fileSubtype = FileSettingsItem.FileSubtype.getSubtypeByPath(app, file.getPath());
+		builder.setTitle(file.getName());
+		if (file.getAbsolutePath().contains(IndexConstants.RENDERERS_DIR)) {
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_map_style, activeColorRes));
+		} else if (file.getAbsolutePath().contains(IndexConstants.ROUTING_PROFILES_DIR)) {
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_route_distance, activeColorRes));
+		} else if (file.getAbsolutePath().contains(IndexConstants.GPX_INDEX_DIR)) {
+			builder.setTitle(GpxUiHelper.getGpxTitle(file.getName()));
+			builder.setIcon(uiUtilities.getIcon(R.drawable.ic_action_route_distance, activeColorRes));
+		} else if (file.getAbsolutePath().contains(IndexConstants.AV_INDEX_DIR)) {
+			int iconId = AudioVideoNotesPlugin.getIconIdForRecordingFile(file);
+			if (iconId == -1) {
+				iconId = R.drawable.ic_action_photo_dark;
+			}
+			builder.setIcon(uiUtilities.getIcon(iconId, activeColorRes));
+		} else if (fileSubtype.isMap()
+				|| fileSubtype == FileSettingsItem.FileSubtype.TTS_VOICE
+				|| fileSubtype == FileSettingsItem.FileSubtype.VOICE) {
+			builder.setTitle(FileNameTranslationHelper.getFileNameWithRegion(app, file.getName()));
+			builder.setIcon(uiUtilities.getIcon(fileSubtype.getIconId(), activeColorRes));
+		}
+	}
+}

OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsAdapter.java

@@ -21,6 +21,7 @@ import net.osmand.plus.helpers.FontCache;
 import net.osmand.plus.settings.backend.ExportSettingsCategory;
 import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.backup.FileSettingsItem;
+import net.osmand.util.Algorithms;
 import net.osmand.view.ThreeStateCheckbox;
 
 import org.apache.commons.logging.Log;
@@ -28,8 +29,6 @@ import org.apache.commons.logging.Log;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -44,9 +43,9 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 	private final OsmandApplication app;
 	private final UiUtilities uiUtilities;
 
-	private List<ExportSettingsCategory> itemsTypes = new ArrayList<>();
+	private List<ExportSettingsCategory> itemsTypes;
-	private Map<ExportSettingsType, List<?>> selectedItemsMap = new HashMap<>();
+	private Map<ExportSettingsType, List<?>> selectedItemsMap;
-	private Map<ExportSettingsCategory, List<ExportDataObject>> itemsMap = new LinkedHashMap<>();
+	private Map<ExportSettingsCategory, SettingsCategoryItems> itemsMap;
 
 	private final OnItemSelectedListener listener;
 
@@ -73,7 +72,7 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 			group = themedInflater.inflate(R.layout.profile_data_list_item_group, parent, false);
 		}
 		final ExportSettingsCategory category = itemsTypes.get(groupPosition);
-		final List<ExportDataObject> items = itemsMap.get(category);
+		final SettingsCategoryItems items = itemsMap.get(category);
 
 		String title = app.getString(category.getTitleId());
 		TextView titleTv = group.findViewById(R.id.title_tv);
@@ -83,9 +82,8 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 		subTextTv.setText(getCategoryDescr(category));
 
 		int selectedTypes = 0;
-		for (int i = 0; i < items.size(); i++) {
+		for (ExportSettingsType type : items.getTypes()) {
-			ExportDataObject object = items.get(i);
+			if (!Algorithms.isEmpty(selectedItemsMap.get(type))) {
-			if (selectedItemsMap.containsKey(object.getType())) {
 				selectedTypes++;
 			}
 		}
@@ -93,7 +91,7 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 		if (selectedTypes == 0) {
 			checkBox.setState(UNCHECKED);
 		} else {
-			checkBox.setState(selectedTypes == items.size() ? CHECKED : MISC);
+			checkBox.setState(selectedTypes == items.getTypes().size() ? CHECKED : MISC);
 		}
 		int checkBoxColor = checkBox.getState() == UNCHECKED ? secondaryColorRes : activeColorRes;
 		CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, checkBoxColor)));
@@ -103,17 +101,6 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 			public void onClick(View view) {
 				checkBox.performClick();
 				boolean selected = checkBox.getState() == CHECKED;
-				if (selected) {
-					for (ExportDataObject object : items) {
-						if (!selectedItemsMap.containsKey(object.getType())) {
-							selectedItemsMap.put(object.getType(), object.getItems());
-						}
-					}
-				} else {
-					for (ExportDataObject object : items) {
-						selectedItemsMap.remove(object.getType());
-					}
-				}
 				if (listener != null) {
 					listener.onCategorySelected(category, selected);
 				}
@@ -136,26 +123,29 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 		if (child == null) {
 			child = themedInflater.inflate(R.layout.profile_data_list_item_group, parent, false);
 		}
-		final ExportDataObject currentItem = itemsMap.get(itemsTypes.get(groupPosition)).get(childPosition);
+		final ExportSettingsCategory category = itemsTypes.get(groupPosition);
-		List<?> selectedItems = selectedItemsMap.get(currentItem.getType());
+		final SettingsCategoryItems categoryItems = itemsMap.get(category);
+		final ExportSettingsType type = categoryItems.getTypes().get(childPosition);
+		final List<?> items = categoryItems.getItemsForType(type);
+		List<?> selectedItems = selectedItemsMap.get(type);
 
 		TextView titleTv = child.findViewById(R.id.title_tv);
-		titleTv.setText(currentItem.getType().getTitleId());
+		titleTv.setText(type.getTitleId());
 
 		TextView subTextTv = child.findViewById(R.id.sub_text_tv);
-		subTextTv.setText(getSelectedTypeDescr(currentItem));
+		subTextTv.setText(getSelectedTypeDescr(type, items));
 
 		ImageView icon = child.findViewById(R.id.explist_indicator);
-		setupIcon(icon, currentItem.getType().getIconRes(), selectedItems != null);
+		setupIcon(icon, type.getIconRes(), !Algorithms.isEmpty(selectedItems));
 
 		final ThreeStateCheckbox checkBox = child.findViewById(R.id.check_box);
 		if (selectedItems == null) {
 			checkBox.setState(UNCHECKED);
-		} else if (selectedItems.containsAll(currentItem.getItems())) {
+		} else if (selectedItems.containsAll(items)) {
 			checkBox.setState(CHECKED);
 		} else {
 			boolean contains = false;
-			for (Object object : currentItem.getItems()) {
+			for (Object object : items) {
 				if (selectedItems.contains(object)) {
 					contains = true;
 					break;
@@ -163,7 +153,14 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 			}
 			checkBox.setState(contains ? MISC : UNCHECKED);
 		}
-
+		child.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (listener != null) {
+					listener.onTypeClicked(category, type);
+				}
+			}
+		});
 		int checkBoxColor = checkBox.getState() == UNCHECKED ? secondaryColorRes : activeColorRes;
 		CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(ContextCompat.getColor(app, checkBoxColor)));
 		child.findViewById(R.id.check_box_container).setOnClickListener(new View.OnClickListener() {
@@ -171,13 +168,8 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 			public void onClick(View view) {
 				checkBox.performClick();
 				boolean selected = checkBox.getState() == CHECKED;
-				if (selected) {
-					selectedItemsMap.put(currentItem.getType(), currentItem.getItems());
-				} else {
-					selectedItemsMap.remove(currentItem.getType());
-				}
 				if (listener != null) {
-					listener.onTypeSelected(currentItem.getType(), selected);
+					listener.onItemsSelected(type, selected ? items : new ArrayList<>());
 				}
 				notifyDataSetChanged();
 			}
@@ -195,7 +187,7 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 
 	@Override
 	public int getChildrenCount(int i) {
-		return itemsMap.get(itemsTypes.get(i)).size();
+		return itemsMap.get(itemsTypes.get(i)).getTypes().size();
 	}
 
 	@Override
@@ -205,7 +197,9 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 
 	@Override
 	public Object getChild(int groupPosition, int childPosition) {
-		return itemsMap.get(itemsTypes.get(groupPosition)).get(childPosition);
+		SettingsCategoryItems categoryItems = itemsMap.get(itemsTypes.get(groupPosition));
+		ExportSettingsType type = categoryItems.getTypes().get(groupPosition);
+		return categoryItems.getItemsForType(type).get(childPosition);
 	}
 
 	@Override
@@ -237,19 +231,15 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 		}
 	}
 
-	public void updateSettingsList(Map<ExportSettingsCategory, List<ExportDataObject>> itemsMap) {
+	public void updateSettingsItems(Map<ExportSettingsCategory, SettingsCategoryItems> itemsMap,
+									Map<ExportSettingsType, List<?>> selectedItemsMap) {
 		this.itemsMap = itemsMap;
 		this.itemsTypes = new ArrayList<>(itemsMap.keySet());
+		this.selectedItemsMap = selectedItemsMap;
 		Collections.sort(itemsTypes);
 		notifyDataSetChanged();
 	}
 
-	public void clearSettingsList() {
-		this.itemsMap.clear();
-		this.itemsTypes.clear();
-		notifyDataSetChanged();
-	}
-
 	public boolean hasSelectedData() {
 		return !selectedItemsMap.isEmpty();
 	}
@@ -265,21 +255,20 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 	private String getCategoryDescr(ExportSettingsCategory category) {
 		long itemsSize = 0;
 		int selectedTypes = 0;
-		List<ExportDataObject> items = itemsMap.get(category);
+		SettingsCategoryItems items = itemsMap.get(category);
-		for (int i = 0; i < items.size(); i++) {
+		for (ExportSettingsType type : items.getTypes()) {
-			ExportDataObject object = items.get(i);
+			if (!Algorithms.isEmpty(selectedItemsMap.get(type))) {
-			if (selectedItemsMap.containsKey(object.getType())) {
 				selectedTypes++;
-				itemsSize += calculateItemsSize(object.getItems());
+				itemsSize += calculateItemsSize(items.getItemsForType(type));
 			}
 		}
 		String description;
 		if (selectedTypes == 0) {
 			description = app.getString(R.string.shared_string_none);
-		} else if (selectedTypes == items.size()) {
+		} else if (selectedTypes == items.getTypes().size()) {
 			description = app.getString(R.string.shared_string_all);
 		} else {
-			description = app.getString(R.string.ltr_or_rtl_combine_via_slash, String.valueOf(selectedTypes), String.valueOf(items.size()));
+			description = app.getString(R.string.ltr_or_rtl_combine_via_slash, String.valueOf(selectedTypes), String.valueOf(items.getTypes().size()));
 		}
 		String formattedSize = AndroidUtils.formatSize(app, itemsSize);
 		return itemsSize == 0 ? description : app.getString(R.string.ltr_or_rtl_combine_via_comma, description, formattedSize);
@@ -297,12 +286,11 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 		return itemsSize;
 	}
 
-	private String getSelectedTypeDescr(ExportDataObject dataObject) {
+	private String getSelectedTypeDescr(ExportSettingsType type, List<?> items) {
 		long itemsSize = 0;
 		int selectedTypes = 0;
 
-		List<?> items = dataObject.getItems();
+		List<?> selectedItems = selectedItemsMap.get(type);
-		List<?> selectedItems = selectedItemsMap.get(dataObject.getType());
 		if (selectedItems != null) {
 			for (int i = 0; i < items.size(); i++) {
 				Object object = items.get(i);
@@ -333,9 +321,11 @@ public class ExportSettingsAdapter extends OsmandBaseExpandableListAdapter {
 
 	interface OnItemSelectedListener {
 
+		void onItemsSelected(ExportSettingsType type, List<?> selectedItems);
+
 		void onCategorySelected(ExportSettingsCategory type, boolean selected);
 
-		void onTypeSelected(ExportSettingsType type, boolean selected);
+		void onTypeClicked(ExportSettingsCategory category, ExportSettingsType type);
 
 	}
 }

OsmAnd/src/net/osmand/plus/settings/fragments/ExportSettingsFragment.java

@@ -50,7 +50,10 @@ import org.apache.commons.logging.Log;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -74,7 +77,9 @@ public class ExportSettingsFragment extends BaseOsmAndFragment implements OnItem
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd-MM-yy", Locale.US);
 
 	private OsmandApplication app;
-	private Map<ExportSettingsCategory, List<ExportDataObject>> dataList;
+
+	private Map<ExportSettingsType, List<?>> selectedItemsMap = new HashMap<>();
+	private Map<ExportSettingsCategory, SettingsCategoryItems> dataList = new LinkedHashMap<>();
 
 	private ProgressDialog progress;
 	private ApplicationMode appMode;
@@ -179,7 +184,7 @@ public class ExportSettingsFragment extends BaseOsmAndFragment implements OnItem
 		});
 
 		adapter = new ExportSettingsAdapter(app, this, nightMode);
-		adapter.updateSettingsList(dataList);
+		adapter.updateSettingsItems(dataList, selectedItemsMap);
 		expandableList.setAdapter(adapter);
 
 		CollapsingToolbarLayout toolbarLayout = root.findViewById(R.id.toolbar_layout);
@@ -292,15 +297,32 @@ public class ExportSettingsFragment extends BaseOsmAndFragment implements OnItem
 	}
 
 	@Override
-	public void onCategorySelected(ExportSettingsCategory type, boolean selected) {
+	public void onCategorySelected(ExportSettingsCategory category, boolean selected) {
+		SettingsCategoryItems categoryItems = dataList.get(category);
+		for (ExportSettingsType type : categoryItems.getTypes()) {
+			List<?> selectedItems = selected ? categoryItems.getItemsForType(type) : new ArrayList<>();
+			selectedItemsMap.put(type, selectedItems);
+		}
 		updateAvailableSpace();
 	}
 
 	@Override
-	public void onTypeSelected(ExportSettingsType type, boolean selected) {
+	public void onItemsSelected(ExportSettingsType type, List<?> selectedItems) {
+		selectedItemsMap.put(type, selectedItems);
+		adapter.notifyDataSetChanged();
 		updateAvailableSpace();
 	}
 
+	@Override
+	public void onTypeClicked(ExportSettingsCategory category, ExportSettingsType type) {
+		FragmentManager fragmentManager = getFragmentManager();
+		if (fragmentManager != null && type != ExportSettingsType.GLOBAL && type != ExportSettingsType.SEARCH_HISTORY) {
+			List<Object> items = (List<Object>) dataList.get(category).getItemsForType(type);
+			List<Object> selectedItems = (List<Object>) selectedItemsMap.get(type);
+			ExportItemsBottomSheet.showInstance(type, selectedItems, items, fragmentManager, this);
+		}
+	}
+
 	private void prepareFile() {
 		if (app != null) {
 			exportingStarted = true;

OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java

@@ -33,13 +33,12 @@ import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
 import net.osmand.plus.helpers.SearchHistoryHelper.HistoryEntry;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.mapmarkers.MapMarker;
 import net.osmand.plus.osmedit.OpenstreetmapPoint;
 import net.osmand.plus.osmedit.OsmNotesPoint;
 import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.quickaction.QuickAction;
 import net.osmand.plus.settings.backend.ApplicationMode;
-import net.osmand.plus.settings.backend.ExportSettingsType;
 import net.osmand.plus.settings.backend.backup.SettingsHelper;
 import net.osmand.plus.settings.backend.backup.SettingsHelper.ImportAsyncTask;
 import net.osmand.plus.settings.backend.backup.SettingsHelper.ImportType;
@@ -72,7 +71,7 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment {
 	private SettingsHelper settingsHelper;
 
 	public static void showInstance(@NonNull FragmentManager fm, List<? super Object> duplicatesList,
-	                                List<SettingsItem> settingsItems, File file, Fragment targetFragment) {
+									List<SettingsItem> settingsItems, File file, Fragment targetFragment) {
 		ImportDuplicatesFragment fragment = new ImportDuplicatesFragment();
 		fragment.setTargetFragment(targetFragment, 0);
 		fragment.setDuplicatesList(duplicatesList);
@@ -203,8 +202,8 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment {
 		List<File> ttsVoiceFilesList = new ArrayList<>();
 		List<File> voiceFilesList = new ArrayList<>();
 		List<File> mapFilesList = new ArrayList<>();
-		List<MapMarkersGroup> markersGroups = new ArrayList<>();
+		List<MapMarker> mapMarkers = new ArrayList<>();
-		List<MapMarkersGroup> markersHistoryGroups = new ArrayList<>();
+		List<MapMarker> mapMarkersGroups = new ArrayList<>();
 		List<HistoryEntry> historyEntries = new ArrayList<>();
 
 		for (Object object : duplicatesList) {
@@ -242,12 +241,12 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment {
 				osmNotesPointList.add((OsmNotesPoint) object);
 			} else if (object instanceof OpenstreetmapPoint) {
 				osmEditsPointList.add((OpenstreetmapPoint) object);
-			} else if (object instanceof MapMarkersGroup) {
+			} else if (object instanceof MapMarker) {
-				MapMarkersGroup markersGroup = (MapMarkersGroup) object;
+				MapMarker mapMarker = (MapMarker) object;
-				if (ExportSettingsType.ACTIVE_MARKERS.name().equals(markersGroup.getId())) {
+				if (mapMarker.history) {
-					markersGroups.add(markersGroup);
+					mapMarkers.add(mapMarker);
-				} else if (ExportSettingsType.HISTORY_MARKERS.name().equals(markersGroup.getId())) {
+				} else {
-					markersHistoryGroups.add(markersGroup);
+					mapMarkersGroups.add(mapMarker);
 				}
 			} else if (object instanceof HistoryEntry) {
 				historyEntries.add((HistoryEntry) object);
@@ -313,17 +312,13 @@ public class ImportDuplicatesFragment extends BaseOsmAndFragment {
 			duplicates.add(getString(R.string.local_indexes_cat_voice));
 			duplicates.addAll(voiceFilesList);
 		}
-		if (!markersGroups.isEmpty()) {
+		if (!mapMarkers.isEmpty()) {
 			duplicates.add(getString(R.string.map_markers));
-			duplicates.addAll(markersGroups);
+			duplicates.addAll(mapMarkers);
 		}
-		if (!markersHistoryGroups.isEmpty()) {
+		if (!mapMarkersGroups.isEmpty()) {
 			duplicates.add(getString(R.string.markers_history));
-			duplicates.addAll(markersHistoryGroups);
+			duplicates.addAll(mapMarkersGroups);
-		}
-		if (!historyEntries.isEmpty()) {
-			duplicates.add(getString(R.string.shared_string_search_history));
-			duplicates.addAll(historyEntries);
 		}
 		return duplicates;
 	}

OsmAnd/src/net/osmand/plus/settings/fragments/ImportSettingsFragment.java

@@ -38,6 +38,7 @@ import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.SQLiteTileSource;
 import net.osmand.plus.UiUtilities;
+import net.osmand.plus.UiUtilities.DialogButtonType;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.helpers.AvoidSpecificRoads.AvoidRoadInfo;
@@ -54,7 +55,6 @@ import net.osmand.plus.settings.backend.backup.AvoidRoadsSettingsItem;
 import net.osmand.plus.settings.backend.backup.FavoritesSettingsItem;
 import net.osmand.plus.settings.backend.backup.FileSettingsItem;
 import net.osmand.plus.settings.backend.backup.GlobalSettingsItem;
-import net.osmand.plus.settings.backend.backup.SearchHistorySettingsItem;
 import net.osmand.plus.settings.backend.backup.HistoryMarkersSettingsItem;
 import net.osmand.plus.settings.backend.backup.MapSourcesSettingsItem;
 import net.osmand.plus.settings.backend.backup.MarkersSettingsItem;
@@ -63,12 +63,12 @@ import net.osmand.plus.settings.backend.backup.OsmNotesSettingsItem;
 import net.osmand.plus.settings.backend.backup.PoiUiFiltersSettingsItem;
 import net.osmand.plus.settings.backend.backup.ProfileSettingsItem;
 import net.osmand.plus.settings.backend.backup.QuickActionsSettingsItem;
+import net.osmand.plus.settings.backend.backup.SearchHistorySettingsItem;
 import net.osmand.plus.settings.backend.backup.SettingsHelper;
 import net.osmand.plus.settings.backend.backup.SettingsHelper.ImportAsyncTask;
 import net.osmand.plus.settings.backend.backup.SettingsHelper.ImportType;
 import net.osmand.plus.settings.backend.backup.SettingsItem;
 import net.osmand.plus.settings.backend.backup.SettingsItemType;
-import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.util.Algorithms;
 
 import org.apache.commons.logging.Log;
@@ -134,7 +134,7 @@ public class ImportSettingsFragment extends BaseOsmAndFragment {
 		inflater = UiUtilities.getInflater(app, nightMode);
 		View root = inflater.inflate(R.layout.fragment_import, container, false);
 		Toolbar toolbar = root.findViewById(R.id.toolbar);
-		TextViewEx continueBtn = root.findViewById(R.id.continue_button);
+		View continueBtn = root.findViewById(R.id.continue_button);
 		toolbarLayout = root.findViewById(R.id.toolbar_layout);
 		expandableList = root.findViewById(R.id.list);
 		buttonsContainer = root.findViewById(R.id.buttons_container);
@@ -145,6 +145,7 @@ public class ImportSettingsFragment extends BaseOsmAndFragment {
 		description = header.findViewById(R.id.description);
 		description.setText(R.string.select_data_to_import);
 		expandableList.addHeaderView(header);
+		UiUtilities.setupDialogButton(nightMode, continueBtn, DialogButtonType.PRIMARY, getString(R.string.shared_string_continue));
 		continueBtn.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {

OsmAnd/src/net/osmand/plus/settings/fragments/SettingsCategoryItems.java

@@ -0,0 +1,30 @@
+package net.osmand.plus.settings.fragments;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.settings.backend.ExportSettingsType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class SettingsCategoryItems {
+
+	private final Map<ExportSettingsType, List<?>> itemsMap;
+
+	public SettingsCategoryItems(@NonNull Map<ExportSettingsType, List<?>> itemsMap) {
+		this.itemsMap = itemsMap;
+	}
+
+	public List<ExportSettingsType> getTypes() {
+		return new ArrayList<>(itemsMap.keySet());
+	}
+
+	public List<?> getItemsForType(ExportSettingsType type) {
+		return itemsMap.get(type);
+	}
+
+	public Map<ExportSettingsType, List<?>> getItemsMap() {
+		return itemsMap;
+	}
+}

OsmAnd/src/net/osmand/plus/srtmplugin/TerrainFragment.java

@@ -221,18 +221,13 @@ public class TerrainFragment extends BaseOsmAndFragment implements View.OnClickL
 
 	@Override
 	public void onClick(View view) {
-		switch (view.getId()) {
+		int id = view.getId();
-			case R.id.switch_compat:
+		if (id == R.id.switch_compat) {
-				onSwitchClick();
+			onSwitchClick();
-				break;
+		} else if (id == R.id.left_button) {
-			case R.id.left_button:
+			setupTerrainMode(HILLSHADE);
-				setupTerrainMode(HILLSHADE);
+		} else if (id == R.id.right_button) {
-				break;
+			setupTerrainMode(SLOPE);
-			case R.id.right_button:
-				setupTerrainMode(SLOPE);
-				break;
-			default:
-				break;
 		}
 	}
 

OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java

@@ -191,13 +191,13 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 	private boolean wasZoomInMultiTouch;
 	private float elevationAngle;
 
-	public OsmandMapTileView(MapActivity activity, int w, int h) {
+	public OsmandMapTileView(Activity activity, int w, int h) {
 		this.activity = activity;
 		init(activity, w, h);
 	}
 
 	// ///////////////////////////// INITIALIZING UI PART ///////////////////////////////////
-	public void init(final MapActivity ctx, int w, int h) {
+	public void init(final Activity ctx, int w, int h) {
 		application = (OsmandApplication) ctx.getApplicationContext();
 		settings = application.getSettings();
 
@@ -256,7 +256,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 				if (isZoomingAllowed(getZoom(), -1.1f)) {
 					getAnimatedDraggingThread().startZooming(getZoom() - 1, currentViewport.getZoomFloatPart(), false);
 					if (wasMapLinkedBeforeGesture) {
-						ctx.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
+						application.getMapViewTrackingUtilities().setMapLinkedToLocation(true);
 					}
 				}
 			}
@@ -1318,7 +1318,9 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 			angle = 90f;
 		}
 		this.elevationAngle = angle;
-		((MapActivity) activity).setMapElevation(angle);
+		if (activity instanceof MapActivity) {
+			((MapActivity) activity).setMapElevation(angle);
+		}
 	}
 
 	private boolean isZoomingAllowed(int baseZoom, float dz) {
@@ -1341,7 +1343,7 @@ public class OsmandMapTileView implements IMapDownloaderCallback {
 		@Override
 		public boolean onDown(MotionEvent e) {
 			// Facilitates better map re-linking for two finger tap zoom out
-			wasMapLinkedBeforeGesture = ((MapActivity) activity).getMapViewTrackingUtilities().isMapLinkedToLocation();
+			wasMapLinkedBeforeGesture = application.getMapViewTrackingUtilities().isMapLinkedToLocation();
 			return false;
 		}
 

OsmAnd/src/net/osmand/plus/views/layers/GPXLayer.java

@@ -37,9 +37,6 @@ import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayItem;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
-import net.osmand.plus.mapmarkers.MapMarkersHelper;
-import net.osmand.plus.mapmarkers.MapMarker;
-import net.osmand.plus.mapmarkers.MapMarkersGroup;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -47,6 +44,9 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.PointImageDrawable;
 import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint;
 import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
+import net.osmand.plus.mapmarkers.MapMarker;
+import net.osmand.plus.mapmarkers.MapMarkersGroup;
+import net.osmand.plus.mapmarkers.MapMarkersHelper;
 import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.render.OsmandRenderer.RenderingContext;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
@@ -353,7 +353,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 	}
 
 	private void drawSelectedFilesSplits(Canvas canvas, RotatedTileBox tileBox, List<SelectedGpxFile> selectedGPXFiles,
-	                                     DrawSettings settings) {
+										 DrawSettings settings) {
 		if (tileBox.getZoom() >= START_ZOOM) {
 			// request to load
 			OsmandApplication app = view.getApplication();
@@ -634,7 +634,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 	}
 
 	private void drawSelectedFilesSegments(Canvas canvas, RotatedTileBox tileBox,
-	                                       List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
+										   List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
 		SelectedGpxFile currentTrack = null;
 		for (SelectedGpxFile selectedGpxFile : selectedGPXFiles) {
 			String width = getTrackWidthName(selectedGpxFile.getGpxFile(), "");
@@ -653,7 +653,7 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 	}
 
 	private void drawSelectedFileSegments(SelectedGpxFile selectedGpxFile, boolean currentTrack, Canvas canvas,
-	                                      RotatedTileBox tileBox, DrawSettings settings) {
+										  RotatedTileBox tileBox, DrawSettings settings) {
 		List<TrkSegment> segments = selectedGpxFile.getPointsToDisplay();
 		for (TrkSegment ts : segments) {
 			String width = getTrackWidthName(selectedGpxFile.getGpxFile(), "");
@@ -1010,8 +1010,8 @@ public class GPXLayer extends OsmandMapLayer implements IContextMenuProvider, IM
 
 	@Override
 	public void applyNewObjectPosition(@NonNull Object o,
-	                                   @NonNull LatLon position,
+									   @NonNull LatLon position,
-	                                   @Nullable final ContextMenuLayer.ApplyMovedObjectCallback callback) {
+									   @Nullable final ContextMenuLayer.ApplyMovedObjectCallback callback) {
 		if (o instanceof WptPt) {
 			final WptPt objectInMotion = (WptPt) o;
 			SelectedGpxFile selectedGpxFile = pointFileMap.get(objectInMotion);

OsmAnd/src/net/osmand/plus/views/layers/geometry/GeometryWay.java

@@ -338,8 +338,8 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
 		if (tx.size() < 2) {
 			return;
 		}
+		boolean hasPathLine = false;
 		try {
-			boolean hasPathLine = false;
 			for (GeometryWayStyle<?> style : styles) {
 				if (style.hasPathLine()) {
 					hasPathLine = true;
@@ -360,7 +360,9 @@ public abstract class GeometryWay<T extends GeometryWayContext, D extends Geomet
 			}
 			drawer.drawArrowsOverPath(canvas, tb, tx, ty, angles, distances, distToFinish, styles);
 		} finally {
-			canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
+			if (hasPathLine) {
+				canvas.rotate(tb.getRotate(), tb.getCenterPixelX(), tb.getCenterPixelY());
+			}
 		}
 	}