Merge remote-tracking branch 'origin/master' into configure_menu_items_fix

# Conflicts:
#	OsmAnd/res/values/strings.xml

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

@@ -1307,6 +1307,12 @@ public class BinaryMapIndexReader {
 		poiAdapter.initCategories(poiIndex);
 	}
 
+	public void initCategories() throws IOException {
+		for (PoiRegion poiIndex : poiIndexes) {
+			poiAdapter.initCategories(poiIndex);
+		}
+	}
+
 	public List<Amenity> searchPoiByName(SearchRequest<Amenity> req) throws IOException {
 		if (req.nameQuery == null || req.nameQuery.length() == 0) {
 			throw new IllegalArgumentException();

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

@@ -26,6 +26,7 @@ import net.osmand.data.Amenity.AmenityRoutePoint;
 import net.osmand.data.LatLon;
 import net.osmand.osm.MapPoiTypes;
 import net.osmand.osm.PoiCategory;
+import net.osmand.osm.PoiType;
 import net.osmand.util.MapUtils;
 
 import org.apache.commons.logging.Log;
@@ -224,11 +225,21 @@ public class BinaryMapPoiReaderAdapter {
 			case OsmandOdb.OsmAndCategoryTable.CATEGORY_FIELD_NUMBER:
 				String cat = codedIS.readString().intern();
 				region.categories.add(cat);
-				region.categoriesType.add(poiTypes.getPoiCategoryByName(cat.toLowerCase()));
+				region.categoriesType.add(poiTypes.getPoiCategoryByName(cat.toLowerCase(), true));
 				region.subcategories.add(new ArrayList<String>());
 				break;
 			case OsmandOdb.OsmAndCategoryTable.SUBCATEGORIES_FIELD_NUMBER:
-				region.subcategories.get(region.subcategories.size() - 1).add(codedIS.readString().intern());
+				String subCat = codedIS.readString().intern();
+				PoiCategory lastCat = poiTypes.getPoiCategoryByName(region.categories.get(region.categories.size() - 1));
+				PoiType poiType = new PoiType(MapPoiTypes.getDefault(), lastCat, null, subCat);
+				List<String> filters = new ArrayList<>();
+				for (PoiType poi : lastCat.getPoiTypes()) {
+					filters.add(poi.getKeyName());
+				}
+				if (!filters.contains(subCat)) {
+					lastCat.getPoiTypes().add(poiType);
+				}
+				region.subcategories.get(region.subcategories.size() - 1).add(subCat);
 				break;
 			default:
 				skipUnknownField(t);

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

@@ -211,6 +211,10 @@ public abstract class MapObject implements Comparable<MapObject> {
 		location = new LatLon(latitude, longitude);
 	}
 
+	public void setLocation(LatLon loc) {
+		location = loc;
+	}
+
 	@Override
 	public int compareTo(MapObject o) {
 		return OsmAndCollator.primaryCollator().compare(getName(), o.getName());

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

@@ -65,8 +65,12 @@ public class TransportRoute extends MapObject {
 		return forwardWays;
 	}
 	
-	
 	public void mergeForwardWays() {
+		mergeRouteWays(forwardWays);
+		resortWaysToStopsOrder(forwardWays, forwardStops);
+	}
+	
+	public static void mergeRouteWays(List<Way> forwardWays) {
 		boolean changed = true;
 		// combine as many ways as possible
 		while (changed && forwardWays != null) {
@@ -129,10 +133,13 @@ public class TransportRoute extends MapObject {
 				}
 			}
 		}
-		if (forwardStops.size() > 0) {
+	}
+
+	public static Map<Way, int[]> resortWaysToStopsOrder(List<Way> forwardWays, List<TransportStop> forwardStops) {
+		final Map<Way, int[]> orderWays = new HashMap<Way, int[]>();
+		if (forwardWays != null && forwardStops.size() > 0) {
 			// resort ways to stops order 
-			final Map<Way, int[]> orderWays = new HashMap<Way, int[]>();
-			for (Way w : getForwardWays()) {
+			for (Way w : forwardWays) {
 				int[] pair = new int[] { 0, 0 };
 				Node firstNode = w.getFirstNode();
 				TransportStop st = forwardStops.get(0);
@@ -175,6 +182,7 @@ public class TransportRoute extends MapObject {
 			}
 			
 		}
+		return orderWays;
 	}
 	
 	

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

@@ -295,6 +295,9 @@ public class MapPoiTypes {
 		}
 		if (create) {
 			PoiCategory lastCategory = new PoiCategory(this, name, categories.size());
+			if (!lastCategory.getKeyName().equals("Other")) {
+				lastCategory.setTopVisible(true);
+			}
 			categories.add(lastCategory);
 			return lastCategory;
 		}

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

@@ -965,13 +965,15 @@ public class TransportRoutePlanner {
 		}
 	}
 
-
-	//cache for converted TransportRoutes:
-	private static TLongObjectHashMap<TransportRoute> convertedRoutesCache;
-	private static TLongObjectHashMap<TransportStop> convertedStopsCache;
-
 	public static List<TransportRouteResult> convertToTransportRoutingResult(NativeTransportRoutingResult[] res,
-	                                                                         TransportRoutingConfiguration cfg) {
+	                                                                             TransportRoutingConfiguration cfg) {
+		//cache for converted TransportRoutes:
+		TLongObjectHashMap<TransportRoute> convertedRoutesCache = new TLongObjectHashMap<>();
+		TLongObjectHashMap<TransportStop> convertedStopsCache = new TLongObjectHashMap<>();
+
+		if (res.length == 0) {
+			return new ArrayList<TransportRouteResult>();
+		}
 		List<TransportRouteResult> convertedRes = new ArrayList<TransportRouteResult>();
 		for (NativeTransportRoutingResult ntrr : res) {
 			TransportRouteResult trr = new TransportRouteResult(cfg);
@@ -980,7 +982,7 @@ public class TransportRoutePlanner {
 
 			for (NativeTransportRouteResultSegment ntrs : ntrr.segments) {
 				TransportRouteResultSegment trs = new TransportRouteResultSegment();
-				trs.route = convertTransportRoute(ntrs.route);
+				trs.route = convertTransportRoute(ntrs.route, convertedRoutesCache, convertedStopsCache);
 				trs.walkTime = ntrs.walkTime;
 				trs.travelDistApproximate = ntrs.travelDistApproximate;
 				trs.travelTime = ntrs.travelTime;
@@ -998,7 +1000,9 @@ public class TransportRoutePlanner {
 		return convertedRes;
 	}
 
-	private static TransportRoute convertTransportRoute(NativeTransportRoute nr) {
+	private static TransportRoute convertTransportRoute(NativeTransportRoute nr,
+	                                                    TLongObjectHashMap<TransportRoute> convertedRoutesCache,
+	                                                    TLongObjectHashMap<TransportStop> convertedStopsCache) {
 		TransportRoute r = new TransportRoute();
 		r.setId(nr.id);
 		r.setLocation(nr.routeLat, nr.routeLon);
@@ -1010,15 +1014,17 @@ public class TransportRoutePlanner {
 			}
 		}
 		r.setFileOffset(nr.fileOffset);
-		r.setForwardStops(convertTransportStops(nr.forwardStops));
+		r.setForwardStops(convertTransportStops(nr.forwardStops, convertedStopsCache));
 		r.setRef(nr.ref);
 		r.setOperator(nr.routeOperator);
 		r.setType(nr.type);
 		r.setDist(nr.dist);
 		r.setColor(nr.color);
 
-		if (nr.intervals != null && nr.intervals.length > 0 && nr.avgStopIntervals !=null &&  nr.avgStopIntervals.length > 0 && nr.avgWaitIntervals != null && nr.avgWaitIntervals.length > 0) {
-			r.setSchedule(new TransportSchedule(new TIntArrayList(nr.intervals), new TIntArrayList(nr.avgStopIntervals), new TIntArrayList(nr.avgWaitIntervals)));
+		if (nr.intervals != null && nr.intervals.length > 0 && nr.avgStopIntervals !=null
+				&& nr.avgStopIntervals.length > 0 && nr.avgWaitIntervals != null && nr.avgWaitIntervals.length > 0) {
+			r.setSchedule(new TransportSchedule(new TIntArrayList(nr.intervals),
+					new TIntArrayList(nr.avgStopIntervals), new TIntArrayList(nr.avgWaitIntervals)));
 		}
 
 		for (int i = 0; i < nr.waysIds.length; i++) {
@@ -1029,16 +1035,14 @@ public class TransportRoutePlanner {
 			r.addWay(new Way(nr.waysIds[i], wnodes));
 		}
 
-		if (convertedRoutesCache == null) {
-			convertedRoutesCache = new TLongObjectHashMap<>();
-		}
 		if (convertedRoutesCache.get(r.getId()) == null) {
 			convertedRoutesCache.put(r.getId(), r);
 		}
 		return r;
 	}
 
-	private static List<TransportStop> convertTransportStops(NativeTransportStop[] nstops) {
+	private static List<TransportStop> convertTransportStops(NativeTransportStop[] nstops,
+	                                                         TLongObjectHashMap<TransportStop> convertedStopsCache) {
 		List<TransportStop> stops = new ArrayList<>();
 		for (NativeTransportStop ns : nstops) {
 			if (convertedStopsCache != null && convertedStopsCache.get(ns.id) != null) {
@@ -1062,16 +1066,6 @@ public class TransportRoutePlanner {
 			s.distance = ns.distance;
 			s.x31 = ns.x31;
 			s.y31 = ns.y31;
-//			List<TransportRoute> routes1 = new ArrayList<>();
-			//cache routes to avoid circular conversion and just search them by id
-//			for (int i = 0; i < ns.routes.length; i++) {
-//				if (s.getRoutesIds().length == ns.routes.length && convertedRoutesCache != null
-//						&& convertedRoutesCache.get(ns.routesIds[i]) != null) {
-//					s.addRoute(convertedRoutesCache.get(ns.routesIds[i]));
-//				} else {
-//					s.addRoute(convertTransportRoute(ns.routes[i]));
-//				}
-//			}
 
 			if (ns.pTStopExit_refs != null && ns.pTStopExit_refs.length > 0) {
 				for (int i = 0; i < ns.pTStopExit_refs.length; i++) {

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

@@ -182,11 +182,20 @@ public class MapAlgorithms {
 			}
 
 		}
+		if (outx == rightX || outx == leftX) {
+			if (outy >= topY && outy <= bottomY) {
+				bx = outx;
+				by = outy;
+				return combine2Points(bx, by);
+			}
+		}
 
-		if (outx == rightX || outx == leftX || outy == topY || outy == bottomY) {
-			bx = outx;
-			by = outy;
-			//return (((long) bx) << 32) | ((long) by);
+		if (outy == topY || outy == bottomY) {
+			if (leftX <= outx && outx <= rightX) {
+				bx = outx;
+				by = outy;
+				return combine2Points(bx, by);
+			}
 		}
 		return -1L;
 	}

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

@@ -69,4 +69,7 @@
     <string name="timeline_no_data">Žádná data</string>
     <string name="unit_of_length_descr">Zvolte, v čem se měří vzdálenost.</string>
     <string name="units_and_formats">Jednotky a formáty</string>
+    <string name="shared_string_enabled">Povolen</string>
+    <string name="unit_of_length">Jednotky vzdálenosti</string>
+    <string name="shared_string_appearance">Vzhled</string>
 </resources>

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

@@ -141,7 +141,7 @@
     <string name="si_mi_meters">Millas/metros</string>
     <string name="shared_string_hour_short">h</string>
     <string name="shared_string_minute_short">min</string>
-    <string name="shared_string_second_short">seg</string>
+    <string name="shared_string_second_short">s</string>
     <string name="welcome_descr">El <b>rastreador de OsmAnd</b> (en inglés como «OsmAnd Tracker»), permite compartir tu ubicación y ver la de otros en OsmAnd.<br/>
         <br/>La aplicación utiliza la API de Telegram, por lo que necesita una cuenta de Telegram.</string>
     <string name="my_location">Mi ubicación</string>

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

@@ -244,4 +244,8 @@
     <string name="monitoring_is_disabled">La surveillance est désactivée</string>
     <string name="osmand_connect_desc">Choisissez la version d\'OsmAnd qu\'OsmAnd Tracker utilise pour afficher les positions.</string>
     <string name="disconnect_from_telegram_desc">Pour révoquer l\'accès au partage de localisation. Ouvrez Telegram, allez dans Paramètres → Vie privée et sécurité → Sessions, et terminez la session OsmAnd Tracker.</string>
+    <string name="no_location_permission">L\'application n\'a pas l\'autorisation d\'accéder aux données de localisation.</string>
+    <string name="start_location_sharing">Partager la position</string>
+    <string name="show_on_map">Afficher sur la carte</string>
+    <string name="already_registered_in_telegram">Vous avez besoin d\'un compte Telegram enregistré et d\'un numéro de téléphone</string>
 </resources>

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

@@ -156,7 +156,7 @@
     <string name="search_contacts_descr">Zoek door al uw groepen en contacten.</string>
     <string name="type_contact_or_group_name">Type contact- of groepnaam</string>
     <string name="shared_string_search">Zoek</string>
-    <string name="shared_string_appearance">Toon als</string>
+    <string name="shared_string_appearance">Weergave</string>
     <string name="time_on_the_move">Tijd in beweging</string>
     <string name="background_work">Achtergond uitvoeringen</string>
     <string name="time_ago">sinds</string>

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

@@ -139,7 +139,7 @@
     <string name="last_available_location">Последнее местоположение</string>
     <string name="sharing_status">Статус отправки</string>
     <string name="location_sharing_status">Трансляция: %1$s</string>
-    <string name="shared_string_enabled">Включен</string>
+    <string name="shared_string_enabled">Включён</string>
     <string name="shared_string_status">Статус</string>
     <string name="no_gps_connection">Отсутствует GPS</string>
     <string name="no_internet_connection">Отсутствует интернет</string>

OsmAnd/build.gradle

@@ -52,7 +52,7 @@ android {
 		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
-		// generatedDensities = []
+		vectorDrawables.generatedDensities = ['hdpi']
 	}
 
 	lintOptions {
@@ -84,7 +84,7 @@ android {
 		noCompress "qz"
 		cruncherEnabled = false
 		// Flag notifies aapt to keep the attribute IDs around
-		// additionalParameters "--no-version-vectors"
+		additionalParameters "--no-version-vectors"
 	}
 
 	dexOptions {
@@ -361,18 +361,33 @@ task copyPoiCategories(type: Copy) {
 	into "assets"
 }
 
-task copyStyleIcons(type: Sync) {
-	from "../../resources/rendering_styles/style-icons/"
-	into "res/"
+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  "**/mm_*", "**/h_*"
+		exclude  "**/h_*"
 	}
 }
 
-task copyPOIIcons(type: Sync) {
-	from "../../resources/rendering_styles/drawable-mx/"
+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 {
@@ -418,8 +433,9 @@ task collectExternalResources {
 			collectFonts,
 			collectHelpContentsAssets,
 			collectHelpContentsStyle,
-			copyStyleIcons,
-			copyPOIIcons,
+			copyMapShaderIcons,
+			copyMapPOIIcons,
+			copyLargePOIIcons,
 			updateNoTranslate,
 			validateTranslate,
 			copyWidgetIcons,

OsmAnd/res/drawable/ic_action_icon_hide_dark.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.2929,1.2929C3.6834,0.9024 4.3166,0.9024 4.7071,1.2929L22.7071,19.2929C23.0976,19.6834 23.0976,20.3166 22.7071,20.7071C22.3166,21.0976 21.6834,21.0976 21.2929,20.7071L3.2929,2.7071C2.9024,2.3166 2.9024,1.6834 3.2929,1.2929Z"
+      android:fillColor="#1E1F20"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2.2929,2.2929C2.6834,1.9024 3.3166,1.9024 3.7071,2.2929L21.7071,20.2929C22.0976,20.6834 22.0976,21.3166 21.7071,21.7071C21.3166,22.0976 20.6834,22.0976 20.2929,21.7071L2.2929,3.7071C1.9024,3.3166 1.9024,2.6834 2.2929,2.2929Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/ic_action_icon_hide_white.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3.2929,1.2929C3.6834,0.9024 4.3166,0.9024 4.7071,1.2929L22.7071,19.2929C23.0976,19.6834 23.0976,20.3166 22.7071,20.7071C22.3166,21.0976 21.6834,21.0976 21.2929,20.7071L3.2929,2.7071C2.9024,2.3166 2.9024,1.6834 3.2929,1.2929Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M2.2929,2.2929C2.6834,1.9024 3.3166,1.9024 3.7071,2.2929L21.7071,20.2929C22.0976,20.6834 22.0976,21.3166 21.7071,21.7071C21.3166,22.0976 20.6834,22.0976 20.2929,21.7071L2.2929,3.7071C1.9024,3.3166 1.9024,2.6834 2.2929,2.2929Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml

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

OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml

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

OsmAnd/res/layout/expandable_list_item_category.xml

@@ -18,8 +18,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="@dimen/list_content_padding"
-        android:paddingStart="@dimen/list_content_padding"
+        android:paddingLeft="@dimen/context_menu_padding_margin_large"
+        android:paddingStart="@dimen/context_menu_padding_margin_large"
         android:paddingRight="0dp"
         android:paddingEnd="0dp"
         android:minHeight="@dimen/bottom_sheet_list_item_height"
@@ -37,8 +37,8 @@
 
         <ImageView
             android:id="@+id/category_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/standard_icon_size"
+            android:layout_height="@dimen/standard_icon_size"
             android:layout_gravity="center_vertical"/>
 
         <net.osmand.plus.widgets.TextViewEx
@@ -46,13 +46,13 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="@dimen/list_content_padding_large"
+            android:layout_marginLeft="@dimen/card_content_padding_large"
             android:layout_weight="1"
             android:textColor="?android:textColorPrimary"
             android:textSize="@dimen/default_list_text_size"
             osmand:typeface="@string/font_roboto_medium"
             tools:text="Category name"
-            android:layout_marginStart="@dimen/list_content_padding_large" />
+            android:layout_marginStart="@dimen/card_content_padding_large" />
 
         <ImageView
             android:id="@+id/options"
@@ -71,7 +71,7 @@
 
         <ImageView
             android:id="@+id/explist_indicator"
-            android:layout_width="24dp"
+            android:layout_width="@dimen/context_menu_padding_margin_large"
             android:layout_height="match_parent"
             android:scaleType="center"
             android:layout_gravity="center_vertical"

OsmAnd/res/layout/favorites_list_item.xml

@@ -30,10 +30,10 @@
         android:minHeight="@dimen/favorites_list_item_height"
         android:layout_gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/list_header_padding"
-        android:paddingLeft="@dimen/list_header_padding"
-        android:paddingEnd="@dimen/list_header_padding"
-        android:paddingRight="@dimen/list_header_padding">
+        android:paddingStart="@dimen/list_header_text_left_margin"
+        android:paddingLeft="@dimen/list_header_text_left_margin"
+        android:paddingEnd="@dimen/list_header_text_left_margin"
+        android:paddingRight="@dimen/list_header_text_left_margin">
 
         <FrameLayout
             android:layout_width="@dimen/favorites_icon_size"
@@ -67,10 +67,10 @@
             android:layout_gravity="center_vertical"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:layout_marginStart="@dimen/favorites_icon_right_margin"
-            android:layout_marginLeft="@dimen/favorites_icon_right_margin"
-            android:layout_marginEnd="@dimen/favorites_icon_right_margin"
-            android:layout_marginRight="@dimen/favorites_icon_right_margin"
+            android:layout_marginStart="@dimen/context_menu_padding_margin_large"
+            android:layout_marginLeft="@dimen/context_menu_padding_margin_large"
+            android:layout_marginEnd="@dimen/context_menu_padding_margin_large"
+            android:layout_marginRight="@dimen/context_menu_padding_margin_large"
             android:paddingTop="@dimen/context_menu_padding_margin_small"
             android:paddingBottom="@dimen/context_menu_padding_margin_small">
 

OsmAnd/res/layout/fragment_subcategories.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="?attr/activity_background_color"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/actionModeBackground"
+            android:minHeight="@dimen/dashboard_map_toolbar"
+            android:theme="?attr/toolbar_theme"
+            app:contentInsetLeft="54dp"
+            app:contentInsetStart="54dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14dp"
+                    android:layout_marginBottom="14dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@null"
+                        android:ellipsize="end"
+                        android:lines="1"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:textColor="@color/color_white"
+                        android:textSize="@dimen/default_list_text_size_large"
+                        tools:text="Education" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </androidx.appcompat.widget.Toolbar>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:id="@+id/search_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/card_row_min_height"
+            android:background="?attr/bg_color"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/search_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding"
+                android:layout_marginLeft="@dimen/content_padding"
+                android:layout_marginEnd="@dimen/list_content_padding_large"
+                android:layout_marginRight="@dimen/list_content_padding_large"
+                tools:src="@drawable/ic_action_search_dark" />
+
+            <EditText
+                android:id="@+id/search"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:hint="@string/search_poi_types"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_list_text_size" />
+
+            <ImageView
+                android:id="@+id/search_close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/list_item_button_padding"
+                android:layout_marginLeft="@dimen/list_item_button_padding"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                tools:src="@drawable/ic_action_cancel" />
+
+        </LinearLayout>
+
+        <include layout="@layout/divider" />
+
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:drawSelectorOnTop="true" />
+
+</LinearLayout>

OsmAnd/res/layout/list_item_description.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/list_shadow_header" />
+
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/bg_color"
+        android:lineSpacingMultiplier="@dimen/line_spacing_multiplier_description"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingTop="@dimen/list_header_settings_top_margin"
+        android:paddingEnd="@dimen/content_padding"
+        android:paddingBottom="@dimen/list_header_settings_top_margin"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="@dimen/default_desc_text_size"
+        tools:text="@string/select_data_to_import" />
+
+</LinearLayout>

OsmAnd/res/layout/list_item_header.xml

@@ -41,6 +41,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
+                android:textColor="?android:textColorPrimary"
                 android:ellipsize="end"
                 android:gravity="center_vertical"
                 android:maxLines="1"

OsmAnd/res/layout/list_item_icon24_and_menu.xml

@@ -1,96 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"
+    android:gravity="center_vertical"
     android:minHeight="60dp"
+    android:orientation="horizontal"
     tools:layout_height="60dp">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        tools:src="@drawable/ic_action_gabout_dark"/>
+        android:layout_marginLeft="16dp"
+        tools:src="@drawable/ic_action_gabout_dark" />
 
     <LinearLayout
-        android:id="@+id/text_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_toEndOf="@+id/icon"
-        android:layout_toLeftOf="@+id/secondary_icon"
-        android:layout_toRightOf="@+id/icon"
-        android:layout_toStartOf="@+id/secondary_icon"
-        android:minHeight="60dp"
+        android:layout_marginLeft="16dp"
+        android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/title"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="@style/TextAppearance.ListItemTitle"
-            tools:text="Some title text"/>
+            android:orientation="horizontal">
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/description"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:textSize="@dimen/default_desc_text_size"
-            tools:text="Some very long subtitle text, that won't fit into one line"/>
+            <LinearLayout
+                android:id="@+id/text_wrapper"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:gravity="center_vertical"
+                android:minHeight="60dp"
+                android:orientation="vertical">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/TextAppearance.ListItemTitle"
+                    tools:text="Some title text" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/description"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:lines="1"
+                    android:textSize="@dimen/default_desc_text_size"
+                    tools:text="Some very long subtitle text, that won't fit into one line" />
+
+            </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/secondary_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="16dp"
+                tools:src="@drawable/ic_action_gabout_dark" />
+
+            <View
+                android:id="@+id/divider_vertical"
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/content_padding"
+                android:layout_marginLeft="@dimen/content_padding"
+                android:layout_marginTop="@dimen/content_padding_small"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                android:layout_marginBottom="@dimen/content_padding_small"
+                android:background="?attr/dashboard_divider"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/toggle_item"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginEnd="16dp"
+                android:layout_marginRight="16dp"
+                android:focusable="false" />
+
+        </LinearLayout>
 
         <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1"/>
+            android:id="@+id/divider"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:background="?attr/dashboard_divider" />
+
     </LinearLayout>
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/secondary_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="16dp"
-        android:layout_toLeftOf="@+id/toggle_item"
-        android:layout_toStartOf="@+id/toggle_item"
-        tools:src="@drawable/ic_action_gabout_dark"/>
-
-    <androidx.appcompat.widget.SwitchCompat
-        android:id="@+id/toggle_item"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_gravity="center_vertical"
-        android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
-        android:focusable="false"/>
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="1dp"
-        android:layout_alignLeft="@+id/text_wrapper"
-        android:layout_alignParentBottom="true"
-        android:layout_alignStart="@+id/text_wrapper"
-        android:background="?attr/dashboard_divider"/>
-
-</RelativeLayout>
+</LinearLayout>

OsmAnd/res/layout/purchase_dialog_card_button_ex.xml

@@ -16,10 +16,10 @@
 		android:layout_height="wrap_content"
 		android:baselineAligned="false"
 		android:orientation="vertical"
-		android:paddingLeft="@dimen/card_padding"
-		android:paddingRight="@dimen/card_padding"
-		android:paddingEnd="@dimen/card_padding"
-		android:paddingStart="@dimen/card_padding">
+		android:paddingLeft="@dimen/list_content_padding"
+		android:paddingRight="@dimen/list_content_padding"
+		android:paddingEnd="@dimen/list_content_padding"
+		android:paddingStart="@dimen/list_content_padding">
 
 		<LinearLayout
 			android:layout_width="match_parent"
@@ -48,15 +48,48 @@
 				osmand:typeface="@string/font_roboto_regular"
 				tools:visibility="visible" />
 
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/description"
+			<LinearLayout
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:textColor="?attr/dialog_text_description_color"
-				android:textSize="@dimen/default_desc_text_size"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="$0.62 / month • Save 68%" />
+				android:layout_height="match_parent">
 
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/description"
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:layout_weight="1"
+					android:layout_gravity="center"
+					android:textColor="?attr/dialog_text_description_color"
+					android:textSize="@dimen/default_desc_text_size"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text="$0.62 / month" />
+
+				<LinearLayout
+					android:id="@+id/button_discount_view"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:background="@drawable/btn_border_bg_light"
+					android:visibility="gone"
+					tools:visibility="visible">
+
+					<net.osmand.plus.widgets.TextViewEx
+						android:id="@+id/button_discount_title"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:paddingStart="@dimen/content_padding_small"
+						android:paddingLeft="@dimen/content_padding_small"
+						android:paddingEnd="@dimen/content_padding_small"
+						android:paddingRight="@dimen/content_padding_small"
+						android:paddingTop="@dimen/subHeaderPadding"
+						android:paddingBottom="@dimen/subHeaderPadding"
+						android:gravity="end"
+						android:letterSpacing="@dimen/text_button_letter_spacing"
+						android:textColor="@color/text_color_secondary_light"
+						android:textSize="@dimen/default_desc_text_size"
+						tools:text="Save 10%"
+						osmand:typeface="@string/font_roboto_medium" />
+				</LinearLayout>
+			</LinearLayout>
 		</LinearLayout>
 
 		<LinearLayout
@@ -64,7 +97,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center"
-			android:background="?attr/btn_round_border_2">
+			android:background="?attr/purchase_dialog_outline_btn_bg">
 
 			<LinearLayout
 				android:id="@+id/button"
@@ -75,13 +108,6 @@
 				android:orientation="horizontal"
 				android:padding="@dimen/list_header_padding">
 
-				<ProgressBar
-					android:id="@+id/button_progress"
-					android:layout_width="@dimen/card_button_progress_size_small"
-					android:layout_height="@dimen/card_button_progress_size_small"
-					android:indeterminate="true"
-					android:visibility="gone" />
-
 				<net.osmand.plus.widgets.TextViewEx
 					android:id="@+id/button_title"
 					android:layout_width="match_parent"
@@ -96,7 +122,6 @@
 					tools:text="7,99€ / year" />
 
 			</LinearLayout>
-
 		</LinearLayout>
 
 		<LinearLayout
@@ -138,7 +163,7 @@
 		android:id="@+id/div"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
-		android:layout_marginTop="@dimen/content_padding_small"
+		android:layout_marginTop="@dimen/content_padding"
 		android:background="?attr/wikivoyage_card_divider_color"
 		android:visibility="gone" />
 

OsmAnd/res/layout/purchase_dialog_fragment.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -31,7 +30,7 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:padding="@dimen/list_content_padding"
                     android:src="@drawable/ic_arrow_back"
-                    android:tint="@color/icon_color_default_light"/>
+                    android:tint="@color/icon_color_default_light" />
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/title"
@@ -43,7 +42,7 @@
                     android:textColor="?attr/dialog_title_color"
                     android:textSize="@dimen/dialog_header_text_size"
                     osmand:typeface="@string/font_roboto_medium"
-	                android:layout_marginStart="@dimen/list_header_padding" />
+                    android:layout_marginStart="@dimen/list_header_padding" />
 
             </LinearLayout>
 
@@ -54,8 +53,8 @@
                 android:layout_marginLeft="@dimen/list_content_padding_large"
                 android:layout_marginRight="@dimen/list_content_padding_large"
                 android:orientation="vertical"
-	            android:layout_marginStart="@dimen/list_content_padding_large"
-	            android:layout_marginEnd="@dimen/list_content_padding_large">
+                android:layout_marginStart="@dimen/list_content_padding_large"
+                android:layout_marginEnd="@dimen/list_content_padding_large">
 
                 <LinearLayout
                     android:id="@+id/info_container"
@@ -70,28 +69,48 @@
                         android:textColor="?attr/dialog_description_color"
                         android:textSize="@dimen/default_list_text_size"
                         osmand:typeface="@string/font_roboto_regular"
-                        tools:text="@string/purchase_dialog_travel_description"/>
+                        tools:text="@string/purchase_dialog_travel_description" />
 
                 </LinearLayout>
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:id="@+id/cards_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"/>
+                android:orientation="vertical" />
+
+            <LinearLayout
+                android:id="@+id/plan_info_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/list_content_padding"
+                android:layout_marginRight="@dimen/list_content_padding"
+                android:layout_marginStart="@dimen/list_content_padding"
+                android:layout_marginEnd="@dimen/list_content_padding"
+                android:orientation="vertical">
+
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/plan_info_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="?attr/dialog_description_color"
+                    android:textSize="@dimen/default_desc_text_size"
+                    osmand:typeface="@string/font_roboto_regular"
+                    android:text="@string/osm_live_payment_subscription_management" />
+
+            </LinearLayout>
 
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/card_padding"
                 android:layout_marginRight="@dimen/card_padding"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/list_header_padding"
                 android:background="?attr/wikivoyage_travel_card_bg"
-	            android:layout_marginEnd="@dimen/card_padding"
-	            android:layout_marginStart="@dimen/card_padding">
+                android:layout_marginEnd="@dimen/card_padding"
+                android:layout_marginStart="@dimen/card_padding">
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/button_restore"
@@ -109,8 +128,8 @@
                     android:textColor="?attr/wikivoyage_active_color"
                     android:textSize="@dimen/text_button_text_size"
                     osmand:typeface="@string/font_roboto_regular"
-	                android:paddingStart="@dimen/list_content_padding"
-	                android:paddingEnd="@dimen/list_content_padding" />
+                    android:paddingStart="@dimen/list_content_padding"
+                    android:paddingEnd="@dimen/list_content_padding" />
 
                 <ProgressBar
                     android:id="@+id/progress_bar"
@@ -132,8 +151,8 @@
                 android:layout_marginRight="@dimen/card_padding"
                 android:layout_marginTop="4dp"
                 android:background="?attr/wikivoyage_travel_card_bg"
-	            android:layout_marginEnd="@dimen/card_padding"
-	            android:layout_marginStart="@dimen/card_padding">
+                android:layout_marginEnd="@dimen/card_padding"
+                android:layout_marginStart="@dimen/card_padding">
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/button_later"
@@ -151,8 +170,8 @@
                     android:textColor="?attr/wikivoyage_active_color"
                     android:textSize="@dimen/text_button_text_size"
                     osmand:typeface="@string/font_roboto_regular"
-	                android:paddingStart="@dimen/list_content_padding"
-	                android:paddingEnd="@dimen/list_content_padding" />
+                    android:paddingStart="@dimen/list_content_padding"
+                    android:paddingEnd="@dimen/list_content_padding" />
 
             </FrameLayout>
 

OsmAnd/res/layout/purchase_dialog_osm_live_card.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:layout_marginLeft="@dimen/card_padding"
@@ -49,7 +48,7 @@
 		android:layout_marginRight="@dimen/card_padding"
 		android:layout_marginBottom="@dimen/list_header_padding"
 		android:text="@string/osm_live_payment_header"
-		android:textColor="?attr/dialog_text_description_color"
+		android:textColor="@color/preference_category_title"
 		android:textSize="@dimen/default_desc_text_size"
 		osmand:typeface="@string/font_roboto_regular"
 		android:layout_marginEnd="@dimen/card_padding"
@@ -74,7 +73,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginBottom="2dp"
-		android:paddingBottom="@dimen/content_padding_small"
+		android:paddingBottom="@dimen/content_padding"
 		android:orientation="vertical"
 		android:visibility="gone" />
 

OsmAnd/res/layout/search_custom_poi.xml

@@ -55,6 +55,56 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
+    <LinearLayout
+        android:id="@+id/search_container"
+        android:layout_width="match_parent"
+        android:focusableInTouchMode="true"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/card_row_min_height"
+            android:background="?attr/bg_color"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/search_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/content_padding"
+                android:layout_marginLeft="@dimen/content_padding"
+                android:layout_marginEnd="@dimen/list_content_padding_large"
+                android:layout_marginRight="@dimen/list_content_padding_large"
+                tools:src="@drawable/ic_action_search_dark" />
+
+            <EditText
+                android:id="@+id/search"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:hint="@string/search_poi_types"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textSize="@dimen/default_list_text_size" />
+
+            <ImageView
+                android:id="@+id/search_close"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/list_item_button_padding"
+                android:layout_marginLeft="@dimen/list_item_button_padding"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                tools:src="@drawable/ic_action_cancel" />
+
+        </LinearLayout>
+
+        <include layout="@layout/divider" />
+
+    </LinearLayout>
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -83,45 +133,49 @@
         android:id="@+id/bottomBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="52dp"
-        android:background="?attr/color_dialog_buttons"
+        android:background="?attr/bg_color"
+        android:minHeight="@dimen/dialog_button_ex_height"
         android:visibility="gone"
         tools:visibility="visible">
 
-        <LinearLayout
+        <FrameLayout
+            android:id="@+id/button"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/selectableItemBackground"
-            android:orientation="horizontal">
+            android:background="?attr/color_dialog_buttons">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/barTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textColor="@color/color_white"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="16dp"
-                android:textSize="@dimen/default_desc_text_size"
-                tools:text="Selected: 3 categories"
-	            android:layout_marginStart="16dp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"
+                android:background="?attr/selectableItemBackground"
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/barButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/default_sub_text_size"
-                osmand:typeface="@string/font_roboto_medium"
-                osmand:textAllCapsCompat="true"
-                android:text="@string/shared_string_show"
-	            android:layout_marginEnd="20dp"
-	            android:layout_marginStart="20dp" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/barTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/default_list_text_size"
+                    tools:text="Show" />
 
-        </LinearLayout>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/barSubTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginEnd="20dp"
+                    android:textColor="@color/text_color_primary_dark"
+                    android:textSize="@dimen/default_desc_text_size"
+                    osmand:typeface="@string/font_roboto_medium"
+                    tools:text="Selected categories: 3" />
+
+            </LinearLayout>
+
+        </FrameLayout>
 
     </LinearLayout>
 

OsmAnd/res/layout/select_all_switch_list_item.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <include layout="@layout/list_shadow_header" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/context_menu_action_buttons_h"
+        android:background="?attr/bg_color">
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/select_all"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:letterSpacing="0.01"
+            android:lineSpacingExtra="@dimen/line_spacing_extra_description"
+            android:padding="@dimen/content_padding"
+            android:text="@string/shared_string_select_all"
+            android:textSize="@dimen/default_list_text_size" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="bottom"
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginLeft="@dimen/content_padding"
+            android:background="?attr/dashboard_divider" />
+
+    </FrameLayout>
+
+</LinearLayout>

OsmAnd/res/values-ar/strings.xml

@@ -874,11 +874,11 @@
     <string name="index_name_gb">أوروبا - بريطانيا العظمى</string>
     <string name="route_preferences">تفضيلات الطريق</string>
     <string name="route_info">معلومات الطريق</string>
-    <string name="routing_attr_avoid_toll_name">لا توجد طرق رسوم</string>
+    <string name="routing_attr_avoid_toll_name">طرق برسوم</string>
     <string name="routing_attr_avoid_toll_description">تجنب الطرق برسوم</string>
     <string name="routing_attr_avoid_unpaved_name">تجنب الطرق غير المعبّدة</string>
     <string name="routing_attr_avoid_unpaved_description">اجتناب الطرق الترابية والوعرة</string>
-    <string name="routing_attr_avoid_ferries_name">لا العبارات</string>
+    <string name="routing_attr_avoid_ferries_name">تجنب العبارات</string>
     <string name="routing_attr_weight_name">وزن المركبة</string>
     <string name="android_19_location_disabled">منذ نسخة أندرويد كتكات 4.4، لا يمكنك تحميل أو تحديث الخرائط في مكان التخزين السابق (%s). هل تريد التغيير إلى مكان مسموح ونسخ كل الملفات إليه ؟ ملاحظات: 1-الملفات القديمة ستبقى كما هي (يمكن حذفها يدويا). 
 \n
@@ -1241,7 +1241,7 @@
     <string name="routing_attr_prefer_motorway_name">تفضيل طرق الدراجات النارية</string>
     <string name="routing_attr_prefer_motorway_description">تفضيل طرق الدراجات النارية</string>
     <string name="routing_attr_avoid_ferries_description">تجنب العبّارات</string>
-    <string name="routing_attr_avoid_motorway_name">لا طرق السريعة</string>
+    <string name="routing_attr_avoid_motorway_name">الطرق السريعة</string>
     <string name="routing_attr_avoid_motorway_description">تجنب طرق الدراجات النارية</string>
     <string name="routing_attr_weight_description">تحديد الوزن الأعلى المسموح به على الطرق.</string>
     <string name="copying_osmand_files_descr">نسخ ملفات أوسماند إلى المسار الجديد (%s)…</string>
@@ -1616,7 +1616,7 @@
     <string name="search_near_map">البحث قرب مركز الخريطة الحالية</string>
     <string name="active_markers">نشطة</string>
     <string name="map_markers">علامات الخريطة</string>
-    <string name="routing_attr_avoid_borders_name">منع تخطي الحدود</string>
+    <string name="routing_attr_avoid_borders_name">تخطي الحدود</string>
     <string name="impassable_road_desc">حدد الطرق التي تريد تجنبها أثناء التنقل.</string>
     <string name="search_categories">الفئات</string>
     <string name="shared_string_near">بالقرب من</string>
@@ -1855,7 +1855,7 @@
     <string name="nm">ميل بحري</string>
     <string name="nm_h">ميل بحري/س</string>
     <string name="simulate_your_location_descr">إجراء محاكاة تخيلية باستخدام توجيه نشط أو مسار مسجل.</string>
-    <string name="routing_attr_avoid_shuttle_train_name">لا خدمة نقل القطار</string>
+    <string name="routing_attr_avoid_shuttle_train_name">خدمة النقل بالقطار</string>
     <string name="routing_attr_avoid_shuttle_train_description">يتجنب استخدام القطارات المكوكية</string>
     <string name="traffic_warning_hazard">خطر</string>
     <string name="rendering_value_boldOutline_name">مخطط واضح</string>
@@ -2699,7 +2699,7 @@
     <string name="osm_live_payment_annual_title">سنوي</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / شهر</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / شهر</string>
-    <string name="osm_live_payment_discount_descr">وفر %1$s.</string>
+    <string name="osm_live_payment_discount_descr">وفر %1$s</string>
     <string name="osm_live_payment_current_subscription">الاشتراك الحالي</string>
     <string name="osm_live_payment_renews_monthly">يجدد شهريا</string>
     <string name="osm_live_payment_renews_quarterly">تجديد فصلي</string>
@@ -3633,4 +3633,25 @@
     <string name="lang_lmo">لومبارد</string>
     <string name="custom_color">لون مخصص</string>
     <string name="extra_maps_menu_group">خرائط إضافية</string>
+    <string name="download_unsupported_action">%1$s إجراء غير معتمد</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">سيتم احتساب الدفع لحساب Google Play الخاص بك في تأكيد الشراء.
+\n
+\nيتم تجديد الاشتراك تلقائيًا ما لم يتم إلغاؤه قبل تاريخ التجديد. سيتم تحميل حسابك لفترة التجديد (شهر / ثلاثة أشهر / سنة) فقط في تاريخ التجديد.
+\n
+\nيمكنك إدارة وإلغاء الاشتراكات الخاصة بك عن طريق الذهاب إلى إعدادات Google Play الخاصة بك.</string>
+    <string name="search_poi_types">البحث عن أنواع poi</string>
+    <string name="search_poi_types_descr">اجمع أنواع النقاط المهمة من فئات مختلفة. اضغط على مفتاح التبديل لتحديد الكل ، ثم انقر على الجانب الأيسر لاختيار الفئة.</string>
+    <string name="tracker_item">متتبع أوسماند</string>
+    <string name="mapillary_item">أوسماند+ مابيلاري</string>
+    <string name="quick_action_item">إجراء سريع</string>
+    <string name="radius_ruler_item">مسطرة البوصلة</string>
+    <string name="measure_distance_item">قياس المسافة</string>
+    <string name="travel_item">السفر (Wikivoyage و Wikipedia)</string>
+    <string name="map_markers_item">علامات الخريطة</string>
+    <string name="favorites_item">المفضلة</string>
+    <string name="subscription_osmandlive_item">اشتراك أوسماند لايف</string>
+    <string name="osmand_purchases_item">مشتريات أوسماند</string>
+    <string name="legend_item_description">دليل رموز الخريطة</string>
+    <string name="navigation_profiles_item">الملفات الشخصية للملاحة</string>
 </resources>

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

@@ -2846,7 +2846,7 @@ Praparcyjnaj pamiacі %4$s MB (Abmiežavańnie Android %5$s MB, Dalvik %6$s MB).
     <string name="osm_live_payment_annual_title">Štohod</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / miesiac</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiac</string>
-    <string name="osm_live_payment_discount_descr">Aščada %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Aščada %1$s</string>
     <string name="osm_live_payment_current_subscription">Dziejnaja padpiska</string>
     <string name="osm_live_payment_renews_monthly">Abnaŭliajecca štomiesiac</string>
     <string name="osm_live_payment_renews_quarterly">Abnaŭliajecca štokvartaĺna</string>

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

@@ -1298,4 +1298,12 @@
     <string name="si_min_km">Tisdatin deg ukilumitr</string>
     <string name="nm">nmi</string>
     <string name="foot">ft</string>
+    <string name="osm_editing_plugin_description">Ttekki deg OpenStreetMap (OSM) srid seg usnas OSMAnd. Amedya: rnu neɣ beddel agazen yelhan n OSM, rnu neɣ beddel tizmilin OSM sakin azen iberdan-ik GPX (aya ilaq umiḍan OSM). OpenStreetMap d tarbaɛt yeldin, tamaḍalant n tkarḍa tazayazt.</string>
+    <string name="osm_settings">Taẓrigt OpenStreetMap</string>
+    <string name="osmand_accessibility_description">Rmed, deg OsmAnd, iɣewwaren n tuffart n yibenk-ik (ṣeggem arured n taɣect-ik n uɛqal n taɣect, seqdec tignit trackball i usemɣer neɣ i urmad n yilɣa s taɣect n wadig-ik).</string>
+    <string name="travel_item">Asikel (Wikivoyage d Wikipedia)</string>
+    <string name="favorites_item">Inurifen</string>
+    <string name="subscription_osmandlive_item">Ajerred - OsmAnd Srid</string>
+    <string name="osmand_purchases_item">Tiɣin deg OsmAnd</string>
+    <string name="navigation_profiles_item">Imuɣna n tunigin</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -2919,7 +2919,7 @@
     <string name="osm_live_payment_annual_title">Штогод</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / месяц</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месяц</string>
-    <string name="osm_live_payment_discount_descr">Ашчада %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ашчада %1$s</string>
     <string name="osm_live_payment_current_subscription">Дзейная падпіска</string>
     <string name="osm_live_payment_renews_monthly">Абнаўляецца штомесяц</string>
     <string name="osm_live_payment_renews_quarterly">Абнаўляецца штоквартал</string>

OsmAnd/res/values-bn/phrases.xml

@@ -80,4 +80,47 @@
     <string name="poi_city_capital">রাজধানী</string>
     <string name="poi_service_general">পরিসেবা</string>
     <string name="poi_cash_withdrawal_bank_card">নগদ উত্তোলন</string>
+    <string name="poi_embassy_type">ধরণ</string>
+    <string name="poi_animal_training_type">ধরণ</string>
+    <string name="poi_telescope_type">ধরণ</string>
+    <string name="poi_vending_type">ভেন্ডিং টাইপ</string>
+    <string name="poi_fuel_avia_type">জ্বালানির ধরণ (এভিয়া)</string>
+    <string name="poi_washing_machine">ওয়াশিং মেশিন</string>
+    <string name="poi_tents">তাঁবু</string>
+    <string name="poi_massage_type">ম্যাসাজ টাইপ</string>
+    <string name="poi_health_specialty">স্বাস্থ্য বিশেষত্ব</string>
+    <string name="poi_diet">ডায়েট</string>
+    <string name="poi_nudism">নগ্নতাবাদ</string>
+    <string name="poi_beach_surface_type">পৃষ্ঠতল</string>
+    <string name="poi_water_characteristic">জলের বৈশিষ্ট্য</string>
+    <string name="poi_seasonal">মৌসুমী</string>
+    <string name="poi_fireplace">অগ্নিকুণ্ড</string>
+    <string name="poi_shelter_type">ধরণ</string>
+    <string name="poi_recycling_accepted_waste">গৃহীত বর্জ্য</string>
+    <string name="poi_recycling_type">ধরণ</string>
+    <string name="poi_beauty_salon_service">সেবা</string>
+    <string name="poi_microbrewery">মাইক্রোব্রিয়ারি</string>
+    <string name="poi_cocktails">ককটেল</string>
+    <string name="poi_takeaway">টেক আওয়ায়</string>
+    <string name="poi_drive_through">ড্রাইভ থ্রু</string>
+    <string name="poi_drive_in">ড্রাইভ ইন</string>
+    <string name="poi_delivery">ডেলিভারি</string>
+    <string name="poi_smoking">ধূমপান</string>
+    <string name="poi_fee">ফি</string>
+    <string name="poi_outdoor_seating">বাইরে বসার ব্যবস্থা</string>
+    <string name="poi_theatre_genre">জেনরে</string>
+    <string name="poi_piste_grooming">স্কি স্থান এর গ্রুমিং</string>
+    <string name="poi_piste_difficulty">স্কি স্থান এর কাঠিন্য</string>
+    <string name="poi_resort_type">ধরণ</string>
+    <string name="poi_backcountry">গ্রাম্য এলাকা</string>
+    <string name="poi_scout_camp">স্কাউট ক্যাম্প</string>
+    <string name="poi_clock_option">অতিরিক্ত</string>
+    <string name="poi_information_contents">বিষয়বস্তু</string>
+    <string name="poi_information_type">ধরণ</string>
+    <string name="poi_denomination">আখ্যা</string>
+    <string name="poi_religion_type">ধর্ম</string>
+    <string name="poi_star_rating">ষ্টার রেটিং</string>
+    <string name="poi_archaeological_site_type">ধরণ</string>
+    <string name="poi_free_flying_characteristics">বিশিষ্ট</string>
+    <string name="poi_healthcare_alternative_types">বিশিষ্টতা</string>
 </resources>

OsmAnd/res/values-bn/strings.xml

@@ -21,4 +21,7 @@
     <string name="recalc_angle_dialog_title">আমার অবস্থান ও গন্তব্য এর মধ্যকার সর্বনিম্ন কোন</string>
     <string name="shared_string_preparing">তৈরী করা হচ্ছে</string>
     <string name="shared_string_nothing_selected">কিছু নির্বাচন করা হয়নি</string>
+    <string name="osmand_purchases_item">ওএসএমও কেনাকাটা</string>
+    <string name="legend_item_description">একটি মানচিত্রের প্রতীকের জন্য গাইড</string>
+    <string name="navigation_profiles_item">ন্যাভিগেশন প্রোফাইল</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -2874,7 +2874,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Anualment</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Desa %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Desa %1$s</string>
     <string name="osm_live_payment_current_subscription">Subscripció actual</string>
     <string name="osm_live_payment_renews_monthly">Renovació mensual</string>
     <string name="osm_live_payment_renews_quarterly">Renovació trimestral</string>

OsmAnd/res/values-cs/strings.xml

@@ -1548,7 +1548,7 @@ Délka %2$s</string>
     <string name="rendering_value_red_name">Červená</string>
     <string name="rendering_value_default13_name">Výchozí (13)</string>
     <string name="rendering_attr_currentTrackColor_name">GPX barva</string>
-    <string name="rendering_attr_currentTrackWidth_name">GPX šířka</string>
+    <string name="rendering_attr_currentTrackWidth_name">Šířka GPX</string>
     <string name="rendering_value_yellow_name">Žlutá</string>
     <string name="rendering_value_green_name">Zelená</string>
     <string name="rendering_value_lightgreen_name">Světlezelená</string>
@@ -2827,7 +2827,7 @@ Zobrazená oblast: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Ročně</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / měsíc</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / měsíc</string>
-    <string name="osm_live_payment_discount_descr">Ušetříte %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ušetříte %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuální předplatné</string>
     <string name="osm_live_payment_renews_monthly">Obnovuje se měsíčně</string>
     <string name="osm_live_payment_renews_quarterly">Obnovuje se čtvrtletně</string>
@@ -3379,4 +3379,50 @@ 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">Hlavní akce</string>
+    <string name="additional_actions_descr">Tyto akce jsou dostupné po stisknutí tlačítka “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="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>
+    <string name="lang_yo">Jorubština</string>
+    <string name="lang_war">Warajština</string>
+    <string name="lang_uz">Uzbečtina</string>
+    <string name="lang_ur">Urdština</string>
+    <string name="lang_tt">Tatarština</string>
+    <string name="lang_tg">Tádžičtina</string>
+    <string name="lang_sco">Skotština</string>
+    <string name="lang_scn">Sicilština</string>
+    <string name="lang_pnb">Pandžábština</string>
+    <string name="lang_ne">Nepálština</string>
+    <string name="lang_nap">Neapolština</string>
+    <string name="lang_my">Barmština</string>
+    <string name="lang_mn">Mongolština</string>
+    <string name="lang_min">Minangkabauština</string>
+    <string name="lang_mg">Malgaština</string>
+    <string name="lang_ky">Kyrgyzština</string>
+    <string name="lang_kk">Kazaština</string>
+    <string name="lang_jv">Jávština</string>
+    <string name="lang_gu">Gudžarátština</string>
+    <string name="lang_cv">Čuvaština</string>
+    <string name="lang_ce">Čečenština</string>
+    <string name="lang_bar">Bavorština</string>
+    <string name="lang_ba">Baškirština</string>
+    <string name="lang_an">Aragonština</string>
+    <string name="lang_lmo">Lombardština</string>
+    <string name="custom_color">Vlastní barva</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
+\nSvé 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>
+    <string name="download_unsupported_action">Nepodporovaná akce %1$s</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -2858,7 +2858,7 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Årligt</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / måned</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / måned</string>
-    <string name="osm_live_payment_discount_descr">Spar %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Spar %1$s</string>
     <string name="osm_live_payment_current_subscription">Nuværende abonnement</string>
     <string name="osm_live_payment_renews_monthly">Fornyes månedligt</string>
     <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
@@ -3646,4 +3646,17 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="custom_color">Brugerdefineret farve</string>
     <string name="some_articles_may_not_available_in_lang">Nogle Wikipedia-artikler er muligvis ikke tilgængelige på dit sprog.</string>
     <string name="extra_maps_menu_group">Ekstra kort</string>
+    <string name="download_unsupported_action">Ikke understøttet handling %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Søg efter IP-typer</string>
+    <string name="search_poi_types_descr">Kombiner IP-typer fra forskellige kategorier. Tryk på knappen for at vælge alt, tryk på venstre side for valg af kategori.</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Genveje</string>
+    <string name="radius_ruler_item">Radiusmåler</string>
+    <string name="measure_distance_item">Mål afstand</string>
+    <string name="travel_item">Rejser (Wikivoyage og Wikipedia)</string>
+    <string name="map_markers_item">Kortmarkører</string>
+    <string name="favorites_item">Favoritter</string>
+    <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
+    <string name="navigation_profiles_item">Navigationsprofiler</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -1793,7 +1793,7 @@ Lon %2$s</string>
     <string name="activate_srtm_plugin">Bitte die Erweiterung \'Höhenlinien\' aktivieren</string>
     <string name="get_full_version">Vollversion</string>
     <string name="confirm_download_roadmaps">Die reine Straßenkarte wird nicht benötigt, da Sie die Standardkarte haben. Trotzdem herunterladen?</string>
-    <string name="value_downloaded_of_max">%1$,1f von %2$,1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f von %2$.1f MB</string>
     <string name="update_all">Alles aktualisieren (%1$s MB)</string>
     <string name="free_downloads_used">Verbrauchte freie Downloads</string>
     <string name="enter_country_name">Ländernamen eingeben</string>
@@ -1806,7 +1806,7 @@ Lon %2$s</string>
     <string name="access_from_map">Aufruf von der Karte aus</string>
     <string name="favorite_category_add_new">Neue Katagorie erstellen</string>
     <string name="next_proceed">Weiter</string>
-    <string name="file_size_in_mb">%,1f MB</string>
+    <string name="file_size_in_mb">%.1f MB</string>
     <string name="please_specify_poi_type_only_from_list">Bitte einen gültigen POI-Typ angeben oder überspringen.</string>
     <string name="share_osm_edits_subject">OSM-Bearbeitung mit OsmAnd geteilt</string>
     <string name="av_locations_descr">GPX-Datei mit Standorten.</string>
@@ -2864,7 +2864,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Jährlich</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / Monat</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / Monat</string>
-    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Sparen Sie %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuelles Abonnement</string>
     <string name="osm_live_payment_renews_monthly">Verlängert sich monatlich</string>
     <string name="osm_live_payment_renews_quarterly">Verlängert sich vierteljährlich</string>
@@ -3665,7 +3665,23 @@ Lon %2$s</string>
     <string name="lang_ce">Tschetschenisch</string>
     <string name="lang_bar">Bairisch</string>
     <string name="lang_ba">Baschkirisch</string>
-    <string name="main_actions_descr">Die Hauptaktionen enthalten nur 4 Schaltflächen.</string>
+    <string name="main_actions_descr">Hauptaktionen enthalten nur 4 Schaltflächen.</string>
     <string name="additional_actions_descr">Sie können auf diese Aktionen zugreifen, indem Sie auf die Schaltfläche „Aktionen“ tippen.</string>
     <string name="select_wikipedia_article_langs">Wählen Sie die Sprachen aus, in denen Wikipedia-Artikel auf der Karte erscheinen sollen. Sie können zwischen allen verfügbaren Sprachen wechseln, während Sie den Artikel lesen.</string>
+    <string name="hidden_items_descr">Diese Elemente werden aus dem Menü ausgeblendet, aber die dargestellten Optionen oder Plugins funktionieren weiterhin.</string>
+    <string name="reorder_or_hide_from">Ordnen Sie Elemente aus %1$s neu an oder blenden Sie sie aus.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">Die Bezahlung wird nach der Bestätigung des Kaufs von ihrem Google Play Account abgebucht. 
+\n
+\nDas Abonnement verlängert sich automatisch, sofern es nicht vor dem Verlängerungsdatum gekündigt wird. Erst nach dem Verlängerungsdatum wird die Bezahlung für die Verlängerungsperiode (1 Monat/ 3 Monate/ 1 Jahr) von ihrem Account abgebucht.
+\n
+\nSie können ihre Abonnements in ihrem Google Play Einstellungen verwalten oder kündigen.</string>
+    <string name="search_poi_types">Suche nach POI-Typen</string>
+    <string name="search_poi_types_descr">Kombinieren Sie POI-Typen aus verschiedenen Kategorien. Tippen Sie auf den Schalter, um alle auszuwählen, tippen Sie auf die linke Seite, um die Kategorie auszuwählen.</string>
+    <string name="shared_string_divider"/>
+    <string name="quick_action_item">Schnellaktion</string>
+    <string name="radius_ruler_item">Zirkel</string>
+    <string name="measure_distance_item">Entfernungsmesser</string>
+    <string name="map_markers_item">Kartenmarkierungen</string>
+    <string name="favorites_item">Favoriten</string>
 </resources>

OsmAnd/res/values-el/strings.xml

@@ -2831,7 +2831,7 @@
     <string name="osm_live_payment_annual_title">Ετήσια</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / μήνα</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / μήνα</string>
-    <string name="osm_live_payment_discount_descr">Εξοικονομήστε %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Εξοικονομήστε %1$s</string>
     <string name="osm_live_payment_current_subscription">Η τρέχουσα εγγραφή</string>
     <string name="osm_live_payment_renews_monthly">Μηνιαίες ανανεώσεις</string>
     <string name="osm_live_payment_renews_quarterly">Τριμηνιαίες ανανεώσεις</string>

OsmAnd/res/values-eo/phrases.xml

@@ -892,7 +892,7 @@
     <string name="poi_dock">Doko</string>
     <string name="poi_cutline">Senarba strio</string>
     <string name="poi_shower">Duŝejo</string>
-    <string name="poi_brothel">Putinejo</string>
+    <string name="poi_brothel">Bordelo</string>
     <string name="poi_smoking_area">Fumejo</string>
     <string name="poi_mortuary">Kadavrejo</string>
     <string name="poi_crematorium">Kadavr-bruligejo</string>
@@ -1993,7 +1993,7 @@
     <string name="poi_summit_cross">Kruco sur la montopinto: jes</string>
     <string name="poi_temperature">Temperaturo</string>
     <string name="poi_fitness_station">Ekzerc-parko</string>
-    <string name="poi_hackerspace">Kodumulejo</string>
+    <string name="poi_hackerspace">Kodumulspaco</string>
     <string name="poi_wiki_lang_af">Vikipedio Afrikansa</string>
     <string name="poi_wiki_lang_eu">Vikipedio Eŭska</string>
     <string name="poi_fireworks">Artfajraĵ-vendejo</string>

OsmAnd/res/values-eo/strings.xml

@@ -791,7 +791,7 @@ Lon: %2$s</string>
     <string name="index_item_world_ski">Tutmondaj skivojoj</string>
     <string name="calculate_osmand_route_without_internet">Loke kalkuli segmenton de kurso</string>
     <string name="use_displayed_track_for_navigation">Ĉu uzi la montratan kurson por navigado?</string>
-    <string name="gpx_option_calculate_first_last_segment">Kalkuli OsmAnd-an kurson por unua kaj fina segmentoj de kurso</string>
+    <string name="gpx_option_calculate_first_last_segment">Kalkuli kurson inter la unua kaj la fina segmentoj de spuro</string>
     <string name="keep_and_add_destination_point">Aldoni kiel sekvan celon</string>
     <string name="select_gpx">Elekti GPX-on…</string>
     <string name="route_descr_select_destination">Elekti celon</string>
@@ -1070,8 +1070,8 @@ Lon: %2$s</string>
     <string name="snap_to_road">Proksimumigi al vojo</string>
     <string name="interrupt_music">Paŭzigi muzikon</string>
     <string name="interrupt_music_descr">Voĉaj anoncoj paǔzigas ludadon de muziko.</string>
-    <string name="osmand_short_description_80_chars">Tuttera map-foliumilo kaj navigilo uzanta vektorajn aŭ enretajn mapojn OSM</string>
-    <string name="osmand_plus_short_description_80_chars">Tuttera map‑foliumilo kaj navigilo uzanta OSM‑mapojn (vektorajn aŭ enretajn)</string>
+    <string name="osmand_short_description_80_chars">Tuttera mapfoliumilo kaj navigilo uzanta OSM‑mapojn (vektorajn aŭ enretajn)</string>
+    <string name="osmand_plus_short_description_80_chars">Tuttera mapfoliumilo kaj navigilo uzanta OSM‑mapojn (vektorajn aŭ enretajn)</string>
     <string name="osmand_long_description_1000_chars">OsmAnd (OSM Aŭtomata Navigado Direkte al la celo) 
 \n 
 \nOsmAnd estas malfermkoda navigada aplikaĵo kun aliro al diversaj mondaj datumoj de OSM. Ĉiuj mapoj (vektoraj kaj kahelaj) povas esti konservitaj en la poŝtelefona konservejo por malkonekta uzado. La aplikaĵo ankaŭ ebligas uzi lokan aŭ enretan navigadon kun voĉaj anoncoj turno‑post‑turno. 
@@ -1923,9 +1923,9 @@ Lon: %2$s</string>
     <string name="first_usage_item">Unua uzo</string>
     <string name="first_usage_item_description">Kiel elŝuti mapojn, bazaj agordoj.</string>
     <string name="navigation_item_description">Navigadaj agordoj.</string>
-    <string name="planning_trip_item">Planado de vojaĝo</string>
-    <string name="map_viewing_item">Map-foliumado</string>
-    <string name="search_on_the_map_item">Serĉado en mapo</string>
+    <string name="planning_trip_item">Plani vojaĝon</string>
+    <string name="map_viewing_item">Foliumi mapon</string>
+    <string name="search_on_the_map_item">Serĉi en la mapo</string>
     <string name="instalation_troubleshooting_item">Instalado kaj problemoj</string>
     <string name="techical_articles_item">Teĥnikaj artikoloj</string>
     <string name="versions_item">Versioj</string>
@@ -2844,7 +2844,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="osm_live_payment_annual_title">Ĉiujare</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / monato</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$,2f %2$s / monato</string>
-    <string name="osm_live_payment_discount_descr">Ŝparu %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ŝparu %1$s</string>
     <string name="osm_live_payment_current_subscription">Nuna kotizo</string>
     <string name="osm_live_payment_renews_monthly">Reaboni ĉiumonate</string>
     <string name="osm_live_payment_renews_quarterly">Reaboni ĉiukvaronjare</string>
@@ -3596,18 +3596,18 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="app_mode_ski_snowmobile">Motorsledo</string>
     <string name="custom_osmand_plugin">Propra OsmAnd-kromprogramo</string>
     <string name="replace_point_descr">Anstataŭigi alian punkton per tiu ĉi</string>
-    <string name="changes_applied_to_profile">Aplikis ŝanĝojn al la profilo %1$s.</string>
-    <string name="settings_item_read_error">Ne povas legi %1$s.</string>
-    <string name="settings_item_write_error">Ne povas skribi %1$s.</string>
-    <string name="settings_item_import_error">Ne povas enporti %1$s.</string>
+    <string name="changes_applied_to_profile">Aplikis ŝanĝojn al la profilo “%1$s”.</string>
+    <string name="settings_item_read_error">Ne povas legi el “%1$s”.</string>
+    <string name="settings_item_write_error">Ne povas skribi al “%1%s”.</string>
+    <string name="settings_item_import_error">Ne povas enporti el “%1$s”.</string>
     <string name="select_track_file">Elekti dosieron de spuro</string>
     <string name="shared_string_languages">Lingvoj</string>
     <string name="shared_string_language">Lingvo</string>
     <string name="shared_string_all_languages">Ĉiuj lingvoj</string>
     <string name="wiki_menu_download_descr">Kromaj mapoj estas necesaj por vidigi punktojn de Vikipedio sur la mapo.</string>
-    <string name="main_actions_descr">Ĉefaj agoj povas enhavi nur 4 butonojn.</string>
+    <string name="main_actions_descr">La “ĉefaj agoj” povas enhavi nur 4 butonojn.</string>
     <string name="main_actions">Ĉefaj agoj</string>
-    <string name="additional_actions_descr">Vi povas aliri tiujn ĉi agojn per la butono “agoj”.</string>
+    <string name="additional_actions_descr">Vi povas aliri tiujn ĉi agojn per la butono “pliaj agoj”.</string>
     <string name="move_inside_category">Vi povas movi elementojn nur ene tiu ĉi kategorio.</string>
     <string name="developer_plugin">Programista kromprogramo</string>
     <string name="shared_string_items">Elementoj</string>
@@ -3623,7 +3623,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="divider_descr">La jenaj elementoj troviĝos en la menuo sub la horizontala linio.</string>
     <string name="hidden_items_descr">La jenaj elementoj estas kaŝitaj el la menuo, sed la rilataj eblaĵoj kaj kromprogramoj plue funkcios.</string>
     <string name="shared_string_hidden">Kaŝitaj</string>
-    <string name="reset_items_descr">Agordoj restarigos al la implicitaj valoroj post kaŝiĝo.</string>
+    <string name="reset_items_descr">Per kaŝi agordojn, ili revenos al la implicitaj valoroj.</string>
     <string name="select_wikipedia_article_langs">Elektu lingvojn, en kiuj artikoloj de Vikipedio montriĝos sur la mapo. Vi povos baskuli inter ĉiuj disponeblaj lingvoj dum legi artikolon.</string>
     <string name="some_articles_may_not_available_in_lang">Iuj artikoloj de Vikipedio povas ne esti disponeblaj en via lingvo.</string>
     <string name="lang_zhyue">Kantona</string>
@@ -3656,4 +3656,20 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="custom_color">Propra koloro</string>
     <string name="extra_maps_menu_group">Kromaj mapoj</string>
     <string name="download_unsupported_action">Nesubtenata ago %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">La pago estos prenita el via konto Google Play kiam aĉeti abonon kaj kiam ĝi malvalidiĝos (por monato/tri monatoj/jaro), kaj ne renoviĝos aŭtomate post esti rezignita per agordoj de Google Play.</string>
+    <string name="search_poi_types_descr">Miksi specojn de interesejoj el diversaj kategorioj. Frapetu “ŝaltilon” por elekti ĉiujn, frapetu ĉe maldekstre por elekti el la kategorio.</string>
+    <string name="search_poi_types">Serĉi specojn de interesejoj</string>
+    <string name="favorites_item">Ŝatataj ejoj</string>
+    <string name="subscription_osmandlive_item">Aboni OsmAnd Live</string>
+    <string name="osmand_purchases_item">Aĉeti OsmAnd</string>
+    <string name="tracker_item">Enreta spurilo</string>
+    <string name="quick_action_item">Butono de rapida ago</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="radius_ruler_item">Radius‑mezurilo</string>
+    <string name="measure_distance_item">Distanc-mezurilo</string>
+    <string name="travel_item">Vojaĝo (Vikivojaĝoj kaj Vikipedio)</string>
+    <string name="map_markers_item">Map‑markoj</string>
+    <string name="legend_item_description">Priskribo al simboloj sur la mapo</string>
+    <string name="navigation_profiles_item">Profiloj de navigo</string>
 </resources>

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

@@ -2858,7 +2858,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
@@ -3612,9 +3612,9 @@ Lon %2$s</string>
     <string name="app_mode_ski_snowmobile">Motonieve</string>
     <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
     <string name="replace_point_descr">Reemplaza otro punto con esto</string>
-    <string name="settings_item_read_error">No se pudo leer «%1$s».</string>
-    <string name="settings_item_write_error">No se pudo escribir «%1$s».</string>
-    <string name="settings_item_import_error">No se pudo importar «%1$s».</string>
+    <string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
+    <string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
+    <string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
     <string name="changes_applied_to_profile">Cambios aplicados al perfil «%1$s».</string>
     <string name="ui_customization_description">Personaliza la cantidad de elementos en el menú lateral, la configuración del mapa y el menú contextual. 
 \n 
@@ -3628,10 +3628,10 @@ Lon %2$s</string>
     <string name="divider_descr">Los elementos debajo de este punto están separados por un divisor.</string>
     <string name="shared_string_hidden">Oculto</string>
     <string name="hidden_items_descr">Estos elementos no se muestran en el menú, pero las opciones o complementos que representan seguirán funcionando.</string>
-    <string name="reset_items_descr">Los ajustes se restablecerán al estado original después de ocultarse.</string>
-    <string name="main_actions_descr">Las acciones principales contienen sólo 4 botones.</string>
+    <string name="reset_items_descr">Ocultar los ajustes, los restablece a su estado original.</string>
+    <string name="main_actions_descr">Las «Acciones principales» sólo contienen 4 botones.</string>
     <string name="main_actions">Acciones principales</string>
-    <string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones».</string>
+    <string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones adicionales».</string>
     <string name="move_inside_category">Sólo puedes mover objetos dentro de esta categoría.</string>
     <string name="developer_plugin">Complemento de desarrollador</string>
     <string name="shared_string_items">Elementos</string>
@@ -3674,4 +3674,22 @@ Lon %2$s</string>
     <string name="custom_color">Color personalizado</string>
     <string name="extra_maps_menu_group">Mapas adicionales</string>
     <string name="download_unsupported_action">Acción «%1$s» no admitida</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">La cuenta de Google Play se carga al comprar una suscripción
+\ny al expirar (mes/trimestre/año),
+\nno se renovará si se cancela antes de esa fecha en los ajustes de Google Play.</string>
+    <string name="search_poi_types">Buscar por tipos de PDI</string>
+    <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo, pulsa el lado izquierdo para elegir una categoría.</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Acción rápida</string>
+    <string name="radius_ruler_item">Regla radial</string>
+    <string name="measure_distance_item">Medir distancia</string>
+    <string name="travel_item">Viajes (Wikiviajes y Wikipedia)</string>
+    <string name="map_markers_item">Marcadores del mapa</string>
+    <string name="favorites_item">Favoritos</string>
+    <string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compras de OsmAnd</string>
+    <string name="legend_item_description">La guía para la simbología de un mapa</string>
+    <string name="navigation_profiles_item">Perfiles de navegación</string>
 </resources>

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

@@ -2858,7 +2858,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>
@@ -3612,33 +3612,83 @@ Lon %2$s</string>
     <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
     <string name="replace_point_descr">Reemplaza otro punto con esto</string>
     <string name="changes_applied_to_profile">Cambios aplicados al perfil «%1$s».</string>
-    <string name="settings_item_read_error">No se pudo leer «%1$s».</string>
-    <string name="settings_item_write_error">No se pudo escribir «%1$s».</string>
-    <string name="settings_item_import_error">No se pudo importar «%1$s».</string>
+    <string name="settings_item_read_error">No se pudo leer desde «%1$s».</string>
+    <string name="settings_item_write_error">No se pudo escribir en «%1$s».</string>
+    <string name="settings_item_import_error">No se pudo importar desde «%1$s».</string>
     <string name="wikipedia_poi_languages_promo">Algunos artículos de Wikipedia pueden no estar disponibles en tu idioma, elige los idiomas en los que los artículos de Wikipedia aparecerán en el mapa.
 \nPodrás cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
     <string name="wiki_menu_download_descr">Se necesitan mapas adicionales para ver los puntos de interés de Wikipedia en el mapa.</string>
-    <string name="ui_customization_short_descr">Elementos del cajón, menú contextual</string>
-    <string name="ui_customization_description">Personaliza la cantidad de elementos en el cajón, el la configuración del mapa y el menú contextual.
-\n
-\nPuedes desactivar los complementos no utilizados, para ocultar todos sus controles de la aplicación «%1$s».</string>
-    <string name="ui_customization">Personalización de la interfaz de usuario</string>
+    <string name="ui_customization_short_descr">Elementos del menú lateral y menú contextual</string>
+    <string name="ui_customization_description">Personaliza la cantidad de elementos en el menú lateral, la configuración del mapa y el menú contextual. 
+\n 
+\nPuedes desactivar los complementos no utilizados, para ocultar todos sus controles desde «%1$s».</string>
+    <string name="ui_customization">Personalizar interfaz de usuario</string>
     <string name="shared_string_languages">Idiomas</string>
     <string name="shared_string_language">Idioma</string>
     <string name="shared_string_items">Elementos</string>
     <string name="shared_string_hidden">Oculto</string>
-    <string name="shared_string_drawer">Cajón</string>
+    <string name="shared_string_drawer">Menú lateral</string>
     <string name="shared_string_divider">Divisor</string>
     <string name="shared_string_all_languages">Todos los idiomas</string>
     <string name="select_track_file">Marca el archivo de la traza</string>
-    <string name="reset_items_descr">Los ajustes se restablecerán al estado original después de ocultarse.</string>
-    <string name="reorder_or_hide_from">Reordenar u ocultar elementos de «%1$s».</string>
+    <string name="reset_items_descr">Ocultar los ajustes, los restablece a su estado original.</string>
+    <string name="reorder_or_hide_from">Reordena u oculta elementos en «%1$s».</string>
     <string name="move_inside_category">Sólo puedes mover objetos dentro de esta categoría.</string>
-    <string name="main_actions_descr">Las acciones principales contienen sólo 4 botones.</string>
+    <string name="main_actions_descr">Las «Acciones principales» sólo contienen 4 botones.</string>
     <string name="main_actions">Acciones principales</string>
-    <string name="hidden_items_descr">Estos elementos están ocultos en el menú, pero las opciones o complementos representados siguen funcionando.</string>
-    <string name="divider_descr">Elementos debajo de este punto separados por un divisor.</string>
+    <string name="hidden_items_descr">Estos elementos no se muestran en el menú, pero las opciones o complementos que representan seguirán funcionando.</string>
+    <string name="divider_descr">Los elementos debajo de este punto están separados por un divisor.</string>
     <string name="developer_plugin">Complemento de desarrollador</string>
     <string name="context_menu_actions">Acciones del menú contextual</string>
-    <string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones».</string>
+    <string name="additional_actions_descr">Puedes acceder a estas acciones, pulsando el botón «Acciones adicionales».</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="travel_item">Viajes (Wikiviajes y Wikipedia)</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
+    <string name="subscription_osmandlive_item">Suscripción - OsmAnd Live</string>
+    <string name="some_articles_may_not_available_in_lang">Es posible que algunos artículos de Wikipedia no estén disponibles en tu idioma.</string>
+    <string name="select_wikipedia_article_langs">Marca los idiomas en los que los artículos de Wikipedia aparecerán en el mapa. Puedes cambiar entre todos los idiomas disponibles mientras lees el artículo.</string>
+    <string name="search_poi_types_descr">Combina tipos de PDI de diferentes categorías. Pulsa «Alternar» para marcar todo, pulsa el lado izquierdo para elegir una categoría.</string>
+    <string name="search_poi_types">Buscar por tipos de PDI</string>
+    <string name="radius_ruler_item">Regla radial</string>
+    <string name="quick_action_item">Acción rápida</string>
+    <string name="osmand_purchases_item">Compras de OsmAnd</string>
+    <string name="osm_live_payment_subscription_management">La cuenta de Google Play se carga al comprar una suscripción
+\ny al expirar (mes/trimestre/año),
+\nno se renovará si se cancela antes de esa fecha en los ajustes de Google Play.</string>
+    <string name="navigation_profiles_item">Perfiles de navegación</string>
+    <string name="measure_distance_item">Medir distancia</string>
+    <string name="map_markers_item">Marcadores del mapa</string>
+    <string name="legend_item_description">La guía para la simbología de un mapa</string>
+    <string name="lang_zhyue">Cantonés</string>
+    <string name="lang_zhminnan">Min del Sur</string>
+    <string name="lang_yo">Yoruba</string>
+    <string name="lang_war">Waray</string>
+    <string name="lang_uz">Uzbeko</string>
+    <string name="lang_ur">Urdu</string>
+    <string name="lang_tt">Tártaro</string>
+    <string name="lang_tg">Tayiko</string>
+    <string name="lang_sco">Escocés</string>
+    <string name="lang_scn">Siciliano</string>
+    <string name="lang_pnb">Punjabi</string>
+    <string name="lang_ne">Nepalí</string>
+    <string name="lang_nap">Napolitano</string>
+    <string name="lang_my">Birmano</string>
+    <string name="lang_mn">Mongol</string>
+    <string name="lang_min">Minangkabau</string>
+    <string name="lang_mg">Malgache</string>
+    <string name="lang_lmo">Lombardo</string>
+    <string name="lang_ky">Kirguís</string>
+    <string name="lang_kk">Kazajo</string>
+    <string name="lang_jv">Javanés</string>
+    <string name="lang_gu">Gujarati</string>
+    <string name="lang_cv">Chuvash</string>
+    <string name="lang_ce">Checheno</string>
+    <string name="lang_bar">Bávaro</string>
+    <string name="lang_ba">Bashkir</string>
+    <string name="lang_an">Aragonés</string>
+    <string name="favorites_item">Favoritos</string>
+    <string name="extra_maps_menu_group">Mapas adicionales</string>
+    <string name="download_unsupported_action">Acción «%1$s» no admitida</string>
+    <string name="custom_color">Color personalizado</string>
 </resources>

OsmAnd/res/values-es/strings.xml

@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Ahorra %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ahorra %1$s</string>
     <string name="osm_live_payment_current_subscription">Suscripción actual</string>
     <string name="osm_live_payment_renews_monthly">Renovar mensualmente</string>
     <string name="osm_live_payment_renews_quarterly">Renovar trimestralmente</string>

OsmAnd/res/values-et/strings.xml

@@ -558,7 +558,7 @@
     <string name="osm_live_payment_annual_title">Igal aastal</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / kuu</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / kuu</string>
-    <string name="osm_live_payment_discount_descr">Salvesta %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Salvesta %1$s</string>
     <string name="osm_live_payment_current_subscription">Praegune tellimus</string>
     <string name="osm_live_payment_renews_monthly">Uueneb igakuiselt</string>
     <string name="osm_live_payment_renews_quarterly">Uueneb kord kvartalis</string>

OsmAnd/res/values-eu/strings.xml

@@ -3629,4 +3629,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_language">Hizkuntza</string>
     <string name="shared_string_all_languages">Hizkuntza guztiak</string>
     <string name="wiki_menu_download_descr">Mapa osagarriak behar dira Wikipediaren POIak mapan ikusteko.</string>
+    <string name="custom_color">Kolore pertsonalizatua</string>
+    <string name="extra_maps_menu_group">Mapa gehigarriak</string>
+    <string name="download_unsupported_action">onartu gabeko ekintza %1$s</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -2139,7 +2139,7 @@
     <string name="plugins_menu_group">افزونه‌ها</string>
     <string name="first_usage_item">اولین استفاده</string>
     <string name="first_usage_item_description">نحوهٔ دانلود نقشه‌ها و انجام تنظیمات پایه.</string>
-    <string name="search_on_the_map_item">جست‌وجوی نقشه</string>
+    <string name="search_on_the_map_item">جست‌وجو در نقشه</string>
     <string name="instalation_troubleshooting_item">نصب و اشکال‌زدایی</string>
     <string name="techical_articles_item">مقاله‌های فنی</string>
     <string name="save_poi_too_many_uppercase">حروف بزرگ زیادی در نام وجود دارد. ادامه می‌دهید؟</string>
@@ -2879,7 +2879,7 @@
     <string name="osm_live_payment_annual_title">سالانه</string>
     <string name="osm_live_payment_month_cost_descr">%1$s در ماه</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s در ماه</string>
-    <string name="osm_live_payment_discount_descr">%1$s ارزان‌تر.</string>
+    <string name="osm_live_payment_discount_descr">%1$s ارزان‌تر</string>
     <string name="osm_live_payment_current_subscription">اشتراک کنونی</string>
     <string name="osm_live_payment_renews_monthly">هر ماه تمدید می‌شود</string>
     <string name="osm_live_payment_renews_quarterly">هر سه ماه تمدید می‌شود</string>
@@ -3640,10 +3640,10 @@
     <string name="app_mode_ski_snowmobile">برف‌رو</string>
     <string name="custom_osmand_plugin">افزونهٔ سفارشی OsmAnd</string>
     <string name="replace_point_descr">نقطهٔ دیگری را جانشین این کنید</string>
-    <string name="changes_applied_to_profile">تغییرات روی پروفایل %1$s به کار رفت.</string>
-    <string name="settings_item_read_error">خواندن %1$s ناموفق بود.</string>
-    <string name="settings_item_write_error">نوشتن %1$s ناموفق بود.</string>
-    <string name="settings_item_import_error">درون‌برد %1$s ناموفق بود.</string>
+    <string name="changes_applied_to_profile">تغییرات بر پروفایل %1$s به کار گرفته شد.</string>
+    <string name="settings_item_read_error">خواندن از %1$s ناموفق بود.</string>
+    <string name="settings_item_write_error">نوشتن در %1$s ناموفق بود.</string>
+    <string name="settings_item_import_error">درون‌برد از %1$s ناموفق بود.</string>
     <string name="wiki_menu_download_descr">برای مشاهدهٔ نقاط ویکی‌پدیا روی نقشه باید نقشهٔ دیگری را نیز دانلود کنید.</string>
     <string name="multimedia_rec_split_title">تقسیمگر ضبط‌کننده</string>
     <string name="select_track_file">انتخاب فایل رد</string>
@@ -3653,8 +3653,8 @@
     <string name="ui_customization_description">تعداد اقلام کشو را به‌دلخواه تنظیم کنید، نقشه و منوی زمینه را پیکربندی نمایید. 
 \n 
 \nمی‌توانید افزونهٔ بی‌استفاده را غیرفعال کنید تا همهٔ کنترل‌های آن از برنامه پنهان شود.</string>
-    <string name="reset_items_descr">تنظیمات پس از پنهان‌سازی به حالت اولیه بازنشانی می‌شود.</string>
-    <string name="hidden_items_descr">این اقلام در منو پنهان می‌شوند، اما گزینه‌ها یا افزونه‌های متناظر همچنان کار می‌کنند.</string>
+    <string name="reset_items_descr">پنهان‌سازی تنظیمات آن‌ها را به حالت اولیه بازنشانی می‌کند.</string>
+    <string name="hidden_items_descr">این اقلام از منو پنهان می‌شوند، اما گزینه‌ها یا افزونه‌های متناظر همچنان کار می‌کنند.</string>
     <string name="shared_string_hidden">پنهان</string>
     <string name="shared_string_divider">جداکننده</string>
     <string name="reorder_or_hide_from">مرتب‌سازی یا پنهان‌سازی اقلام %1$s.</string>
@@ -3662,9 +3662,9 @@
     <string name="ui_customization_short_descr">اقلام کشو، منوی زمینه</string>
     <string name="ui_customization">سفارشی‌سازی واسط کاربری</string>
     <string name="context_menu_actions">کنش‌های منوی زمینه</string>
-    <string name="main_actions_descr">کنش‌های اصلی فقط ۴ دکمه دارند.</string>
+    <string name="main_actions_descr">کنش‌های اصلی فقط ۴ دکمه است.</string>
     <string name="main_actions">کنش‌های اصلی</string>
-    <string name="additional_actions_descr">با زدن روی دکمهٔ «کنش‌ها» می‌توانید به این کنش‌ها دسترسی پیدا کنید.</string>
+    <string name="additional_actions_descr">با زدن روی دکمهٔ «کنش‌های بیشتر» می‌توانید به این کنش‌ها دسترسی پیدا کنید.</string>
     <string name="developer_plugin">افزونهٔ توسعه‌دهنده</string>
     <string name="divider_descr">چیزهایی که از این نقطه به پایین قرار می‌گیرند، با جداکننده جدا می‌شوند.</string>
     <string name="move_inside_category">اقلام را فقط درون این دسته می‌توانید جابه‌جا کنید.</string>
@@ -3676,4 +3676,42 @@
     <string name="lang_ur">اردو</string>
     <string name="lang_tg">تاجیکی</string>
     <string name="extra_maps_menu_group">نقشه‌های بیشتر</string>
+    <string name="download_unsupported_action">کنش پشتیبانی‌نشده %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">هنگام خرید اشتراک، بها از حساب گوگل‌پلی شما پرداخت می‌شود
+\nو هنگامی که مدت اشتراک پایان می‌یابد (ماهانه/سه‌ماهه/سالانه)،
+\nاگر پیش از پایان زمان اشتراک، اشتراک خود را از تنظیمات گوگل‌پلی لغو کرده باشید، به‌طور خودکار تمدید نخواهد شد.</string>
+    <string name="tracker_item">OsmAnd tracker</string>
+    <string name="legend_item_description">راهنمای نمادهای نقشه</string>
+    <string name="navigation_profiles_item">پروفایل‌های ناوبری</string>
+    <string name="lang_zhyue">کانتونی</string>
+    <string name="lang_zhminnan">مین‌نانی</string>
+    <string name="lang_yo">یوروبایی</string>
+    <string name="lang_war">وینارایی</string>
+    <string name="lang_uz">ازبکی</string>
+    <string name="lang_tt">تاتاری</string>
+    <string name="lang_sco">اسکاتلندی</string>
+    <string name="lang_ne">نپالی</string>
+    <string name="lang_nap">ناپلی</string>
+    <string name="lang_my">برمه‌ای</string>
+    <string name="lang_mn">مغولی</string>
+    <string name="lang_min">مینانگ‌کابائو</string>
+    <string name="lang_mg">مالاگاسی</string>
+    <string name="lang_ky">قرقیزی</string>
+    <string name="lang_jv">جاوه‌ای</string>
+    <string name="lang_gu">گوجراتی</string>
+    <string name="lang_cv">چوواشی</string>
+    <string name="lang_ce">چچنی</string>
+    <string name="lang_bar">باواریایی</string>
+    <string name="lang_ba">باشقیری</string>
+    <string name="lang_an">آراگونی</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">کنش فوری</string>
+    <string name="radius_ruler_item">خط‌کش شعاعی</string>
+    <string name="measure_distance_item">اندازه‌گیری مسافت</string>
+    <string name="travel_item">مسافرت (ویکی‌سفر و ویکی‌پدیا)</string>
+    <string name="map_markers_item">نشانه‌های نقشه</string>
+    <string name="favorites_item">برگزیده‌ها</string>
+    <string name="subscription_osmandlive_item">اشتراک - OsmAnd Live</string>
+    <string name="osmand_purchases_item">خریدهای OsmAnd</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -3399,7 +3399,7 @@
     <string name="poi_water_place_durability_emergency">Durabilité des plans d\'eau : urgence</string>
     <string name="poi_water_purification_chlorine">Chlore</string>
     <string name="poi_water_supply_water_well">Puits d’eau</string>
-    <string name="poi_water_supply_pipeline">Pipeline</string>
+    <string name="poi_water_supply_pipeline">Oléoduc</string>
     <string name="poi_water_supply_borehole">Trou de forage</string>
     <string name="poi_socket_cee_blue">Prise de courant : Bleu CEE</string>
     <string name="poi_socket_cee_blue_current">Prise de courant : Bleu CEE : courant</string>

OsmAnd/res/values-fr/strings.xml

@@ -99,7 +99,7 @@
     <string name="select_search_position">Autour de :</string>
     <string name="context_menu_item_search">Rechercher à proximité</string>
     <string name="shared_string_save_as_gpx">Enregistrer comme nouveau fichier GPX</string>
-    <string name="route_successfully_saved_at">Itinéraire enregistré sous \'%1$s\'.</string>
+    <string name="route_successfully_saved_at">Itinéraire enregistré sous « %1$s ».</string>
     <string name="filename_input">Nom du fichier : </string>
     <string name="file_with_name_already_exist">Le même nom existe déjà.</string>
     <string name="shared_string_save">Enregistrer</string>
@@ -109,7 +109,7 @@
     <string name="show_more_map_detail">Afficher plus de détails</string>
     <string name="show_more_map_detail_descr">Afficher certains détails des cartes vectorielles (routes, etc.) y compris aux niveaux de zooms inférieurs.</string>
     <string name="favourites_delete_multiple_succesful">Favori(s) supprimé(s).</string>
-    <string name="favorite_delete_multiple">Êtes-vous certain de vouloir supprimer %1$d favoris et %2$d groupes de favoris \?</string>
+    <string name="favorite_delete_multiple">Êtes-vous certain(e) de vouloir supprimer %1$d favoris et %2$d groupes de favoris \?</string>
     <string name="favorite_home_category">Domicile</string>
     <string name="favorite_friends_category">Amis</string>
     <string name="favorite_places_category">Lieux</string>
@@ -583,8 +583,8 @@
     <string name="filter_current_poiButton">Filtre</string>
     <string name="edit_filter_save_as_menu_item">Enregistrer sous</string>
     <string name="edit_filter_delete_dialog_title">Supprimer ce filtre \?</string>
-    <string name="edit_filter_delete_message">Le filtre \'%1$s\' a été supprimé</string>
-    <string name="edit_filter_create_message">Le filtre \'%1$s\' a été créé</string>
+    <string name="edit_filter_delete_message">Le filtre « %1$s » a été supprimé</string>
+    <string name="edit_filter_create_message">Le filtre « %1$s » a été créé</string>
     <string name="offline_navigation_not_available">Navigation hors-ligne temporairement indisponible.</string>
     <string name="left_side_navigation">Conduite à gauche</string>
     <string name="left_side_navigation_descr">Pour les pays où la circulation s\'effectue sur la partie gauche de la route.</string>
@@ -728,7 +728,7 @@
     <string name="starting_point_too_far">Point de départ trop éloigné de la route la plus proche.</string>
     <string name="shared_location">Lieu partagé</string>
     <string name="select_animate_speedup">Vitesse de simulation de l\'itinéraire :</string>
-    <string name="global_app_allocated_memory_descr">Mémoire allouée %1$s Mo (limite Android %2$s MB, Dalvik %3$s Mo).</string>
+    <string name="global_app_allocated_memory_descr">Mémoire allouée %1$s Mo (limite Android %2$s Mo, Dalvik %3$s Mo).</string>
     <string name="global_app_allocated_memory">Mémoire allouée</string>
     <string name="native_app_allocated_memory_descr">Mémoire totale utilisée par l\'application %1$s Mo (Dalvik %2$s Mo, divers %3$s Mo).
 \nMémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</string>
@@ -1079,7 +1079,7 @@
     <string name="animate_routing_route_not_calculated">Veuillez d\'abord calculer l\'itinéraire</string>
     <string name="animate_routing_route">Simulation de l\'itinéraire calculé </string>
     <string name="animate_routing_gpx">Simulation suivant une trace GPX</string>
-    <string name="local_osm_changes_delete_all_confirm">Êtes-vous certain de vouloir supprimer %1$d modifications OSM \?</string>
+    <string name="local_osm_changes_delete_all_confirm">Êtes-vous certain(e) de vouloir supprimer %1$d modifications OSM \?</string>
     <string name="shared_string_delete_all">Tout supprimer</string>
     <string name="app_mode_hiking">Randonnée</string>
     <string name="app_mode_motorcycle">Moto</string>
@@ -1333,7 +1333,7 @@
     <string name="fav_point_dublicate_message">Favori renommé en %1$s pour éviter un doublon.</string>
     <string name="text_size_descr">Sélectionnez la taille du texte sur la carte.</string>
     <string name="print_route">Exporter l\'itinéraire</string>
-    <string name="fav_point_emoticons_message">Favori renommé en \'%1$s\' (les émoticônes ne sont pas autorisés).</string>
+    <string name="fav_point_emoticons_message">Favori renommé en « %1$s » (les émoticônes ne sont pas autorisés).</string>
     <string name="speed_limit_exceed">Marge de tolérance aux limites de vitesse</string>
     <string name="speed_limit_exceed_message">Indiquez la marge de tolérance à ajouter à la limitation de vitesse et au-dessus de laquelle vous recevrez une alerte vocale.</string>
     <string name="anonymous_user_hint">Un utilisateur anonyme ne peut pas :
@@ -1502,7 +1502,7 @@
     <string name="delay_to_start_navigation_descr">Indiquez le délai d\'affichage de l\'itinéraire détaillé, avant de démarrer la navigation.</string>
     <string name="shared_string_go">Aller</string>
     <string name="confirmation_to_clear_history">Effacer l\'historique ?</string>
-    <string name="local_osm_changes_upload_all_confirm">Êtes-vous certain·e de vouloir téléverser %1$d modification(s) à OSM \?</string>
+    <string name="local_osm_changes_upload_all_confirm">Êtes-vous certain(e) de vouloir téléverser %1$d modification(s) à OSM \?</string>
     <string name="delay_to_start_navigation">Lancer la navigation pas à pas après …</string>
     <string name="osm_changes_added_to_local_edits">Modifications OSM mémorisées localement</string>
     <string name="mark_to_delete">Marquer pour suppression</string>
@@ -1556,7 +1556,7 @@
     <string name="local_indexes_cat_wiki">Wikipédia</string>
     <string name="download_wikipedia_maps">Wikipédia</string>
     <string name="shared_string_import2osmand">Importer dans OsmAnd</string>
-    <string name="local_recordings_delete_all_confirm">Êtes-vous certain de vouloir supprimer %1$d notes \?</string>
+    <string name="local_recordings_delete_all_confirm">Êtes-vous certain(e) de vouloir supprimer %1$d notes \?</string>
     <string name="gps_network_not_enabled">Le service de localisation est arrêté. Souhaitez-vous l’activer ?</string>
     <string name="disable_recording_once_app_killed_descrp">Met en pause l\'enregistrement de la trace GPX lors de l\'arrêt d\'OsmAnd (via les applications récentes) et supprime l\'icône OsmAnd de la barre de notification Android.</string>
     <string name="disable_recording_once_app_killed">Interdire la journalisation autonome</string>
@@ -1706,8 +1706,8 @@
     <string name="favorite_category_add_new_title">Ajouter une catégorie</string>
     <string name="favorite_category_dublicate_message">Cette catégorie existe déjà. Merci d\'utiliser un autre nom.</string>
     <string name="confirm_download_roadmaps">Êtes-vous certain de vouloir télécharger la carte des routes alors que vous disposez déjà d\'une carte complète ?</string>
-    <string name="value_downloaded_of_max">%1$,1f de %2$,1f Mo</string>
-    <string name="file_size_in_mb">%,1f Mo</string>
+    <string name="value_downloaded_of_max">%1$.1f de %2$.1f Mo</string>
+    <string name="file_size_in_mb">%.1f Mo</string>
     <string name="update_all">Tout mettre à jour (%1$s Mo)</string>
     <string name="free_downloads_used">Téléchargements gratuits effectués</string>
     <string name="free_downloads_used_description">Affiche le nombre de téléchargements gratuits restants.</string>
@@ -2007,7 +2007,7 @@
     <string name="no_update_info_desc">Ne pas vérifier les mises à jour ni les offres promotionnelles OsmAnd.</string>
     <string name="no_update_info">Ne pas afficher les nouvelles versions</string>
     <string name="skip_map_downloading">Ignorer le téléchargement des cartes</string>
-    <string name="skip_map_downloading_desc">Aucune carte hors-ligne n\'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger une carte plus tard depuis le menu \'%1$s\'.</string>
+    <string name="skip_map_downloading_desc">Aucune carte hors ligne n\'est installée. Vous pouvez sélectionner une carte dans la liste ou télécharger une carte plus tard depuis le menu « %1$s ».</string>
     <string name="search_another_country">Sélectionner une autre région</string>
     <string name="search_map">Recherche des cartes …</string>
     <string name="first_usage_wizard_desc">Autoriser OsmAnd à vous localiser et à vous suggérer le téléchargement des cartes de la région.</string>
@@ -2131,7 +2131,7 @@
     <string name="quick_action_favorites_hide">Masquer les favoris</string>
     <string name="quick_action_showhide_poi_title">Afficher / Masquer les points d\'intérêt</string>
     <string name="quick_action_poi_show">Afficher %1$s</string>
-    <string name="quick_action_poi_hide">"Masquer  %1$s"</string>
+    <string name="quick_action_poi_hide">Masquer %1$s</string>
     <string name="quick_action_add_category">Ajouter une catégorie</string>
     <string name="quick_action_add_configure_map">Paramétrer la carte</string>
     <string name="quick_action_add_navigation">Navigation</string>
@@ -2208,7 +2208,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="shared_string_time_span">Amplitude horaire</string>
     <string name="shared_string_gpx_track">Trace</string>
     <string name="points_delete_multiple_succesful">Point(s) supprimé(s) avec succès.</string>
-    <string name="points_delete_multiple">Êtes-vous certain de vouloir supprimer %1$d point(s) \?</string>
+    <string name="points_delete_multiple">Êtes-vous certain(e) de vouloir supprimer %1$d point(s) \?</string>
     <string name="add_new_folder">Créer un dossier</string>
     <string name="route_points_category_name">Itinéraire pour emprunter cette route</string>
     <string name="track_points_category_name">Points de passage, points d’intérêt, points remarquables</string>
@@ -2740,7 +2740,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="get_unlimited_access">Obtenir un accès illimité</string>
     <string name="welcome_to_open_beta">Bienvenue dans cette bêta ouverte !</string>
     <string name="contour_lines_hillshade_maps">Cartes avec courbes de niveaux et ombrage du relief</string>
-    <string name="download_wikipedia_description">Téléchargez les articles Wikipedia pour %1$s afin de pouvoir les lire hors-ligne.</string>
+    <string name="download_wikipedia_description">Téléchargez les articles Wikipédia pour %1$s afin de pouvoir les lire hors ligne.</string>
     <string name="download_wikipedia_label">Télécharger les données Wikipedia</string>
     <string name="open_in_browser_wiki">Ouvrir l\'article en ligne</string>
     <string name="open_in_browser_wiki_description">Afficher l\'article dans un navigateur.</string>
@@ -2844,7 +2844,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mois</string>
     <string name="osm_live_payment_discount_descr">Économisez %1$s</string>
     <string name="osm_live_payment_current_subscription">Abonnement en cours</string>
-    <string name="default_price_currency_format">%1$,2f %2$s</string>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="osm_live_payment_header">Fréquence de règlement :</string>
     <string name="osm_live_payment_contribute_descr">Les dons financent la cartographie OSM / OpenStreetMap.</string>
     <string name="osm_live_plan_pricing">Abonnements &amp; tarifs</string>
@@ -3412,7 +3412,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="import_profile">Importer un profil</string>
     <string name="monitoring_prefs_descr">Navigation, fiabilité d\'enregistrement</string>
     <string name="multimedia_notes_prefs_descr">Taille de l\'image, qualité audio et vidéo</string>
-    <string name="osm_editing_prefs_descr">Login, mot de passe, édition hors-ligne</string>
+    <string name="osm_editing_prefs_descr">Connexion, mot de passe, édition hors-ligne</string>
     <string name="accessibility_prefs_descr">Choisissez l\'icône, la couleur et le nom</string>
     <string name="live_monitoring_descr">Permet le partage de votre position grâce à l\'enregistrement du trajet.</string>
     <string name="live_monitoring">Suivi en ligne</string>
@@ -3551,8 +3551,8 @@ représentant la zone : %1$s x %2$s</string>
     <string name="shared_string_importing">Import en cours</string>
     <string name="items_added">Éléments ajoutés</string>
     <string name="shared_string_import_complete">Import terminé</string>
-    <string name="checking_for_duplicate_description">OsmAnd vérifie que l\'élément %1$s n\'existe pas déjà dans l\'application. 
-\n 
+    <string name="checking_for_duplicate_description">OsmAnd vérifie que l\'élément %1$s n\'existe pas déjà dans l\'application.
+\n
 \nCela peut prendre un certain temps.</string>
     <string name="import_complete_description">Les données de %1$s ont été importées, vous pouvez utiliser les boutons ci-dessous pour ouvrir la partie adéquate de l\'application pour les gérer.</string>
     <string name="recalculate_route_distance_promo">L\'itinéraire sera recalculé lorsque la distance entre l\'itinéraire et votre position est supérieure à la valeur indiquée.</string>
@@ -3589,10 +3589,10 @@ représentant la zone : %1$s x %2$s</string>
     <string name="app_mode_ski_snowmobile">Motoneige</string>
     <string name="custom_osmand_plugin">Greffon OsmAnd personnalisé</string>
     <string name="replace_point_descr">Remplacer un point par celui-ci</string>
-    <string name="changes_applied_to_profile">Modifications appliquées au profil %1$s.</string>
-    <string name="settings_item_read_error">Impossible de lire %1$s.</string>
-    <string name="settings_item_write_error">Impossible d\'écrire %1$s.</string>
-    <string name="settings_item_import_error">Impossible d\'importer %1$s.</string>
+    <string name="changes_applied_to_profile">Modifications appliquées au profil \'%1$s\'.</string>
+    <string name="settings_item_read_error">Impossible de lire depuis \'%1$s\'.</string>
+    <string name="settings_item_write_error">Impossible d\'écrire dans \'%1$s\'.</string>
+    <string name="settings_item_import_error">Impossible d\'importer depuis \'%1$s\'.</string>
     <string name="select_track_file">Sélectionnez le fichier de trace</string>
     <string name="shared_string_languages">Langues</string>
     <string name="shared_string_language">Langue</string>
@@ -3601,10 +3601,10 @@ représentant la zone : %1$s x %2$s</string>
     <string name="divider_descr">Éléments sous ce point isolés par un séparateur.</string>
     <string name="ui_customization_description">Personnalisez le nombre d’éléments dans le panneau déroulant, paramétrez la carte et le menu contextuel.
 \n
-\nVous pouvez désactiver les greffons inutilisés, pour masquer tous leurs contrôles dans l’application %1$s.</string>
-    <string name="hidden_items_descr">Ces éléments sont masqués dans le menu mais les options présentes ou les greffons fonctionneront toujours.</string>
-    <string name="reset_items_descr">Les paramètres seront réinitialisés à leurs valeurs par défaut après avoir été masqués.</string>
-    <string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton « Actions ».</string>
+\nVous pouvez désactiver les greffons inutilisés, pour masquer leurs contrôles dans l’application %1$s.</string>
+    <string name="hidden_items_descr">Ces éléments sont masqués dans le menu mais les options présentes ou les greffons continueront à fonctionner.</string>
+    <string name="reset_items_descr">Masquer les paramètres les réinitialise à leurs valeurs par défaut.</string>
+    <string name="additional_actions_descr">Vous pouvez accéder à ces actions en appuyant sur le bouton « Actions supplémentaires ».</string>
     <string name="ui_customization_short_descr">Éléments du panneau déroulant, menu contextuel</string>
     <string name="shared_string_drawer">Panneau déroulant</string>
     <string name="reorder_or_hide_from">Réorganisez ou masquez les éléments à partir de %1$s.</string>
@@ -3649,4 +3649,22 @@ représentant la zone : %1$s x %2$s</string>
     <string name="download_unsupported_action">Action %1$s non prise en charge</string>
     <string name="lang_ky">Kirghize</string>
     <string name="lang_gu">Gujarati</string>
+    <string name="osm_live_payment_subscription_management">Le paiement sera débité de votre compte Google Play dès confirmation de l\'abonnement
+\npuis automatiquement à la fin de chaque échéance (mensuelle / trimestrielle / annuelle).
+\nVous pouvez gérer et annuler ces abonnements depuis vos paramètres Google Play.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types_descr">Combinez des PI de différentes catégories. Appuyez pour tout sélectionner, appuyez sur le côté gauche pour sélectionner les catégories.</string>
+    <string name="search_poi_types">Rechercher des types de PI</string>
+    <string name="radius_ruler_item">Règle de mesure par rayon</string>
+    <string name="map_markers_item">Marques</string>
+    <string name="legend_item_description">Le guide des symboles cartographiques</string>
+    <string name="tracker_item">OsmAnd Tracker</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Action rapide</string>
+    <string name="measure_distance_item">Mesurer une distance</string>
+    <string name="travel_item">Voyage (Wikivoyage et Wikipédia)</string>
+    <string name="favorites_item">Favoris</string>
+    <string name="subscription_osmandlive_item">Abonnement - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Achats OsmAnd</string>
+    <string name="navigation_profiles_item">Profils de navigation</string>
 </resources>

OsmAnd/res/values-gl/strings.xml

@@ -247,7 +247,7 @@
     <string name="app_mode_motorcycle">Moto</string>
     <string name="app_mode_boat">Embarcación</string>
     <string name="app_mode_aircraft">Aeronave</string>
-    <string name="local_osm_changes_delete_all_confirm">Eliminar %1$d mudanza(s) no OSM\?</string>
+    <string name="local_osm_changes_delete_all_confirm">Eliminar %1$d modificación(s) no OSM\?</string>
     <string name="shared_string_delete_all">Eliminar todo</string>
     <string name="animate_routing_route_not_calculated">Calcula-la rota primeiro</string>
     <string name="animate_routing_route">"Simular empregando a rota calculada "</string>
@@ -312,9 +312,9 @@
     <string name="search_street_in_neighborhood_cities">Procura das rúas nas poboacións viciñas</string>
     <string name="intermediate_items_sort_return">Orde optimizada dos destinos intermedios no itinerario cara o destino.</string>
     <string name="intermediate_items_sort_by_distance">Ordenar porta a porta</string>
-    <string name="local_osm_changes_backup_successful">O ficheiro das mudanzas do OSM \"%1$s\" foi xerado</string>
-    <string name="local_osm_changes_backup_failed">Non foi posíbel facer copia de seguranza (backup) das mudanzas do OSM.</string>
-    <string name="local_osm_changes_backup">Copia de seguranza coma mudanza do OSM</string>
+    <string name="local_osm_changes_backup_successful">O ficheiro das modificacións do OSM \"%1$s\" foi xerado</string>
+    <string name="local_osm_changes_backup_failed">Non foi posíbel facer copia de seguranza (backup) das modificacións do OSM.</string>
+    <string name="local_osm_changes_backup">Copia de seguranza coma modificación do OSM</string>
     <string name="delete_point">Eliminar o punto</string>
     <string name="plugin_distance_point_time">hora</string>
     <string name="plugin_distance_point_hdop">precisión</string>
@@ -800,7 +800,7 @@
     <string name="use_fluorescent_overlays_descr">Empregar cores fluorescentes para amosa-las pistas e rotas.</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="update_poi_does_not_change_indexes">As mudanzas nos puntos de interese (PDI) dentro da aplicación non afectan ós ficheiros dos mapas baixados, pois esas mudanzas gárdanse coma un ficheiro no teu dispositivo.</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>
     <string name="local_openstreetmap_uploadall">Actualizar todo</string>
@@ -882,7 +882,7 @@
     <string name="data_to_search_poi_not_available">Baixar datos sen conexión para procurar PDI.</string>
     <string name="poi_filter_by_name">Procurar polo nome</string>
     <string name="old_poi_file_should_be_deleted">O ficheiro de datos do PDI «%1$s» é redundante e pode ser eliminado.</string>
-    <string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para mante-las mudanzas nos PDI e tampouco foi posíbel crealo.</string>
+    <string name="update_poi_file_not_found">Non foi posíbel atopar un ficheiro local para manter as modificacións nos PDI e tampouco foi posíbel crealo.</string>
     <string name="button_upgrade_osmandplus">Actualizar OsmAnd+</string>
     <string name="map_version_changed_info">Baixa a nova versión da aplicación, para poder emprega-los novos ficheiros dos mapas.</string>
     <string name="shared_string_rename">Mudar o nome</string>
@@ -1356,7 +1356,7 @@
     <string name="poi_error_info_not_loaded">A información sobre o nó non foi cargada</string>
     <string name="poi_dialog_opening_hours">Aberto</string>
     <string name="poi_dialog_comment">Comentario</string>
-    <string name="poi_dialog_comment_default">Mudanza do PDI</string>
+    <string name="poi_dialog_comment_default">Modificación do PDI</string>
     <string name="poi_dialog_other_tags_message">O resto das etiquetas consérvase</string>
     <string name="default_buttons_commit">Enviar</string>
     <string name="shared_string_clear">Limpar</string>
@@ -1463,7 +1463,7 @@
     <string name="rendering_value_translucent_blue_name">Azul translúcido</string>
     <string name="rendering_value_purple_name">Violeta</string>
     <string name="rendering_value_translucent_purple_name">Violeta translúcido</string>
-    <string name="restart_is_required">Requírese un reinicio para aplicar as mudanzas.</string>
+    <string name="restart_is_required">Requírese un reinicio para aplicar as modificacións.</string>
     <string name="light_theme">Claro</string>
     <string name="dark_theme">Escuro</string>
     <string name="lang_pms">Piamontés</string>
@@ -1532,7 +1532,7 @@
     <string name="current_route">Rota actual</string>
     <string name="mark_to_delete">Marcar para eliminar</string>
     <string name="local_recordings_delete_all_confirm">Eliminar %1$d notas\?</string>
-    <string name="local_osm_changes_upload_all_confirm">Subir %1$d mudanza(s) ó OSM\?</string>
+    <string name="local_osm_changes_upload_all_confirm">Subir %1$d modificación(s) ó OSM\?</string>
     <string name="confirmation_to_clear_history">Limpa-lo historial\?</string>
     <string name="shared_string_go">Ir</string>
     <string name="osm_edits">Edicións do OSM</string>
@@ -1546,7 +1546,7 @@
     <string name="drawer">Listaxe sinxela</string>
     <string name="short_location_on_map">Lat %1$s
 Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Cuestións frecuentes, mudanzas recentes e outros.</string>
+    <string name="tips_and_tricks_descr">Cuestións frecuentes, modificacións recentes e outros.</string>
     <string name="routing_settings_2">Axustes da navegación</string>
     <string name="general_settings_2">Axustes xerais</string>
     <string name="shared_string_ellipsis">…</string>
@@ -1611,7 +1611,7 @@ Lon %2$s</string>
     <string name="rate_this_app_long">Dálle unha valoración ó OsmAnd na Google Play</string>
     <string name="user_hates_app_get_feedback">Díganos o porque.</string>
     <string name="user_hates_app_get_feedback_long">Por favor, fáganos saber calquera suxestión.</string>
-    <string name="delete_change">Elimina-la mudanza</string>
+    <string name="delete_change">Eliminar modificación</string>
     <string name="successfully_uploaded_pattern">Subido {0}/{1}</string>
     <string name="try_again">Tentar de novo</string>
     <string name="error_message_pattern">Erro: {0}</string>
@@ -1630,7 +1630,7 @@ Lon %2$s</string>
     <string name="shared_string_deselect_all">Desbota-la selección toda</string>
     <string name="osm_edit_context_menu_delete">Eliminar edición do OSM</string>
     <string name="rendering_attr_OSMMapperAssistant_name">Axudante cartográfico do OSM</string>
-    <string name="osm_changes_added_to_local_edits">As mudanzas no OSM foron engadidas ó conxunto das mudanzas locais</string>
+    <string name="osm_changes_added_to_local_edits">As modificacións no OSM foron engadidas ó conxunto de modificacións local</string>
     <string name="osmand_parking_overdue">vencido</string>
     <string name="action_create">Creacción de acción</string>
     <string name="action_modify">Modificación de acción</string>
@@ -1719,11 +1719,11 @@ Lon %2$s</string>
     <string name="show_on_start">Amosar no inicio</string>
     <string name="commit_poi">Enviar o PDI</string>
     <string name="saved_at_time">Gardado agora coma: %1$s</string>
-    <string name="poi_deleted_localy">O punto de interese (PDI) será eliminado unha vez enviadas as mudanzas</string>
+    <string name="poi_deleted_localy">O punto de interese (PDI) será eliminado unha vez enviadas as modificacións</string>
     <string name="show_gpx">Amosar datos GPX</string>
     <string name="count_of_lines">Número de liñas</string>
     <string name="are_you_sure">Tes a certeza de querer facelo\?</string>
-    <string name="unsaved_changes_will_be_lost">Vanse perde-las mudanzas non gardadas. Proseguer\?</string>
+    <string name="unsaved_changes_will_be_lost">Vanse perder as modificacións non gardadas. Proseguer\?</string>
     <string name="downloads_left_template">Faltan %1$s baixadas</string>
     <string name="roads">Estradas</string>
     <string name="downloading_number_of_files">Estase a baixar - ficheiro %1$d</string>
@@ -1855,7 +1855,7 @@ Lon %2$s</string>
     <string name="last_update">Última actualización: %s</string>
     <string name="update_time">Hora da actualización</string>
     <string name="updates_size">Tamaño da actualización</string>
-    <string name="last_map_change">Última mudanza do mapa: %s</string>
+    <string name="last_map_change">Última modificación do mapa: %s</string>
     <string name="hourly">Cada hora</string>
     <string name="daily">Cada día</string>
     <string name="weekly">Cada semana</string>
@@ -1901,7 +1901,7 @@ Lon %2$s</string>
     <string name="show_polygons">Amosar polígonos</string>
     <string name="find_parking">Atopar aparcamento</string>
     <string name="shared_string_status">Estado</string>
-    <string name="shared_string_save_changes">Garda-las mudanzas</string>
+    <string name="shared_string_save_changes">Gardar modificacións</string>
     <string name="shared_string_email_address">Enderezo de correo</string>
     <string name="rendering_attr_hideUnderground_name">Obxectos subterráneos</string>
     <string name="data_is_not_available">Datos non dispoñíbeis</string>
@@ -2042,7 +2042,7 @@ Lon %2$s</string>
     <string name="get_started">Comezar</string>
     <string name="route_stops_before">%1$s paraxes antes</string>
     <string name="access_direction_haptic_feedback_descr">Inseri-lo enderezo do destino mediante vibración.</string>
-    <string name="use_osm_live_routing_description">Activa-la navegación por mudanzas do OsmAnd ao Vivo.</string>
+    <string name="use_osm_live_routing_description">Activar a navegación por modificacións do OsmAnd ao Vivo.</string>
     <string name="access_disable_offroute_recalc">Non recalcular a ruta ó saírme da mesma</string>
     <string name="access_disable_offroute_recalc_descr">Non recalcula a rota, ó afastarss da mesma.</string>
     <string name="access_disable_wrong_direction_recalc">Non recalculares a rota cando se estea na dirección contraria</string>
@@ -2083,7 +2083,7 @@ Lon %2$s</string>
     <string name="osm_live_thanks">Grazas por apoiar ó OsmAnd! 
 \n 
 \nPara activares tódalas funcións novas, tes que reinicia-lo OsmAnd.</string>
-    <string name="osm_live_region_desc">Parte da súa doazón será enviada ós usuarios do OSM que fagan mudanzas do mapa desa rexión.</string>
+    <string name="osm_live_region_desc">Parte da túa doazón será enviada ós usuarios do OSM que fagan modificacións do mapa desa rexión.</string>
     <string name="osm_live_ask_for_purchase">Merca primeiro unha subscrición ó OsmAnd ao Vivo</string>
     <string name="osm_live_header">Esta subscrición permite actualizacións cada hora para tódolos mapas do mundo.
 \n Un anaco dos ingresos voltan á comunidade do OSM e págase por cada contribución ó OSM.
@@ -2114,7 +2114,7 @@ Lon %2$s</string>
     <string name="show_free_version_banner_description">Amosa o anuncio da versión de balde, mesmo na versión de pago.</string>
     <string name="activate_seamarks_plugin">Activa o plugin da \"Vista náutica\"</string>
     <string name="other_menu_group">Outros</string>
-    <string name="poi_context_menu_modify_osm_change">Modificar mudanza do OSM</string>
+    <string name="poi_context_menu_modify_osm_change">Modificar modificación do OSM</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>
@@ -2688,7 +2688,7 @@ Lon %2$s</string>
     <string name="osm_save_offline">Gardar sen conexión</string>
     <string name="context_menu_item_delete_waypoint">Eliminar punto de pasaxe do GPX\?</string>
     <string name="context_menu_item_edit_waypoint">Editar punto de pasaxe GPX</string>
-    <string name="simulate_initial_startup_descr">Amosa a pantalla do primeiro arrinque e mantén os demais axustes sen mudanzas.</string>
+    <string name="simulate_initial_startup_descr">Amosa a pantalla do primeiro arrinque e mantén os demais axustes sen modificacións.</string>
     <string name="rendering_value_darkyellow_name">Amarelo escuro</string>
     <string name="rendering_value_translucent_pink_name">Rosa translúcido</string>
     <string name="rendering_value_black_name">Negro</string>
@@ -2914,7 +2914,7 @@ Lon %2$s</string>
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Aforra un %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Aforra un %1$s</string>
     <string name="osm_live_payment_current_subscription">Subscrición actual</string>
     <string name="osm_live_payment_renews_monthly">Renovación mensual</string>
     <string name="osm_live_payment_renews_quarterly">Renovación trimestral</string>
@@ -3054,7 +3054,7 @@ Lon %2$s</string>
 \n • Eliminada a análise do Facebook e Firebase da versión de balde (o OsmAnd+ non o inclúe)
 \n
 \n</string>
-    <string name="use_osm_live_public_transport_description">Activar o transporte público para as mudanzas do OsmAnd Live.</string>
+    <string name="use_osm_live_public_transport_description">Activar o transporte público para as modificacións do OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Transporte público no OsmAnd Live</string>
     <string name="shared_string_walk">A pé</string>
     <string name="save_poi_value_exceed_length">Acurta a lonxitude da etiqueta \"%s\" polo menos a 255 caracteres.</string>
@@ -3149,8 +3149,8 @@ Lon %2$s</string>
     <string name="profile_alert_duplicate_name_title">Nome duplicado</string>
     <string name="profile_alert_duplicate_name_msg">Xa existe un perfil con ese nome</string>
     <string name="profile_alert_cant_delete_base">Non se poden eliminar os perfís de base do OsmAnd</string>
-    <string name="profile_alert_need_save_title">Gardar mudanzas</string>
-    <string name="profile_alert_need_save_msg">Primeiro garda as mudanzas no perfil</string>
+    <string name="profile_alert_need_save_title">Gardar modificacións</string>
+    <string name="profile_alert_need_save_msg">Primeiro garda as modificacións no perfil</string>
     <string name="profile_alert_delete_title">Eliminar perfil</string>
     <string name="profile_alert_delete_msg">Tes a certeza de que desexas eliminar o perfil \"%s\"</string>
     <string name="select_base_profile_dialog_title">Escoller o perfil para comezar</string>
@@ -3310,7 +3310,7 @@ Lon %2$s</string>
     <string name="coordinates_format_info">O formato escollido será aplicado en toda a aplicación.</string>
     <string name="pref_selected_by_default_for_profiles">Esta opción está escollida por defecto para os perfís: %s</string>
     <string name="change_default_settings">Mudar os axustes</string>
-    <string name="discard_changes">Rexeitar mudanza</string>
+    <string name="discard_changes">Rexeitar modificación</string>
     <string name="apply_to_current_profile">Aplicar só a \"%1$s\"</string>
     <string name="apply_to_all_profiles">Aplicar a tódolos perfís</string>
     <string name="start_up_message_pref">Mensaxe de inicio</string>
@@ -3427,7 +3427,7 @@ Lon %2$s</string>
 \n • Outras correccións de erros
 \n
 \n</string>
-    <string name="apply_preference_to_all_profiles">Podes aplicar esta mudanza a todos ou só ós perfís seleccionados.</string>
+    <string name="apply_preference_to_all_profiles">Podes aplicar esta modificación a todos ou só ós perfís seleccionados.</string>
     <string name="shared_preference">Compartillado</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Preferir estradas sen pavimentar</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Preferir as estradas sen pavimentar aos pavimentados para o trazado de rutas.</string>
@@ -3494,7 +3494,7 @@ Lon %2$s</string>
     <string name="choose_icon_color_name">Icona, cor e nome</string>
     <string name="reorder_profiles">Editar a listaxe de perfís</string>
     <string name="selected_profile">Perfil seleccionado</string>
-    <string name="reset_confirmation_descr">Ó premer en %1$s, serán desbotadas todas as túas mudanzas.</string>
+    <string name="reset_confirmation_descr">Ó premer en %1$s, serán desbotadas todas as túas modificacións.</string>
     <string name="reset_all_profile_settings_descr">Restabelecer todos os axustes do perfil ós valores por defecto da instalación.</string>
     <string name="reset_all_profile_settings">Restabelecer todos os axustes do perfil\?</string>
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
@@ -3552,7 +3552,7 @@ Lon %2$s</string>
     <string name="multimedia_photo_play_sound">Son do obturador da cámara</string>
     <string name="osm_authorization_success">A autorización foi correcta</string>
     <string name="rearrange_categories">Reorganizar categorías</string>
-    <string name="create_custom_categories_list_promo">Podes engadir categorías personalizadas, agochar as categorías que non semellen necesarias e mudar a orde de clasificación da listaxe. A listaxe pode ser importada e exportada con perfís.</string>
+    <string name="create_custom_categories_list_promo">Muda a orde de clasificación da listaxe ou agocha as categorías innecesarias. Podes importar ou exportar todos as modificacións cos perfís.</string>
     <string name="add_new_custom_category_button_promo">Podes engadir unha nova categoría personalizada marcando unha ou varias categorías necesarias.</string>
     <string name="reset_to_default_category_button_promo">Restabelecer ó valor por defecto, restabelecerá a orde de clasificación ó estado por defecto após a instalación.</string>
     <string name="shared_string_available">Dispoñíbel</string>
@@ -3692,4 +3692,55 @@ Lon %2$s</string>
     <string name="lang_lmo">Lombardo</string>
     <string name="custom_color">Cor personalizada</string>
     <string name="extra_maps_menu_group">Mapas adicionais</string>
+    <string name="shared_string_terrain">Terreo</string>
+    <string name="hillshade_description">Mapa de asombreado empregando sombras escuras para amosar as pendentes, cumios e terras baixas.</string>
+    <string name="slope_description">A pendente visualízase en cores sobre o terreo.</string>
+    <string name="terrain_slider_description">Define os niveis de achegamento mínimo e máximo nos que se amosará a capa.</string>
+    <string name="hillshade_download_description">Precísanse mapas adicionais para ollar o asombreado no mapa.</string>
+    <string name="slope_download_description">Precísanse mapas adicionais para ollar as pendentes no mapa.</string>
+    <string name="slope_read_more">Podes ler máis sobre as pendentes en %1$s.</string>
+    <string name="shared_string_transparency">Transparencia</string>
+    <string name="shared_string_zoom_levels">Niveis de achegamento</string>
+    <string name="shared_string_legend">Lenda</string>
+    <string name="terrain_empty_state_text">Permite ollar o asombreado ou o mapa de pendentes. Podes ler máis sobre estes tipos de mapas no noso sitio</string>
+    <string name="shared_string_hillshade">Sombras do relevo</string>
+    <string name="import_complete_description">Todos os datos de %1$s son importados, podes empregar os botóns de abaixo para abrir a parte necesaria da aplicación para xestionala.</string>
+    <string name="shared_string_import_complete">Importación completada</string>
+    <string name="items_added">Elementos engadidos</string>
+    <string name="checking_for_duplicate_description">OsmAnd comproba %1$s para ver se hai duplicados cos elementos existentes na aplicación. 
+\n 
+\nPode levar algún tempo.</string>
+    <string name="shared_string_importing">Estase a importar</string>
+    <string name="importing_from">Estanse a importar datos de %1$s</string>
+    <string name="clear_recorded_data_warning">Eliminar os datos gravados\?</string>
+    <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desvío</string>
+    <string name="select_distance_route_will_recalc">Escolle a distancia após a cal a ruta será recalculada.</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_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>
+    <string name="delete_description">Eliminar descrición</string>
+    <string name="add_description">Engadir descrición</string>
+    <string name="select_group">Escoller grupo</string>
+    <string name="select_shape">Escoller forma</string>
+    <string name="shared_string_circle">Círculo</string>
+    <string name="shared_string_octagon">Octógono</string>
+    <string name="shared_string_square">Cadrado</string>
+    <string name="shared_string_min">Mín</string>
+    <string name="ui_customization_description">Personaliza a morea de elementos na gabeta, na configuración do mapa e o menú contextual. 
+\n 
+\nPodes desactivar os plugins non enpregados, para agochar todos os seus controis da aplicación %1$s.</string>
+    <string name="ui_customization_short_descr">Elementos da gabeta, menú contextual</string>
+    <string name="ui_customization">Personalización da interface de usuario</string>
+    <string name="shared_string_drawer">Gabeta</string>
+    <string name="context_menu_actions">Accións do menú contextual</string>
+    <string name="reorder_or_hide_from">Reordenar ou agochar elementos de %1$s.</string>
+    <string name="shared_string_divider">Divisor</string>
+    <string name="divider_descr">Elementos abaixo deste punto separados por un divisor.</string>
+    <string name="shared_string_hidden">Agochado</string>
+    <string name="hidden_items_descr">Estes elementos non se amosan no menú, mais as opcións ou plugins que representan seguirán a funcionar.</string>
+    <string name="reset_items_descr">Os axustes restabeleceranse ó estado orixinal após agocharse.</string>
 </resources>

OsmAnd/res/values-he/phrases.xml

@@ -5,7 +5,7 @@
     <string name="poi_emergency">שרותי חירום</string>
     <string name="poi_transportation">תחבורה</string>
     <string name="poi_road_obstacle">חסימות דרכים</string>
-    <string name="poi_filling_station">תחנת דלק</string>
+    <string name="poi_filling_station">תחנת מילוי</string>
     <string name="poi_personal_transport">תחבורה אישית</string>
     <string name="poi_public_transport">תחבורה ציבורית</string>
     <string name="poi_air_transport">תחבורה אווירית</string>
@@ -116,7 +116,7 @@
     <string name="poi_musical_instrument">חנות כלי נגינה</string>
     <string name="poi_newsagent">סוכנות חדשות</string>
     <string name="poi_optician">אופטומטריסט</string>
-    <string name="poi_organic">חנות מזון אורגני</string>
+    <string name="poi_organic">מוצרים אורגניים</string>
     <string name="poi_outdoor">חנות ציוד טבע</string>
     <string name="poi_paint">חנות ציור</string>
     <string name="poi_pet">חנות בעלי חיים</string>
@@ -157,7 +157,7 @@
     <string name="poi_payment_toll_type">סוג התשלום</string>
     <string name="poi_traffic_signals_sound">קול</string>
     <string name="poi_highway_crossing_type">סוג</string>
-    <string name="poi_tactile_paving">ריצוף מובלט</string>
+    <string name="poi_tactile_paving">ריצוף מישושי</string>
     <string name="poi_brushless">בראשלס</string>
     <string name="poi_self_service">שירות עצמי</string>
     <string name="poi_automated">אוטומטי</string>
@@ -1310,8 +1310,8 @@
     <string name="poi_internet_access_service">גישה לאינטרנט: שירות</string>
     <string name="poi_internet_access_yes">גישה לאינטרנט: יש</string>
     <string name="poi_internet_access_no">גישה לאינטרנט: אין</string>
-    <string name="poi_internet_access_fee_yes">גישה לאינטרנט - בתשלום עמלה</string>
-    <string name="poi_internet_access_fee_no">גישה לאינטרנט - ללא תשלום</string>
+    <string name="poi_internet_access_fee_yes">גישה לאינטרנט: בתשלום עמלה</string>
+    <string name="poi_internet_access_fee_no">גישה לאינטרנט: ללא תשלום</string>
     <string name="poi_monastery">מנזר</string>
     <string name="poi_religious">אזור דת</string>
     <string name="poi_wayside_cross">צלב בצד הדרך</string>
@@ -2120,4 +2120,43 @@
     <string name="poi_fuel_autogas">גפ״מ</string>
     <string name="poi_fuel_jeta1">דלק מטוסים A-1</string>
     <string name="poi_fuel_adblue">תוסף AdBlue</string>
+    <string name="poi_atm">כספומט</string>
+    <string name="poi_car_pooling">מקום בנסיעה שיתופית</string>
+    <string name="poi_denomination_wesleyan">וסליאן</string>
+    <string name="poi_denomination_united_church_of_christ">הכנסייה המאוחדת של ישו</string>
+    <string name="poi_denomination_church_of_christ">כנסיית ישו</string>
+    <string name="poi_denomination_spiritist">ספיריטיזם</string>
+    <string name="poi_denomination_nazarene">נזרין</string>
+    <string name="poi_attraction_amusement_ride">מתקן שעשועים</string>
+    <string name="poi_historic_tank">טנק היסטורי</string>
+    <string name="poi_historic_aircraft">כלי טיס היסטורי</string>
+    <string name="poi_storage_tank">מיכל אחסון</string>
+    <string name="poi_gasometer">מד גז</string>
+    <string name="poi_water_works">אספקת מים</string>
+    <string name="poi_standpipe">משאבת מים</string>
+    <string name="poi_escape_lane">נתיב מילוט</string>
+    <string name="poi_fuel_coal">דלק: פחם טבעי</string>
+    <string name="poi_fuel_charcoal">דלק: פחם</string>
+    <string name="poi_fuel_wood">דלק: עץ</string>
+    <string name="poi_video_telephone">סרטון</string>
+    <string name="poi_sms">מסרון</string>
+    <string name="poi_volcano_status">מצב</string>
+    <string name="poi_volcano_type">סוג</string>
+    <string name="poi_bath_open_air">האוויר הפתוח</string>
+    <string name="poi_bath_type">סוג</string>
+    <string name="poi_cash_withdrawal_bank_card">משיכת מזומנים</string>
+    <string name="poi_access_disabled">גישה לנכים</string>
+    <string name="poi_access_goods">גישה למשאית קלה</string>
+    <string name="poi_access_hgv">גישה למשאית משא</string>
+    <string name="poi_access_mofa">גישה לטוסטוסון (Mofa)</string>
+    <string name="poi_access_moped">גישה לטוסטוס</string>
+    <string name="poi_access_motorcycle">גישה לאופנועים</string>
+    <string name="poi_access_trailer">גישה לנגררים</string>
+    <string name="poi_access_motorhome">גישה לבית ממונע</string>
+    <string name="poi_access_caravan">גישה לקרוואן</string>
+    <string name="poi_access_bus">גישה לאוטובוס</string>
+    <string name="poi_snowmobile_filter">גישה לאופנוע שלג</string>
+    <string name="poi_climbing_crag">כן</string>
+    <string name="poi_climbing_crag_filter">מצוק טיפוס</string>
+    <string name="poi_rtsa_scale_filter">קטגוריית קושי</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">שנתית</string>
     <string name="osm_live_payment_month_cost_descr">%1$s לחודש</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s לחודש</string>
-    <string name="osm_live_payment_discount_descr">חיסכון של %1$s.</string>
+    <string name="osm_live_payment_discount_descr">חיסכון של %1$s</string>
     <string name="osm_live_payment_current_subscription">המינוי הנוכחי</string>
     <string name="osm_live_payment_renews_monthly">מתחדש חודשית</string>
     <string name="osm_live_payment_renews_quarterly">מתחדש רבעונית</string>
@@ -3595,10 +3595,10 @@
     <string name="live_monitoring_tracking_interval">מרווח מעקב</string>
     <string name="monitoring_min_distance_descr">מסנן זה מונע תיעוד כפילות של נקודות כשלא הייתה מספיק תנועה, יוצר תצוגה מרחבית נאה יותר של מסלולים שלא עוברים עיבוד לאחר מכן.</string>
     <string name="replace_point_descr">החלפת נקודה אחרת בזו</string>
-    <string name="changes_applied_to_profile">השינויים על הפרופיל %1$s חלו.</string>
-    <string name="settings_item_read_error">לא ניתן לקרוא את %1$s.</string>
-    <string name="settings_item_write_error">לא ניתן לכתוב את %1$s.</string>
-    <string name="settings_item_import_error">לא ניתן לייבא את %1$s.</string>
+    <string name="changes_applied_to_profile">השינויים לפרופיל ‚%1$s’ חלו.</string>
+    <string name="settings_item_read_error">לא ניתן לקרוא מתוך ‚%1$s’.</string>
+    <string name="settings_item_write_error">לא ניתן לכתוב אל ‚%1$s’.</string>
+    <string name="settings_item_import_error">לא ניתן לייבא מתוך ‚%1$s’.</string>
     <string name="monitoring_min_speed_descr">זה מסנן שחותך מהירויות נמוכות כדי לא להקליט נקודות מתחת למהירות מסוימת. הפעלת המסנן תגרום לכך שהמסלולים ייראו חלקים יותר כשמסתכלים על המפה.</string>
     <string name="app_mode_ski_touring">טיולי סקי</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
@@ -3617,9 +3617,9 @@
 \nניתן יהיה להחליף בין כל השפות הזמינות בזמן קריאת הערך.</string>
     <string name="shared_string_items">פריטים</string>
     <string name="developer_plugin">תוסף מפתח</string>
-    <string name="ui_customization_description">התאמת כמות הפריטים במגירה, הגדרת מפה ותפריט הקשר.
-\n
-\nניתן להשבית את התוספים שאינם בשימוש כדי להסתיר את כל הפקדים שלהם מהיישומון %1$s.</string>
+    <string name="ui_customization_description">התאמת כמות הפריטים במגירה, הגדרת המפה ותפריט ההקשר. 
+\n 
+\nניתן לכבות את התוספים שאינם בשימוש כדי להסתיר את כל הפקדים שלהם מהיישומון %1$s.</string>
     <string name="ui_customization_short_descr">פריטי מגירה, תפריט הקשר</string>
     <string name="ui_customization">התאמות מנשק משתמש</string>
     <string name="shared_string_drawer">מגירה</string>
@@ -3628,11 +3628,11 @@
     <string name="shared_string_divider">קו הפרדה</string>
     <string name="divider_descr">הפריטים מתחת לנקודה זו מופרדים בקו הפרדה.</string>
     <string name="shared_string_hidden">מוסתר</string>
-    <string name="hidden_items_descr">הפריטים האלו מוסתרים מהתפריט אבל האפשרויות המיוצגות או התוספים יישארו זמינים.</string>
-    <string name="reset_items_descr">ההגדרות יאופסו למצב המקורי לאחר ההסתרה.</string>
-    <string name="main_actions_descr">פעולות ראשיות מכילות 4 כפתורים בלבד.</string>
+    <string name="hidden_items_descr">הפריטים האלו מוסתרים מהתפריט אבל האפשרויות המיוצגות או התוספים ימשיכו לעבוד.</string>
+    <string name="reset_items_descr">הסתרת הגדרות מאפסת אותן למצבן ההתחלתי.</string>
+    <string name="main_actions_descr">‚פעולות ראשיות’ מכילות 4 כפתורים בלבד.</string>
     <string name="main_actions">פעולות ראשית</string>
-    <string name="additional_actions_descr">ניתן לגשת לפעולות האלה על ידי לחיצה על הכפתור „פעולות”.</string>
+    <string name="additional_actions_descr">ניתן לגשת לפעולות האלה על ידי לחיצה על הכפתור „פעולות נוספות”.</string>
     <string name="move_inside_category">ניתן להעביר פריטים בתוך קטגוריה זו בלבד.</string>
     <string name="select_wikipedia_article_langs">נא לבחור את השפות בהן יופיעו ערכים של ויקיפדיה במפה. ניתן להחליף בין כל השפות הזמינות בזמן קריאת הערך.</string>
     <string name="some_articles_may_not_available_in_lang">יתכן שחלק מהערכים בוויקיפדיה לא יהיו זמינים בשפה שלך.</string>
@@ -3666,4 +3666,22 @@
     <string name="extra_maps_menu_group">מפות נוספות</string>
     <string name="lang_war">וראי</string>
     <string name="download_unsupported_action">הפעולה %1$s אינה נתמכת</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">חשבון ה־Google Play שלך יחויב בעת רכישת מנוי
+\nועם תפוגתו (חודש/שלושה חודשים/שנה),
+\nהוא לא יחדש את עצמו או יבוטל טרם החידוש מההגדרות שלך ב־Google Play.</string>
+    <string name="search_poi_types">חיפוש סוגי נקודות עניין</string>
+    <string name="search_poi_types_descr">שילוב סוגי נקודות עניין מקטגוריות שונות. יש לגעת ב„החלפה” כדי לבחור את כולן, נגיעה בצד השמאלי לבחירת קטגוריה.</string>
+    <string name="tracker_item">עוקב OsmAnd</string>
+    <string name="mapillary_item">OsmAnd ו־Mapillary</string>
+    <string name="quick_action_item">פעולה מהירה</string>
+    <string name="radius_ruler_item">סרגל רדיוס</string>
+    <string name="measure_distance_item">מדידת מרחק</string>
+    <string name="travel_item">טיול (ויקימסע וויקיפדיה)</string>
+    <string name="map_markers_item">סמני מפה</string>
+    <string name="favorites_item">מועדפים</string>
+    <string name="subscription_osmandlive_item">מינוי - OsmAnd Live</string>
+    <string name="osmand_purchases_item">רכישות OsmAnd</string>
+    <string name="legend_item_description">המדריך לסמלי מפה</string>
+    <string name="navigation_profiles_item">פרופילי ניווט</string>
 </resources>

OsmAnd/res/values-id/strings.xml

@@ -708,12 +708,12 @@
     <string name="osm_live_payment_annual_title">Tahunan</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / bulan</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / bulan</string>
-    <string name="osm_live_payment_discount_descr">Hemat %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Hemat %1$s</string>
     <string name="osm_live_payment_current_subscription">Langganan saat ini</string>
     <string name="osm_live_payment_renews_monthly">Perpanjang tiap bulan</string>
     <string name="osm_live_payment_renews_quarterly">Perpanjang tiap 4 bulan</string>
     <string name="osm_live_payment_renews_annually">Perpanjang tiap tahun</string>
-    <string name="default_price_currency_format"/>
+    <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="osm_live_payment_header">Pilih periode pembayaran yang anda inginkan:</string>
     <string name="osm_live_payment_contribute_descr">Sebagian pendapatan diberikan untuk kontributor OpenStreetMap.</string>
     <string name="powered_by_osmand">Oleh OsmAnd</string>

OsmAnd/res/values-is/strings.xml

@@ -939,7 +939,7 @@ Ferill %2$s</string>
     <string name="continuous_rendering">Samfelld myndgerð</string>
     <string name="show_point_options">Nota staðsetningu …</string>
     <string name="renderers_descr">Veldu útlit myndgerðar</string>
-    <string name="download_type_to_filter">skrifaðu að sía</string>
+    <string name="download_type_to_filter">skrifaðu til að sía</string>
     <string name="use_high_res_maps">Skjár með háupplausn</string>
     <string name="context_menu_item_search_transport">Leita að almenningssamgöngum</string>
     <string name="voices">Talskilaboð</string>
@@ -2864,7 +2864,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Árlega</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mánuði</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mánuði</string>
-    <string name="osm_live_payment_discount_descr">Sparaðu %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Sparaðu %1$s</string>
     <string name="osm_live_payment_current_subscription">Núverandi áskrift</string>
     <string name="osm_live_payment_renews_monthly">Endurnýjast mánaðarlega</string>
     <string name="osm_live_payment_renews_quarterly">Endurnýjast ársfjórðungslega</string>
@@ -3655,7 +3655,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="select_wikipedia_article_langs">Veldu þau tungumál sem Wikipedia-greinarnar ættu að birtast á á kortinu. Þú munt geta skipt á milli allra tiltækra tungumála á meðan þú lest greinar.</string>
     <string name="some_articles_may_not_available_in_lang">Sumar Wikipedia-greinar gætu verið ekki tiltækar á þínu tungumáli.</string>
     <string name="lang_zhyue">Kantónska</string>
-    <string name="lang_zhminnan">Suður-mín</string>
+    <string name="lang_zhminnan">Suður-Mín</string>
     <string name="lang_yo">Yórúba</string>
     <string name="lang_war">Waray</string>
     <string name="lang_uz">Úsbekíska</string>
@@ -3682,4 +3682,13 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="lang_an">Aragónska</string>
     <string name="lang_lmo">Lombardíska</string>
     <string name="custom_color">Sérsniðinn litur</string>
+    <string name="osm_live_payment_subscription_management">Greiðsla verður gjaldfærð á Google Play reikninginn þinn við staðfestingu á kaupunum.
+\n
+\nÁskrift endurnýjast sjálfkrafa nema hún sé felld niður fyrir endurnýjunardag. Reikningur þinn verður einungis gjaldfærður fyrir endurnýjunartímabil (mánuður / þrír mánuðir / ár) á endurnýjunardegi.
+\n
+\nÞú getur stýrt og aflýst áskriftunum þínum með því að fara í Google Play stillingarnar þínar.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Leita í tegundum merkisstaða</string>
+    <string name="search_poi_types_descr">Sameina gerðir merkisstaða úr mismunandi flokkum. Ýttu á hnappinn til að velja allt, ýttu vinstra megin til að fara í val á flokkum.</string>
+    <string name="download_unsupported_action">Óstudd aðgerð %1$s</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -1704,8 +1704,8 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="favorite_category_name">Nome della categoria</string>
     <string name="favorite_category_add_new_title">Aggiungi una nuova categoria</string>
     <string name="confirm_download_roadmaps">Le mappe solo stradali non sono necessarie dato che disponi già delle mappe standard complete. Scaricare comunque\?</string>
-    <string name="value_downloaded_of_max">%1$,1f di %2$,1f MB</string>
-    <string name="file_size_in_mb">%,1f MB</string>
+    <string name="value_downloaded_of_max">%1$.1f di %2$.1f MB</string>
+    <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Aggiorna tutto (%1$s MB)</string>
     <string name="free_downloads_used">Scaricamenti gratuiti utilizzati</string>
     <string name="free_downloads_used_description">Mostra il numero di download gratuiti rimasti.</string>
@@ -2852,7 +2852,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Annualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
-    <string name="osm_live_payment_discount_descr">Risparmia %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Risparmia %1$s</string>
     <string name="osm_live_payment_current_subscription">Attuale sottoscrizione</string>
     <string name="osm_live_payment_renews_monthly">Abbonamento mensile</string>
     <string name="osm_live_payment_renews_quarterly">Rinnovo trimestrale</string>

OsmAnd/res/values-ka/strings.xml

@@ -1185,7 +1185,7 @@
     <string name="osm_live_payment_annual_title">წელიწადში ერთხელ გადახდა</string>
     <string name="osm_live_payment_month_cost_descr">%1$s თვეში</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s თვეში</string>
-    <string name="osm_live_payment_discount_descr">დაზოგეთ %1$s !</string>
+    <string name="osm_live_payment_discount_descr">დაზოგეთ %1$s</string>
     <string name="osm_live_payment_current_subscription">თქვენი მიმდინარე გამოწერა</string>
     <string name="osm_live_payment_renews_monthly">თვიური განახლება</string>
     <string name="osm_live_payment_renews_annually">წლიური განახლება</string>

OsmAnd/res/values-lt/strings.xml

@@ -2555,7 +2555,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
     <string name="osm_live_payment_annual_title">Kartą per metus</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mėnuo</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mėnuo</string>
-    <string name="osm_live_payment_discount_descr">Sutaupyk %1$s!</string>
+    <string name="osm_live_payment_discount_descr">Sutaupyk %1$s</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="start_search_from_city">Pirmiausiai parinkite miestą</string>
     <string name="routing_attr_avoid_tram_name">Vengti tramvajų</string>

OsmAnd/res/values-lv/strings.xml

@@ -2652,7 +2652,7 @@ No Afganistānas līdz Zimbabvei, no Austrālijas līdz ASV, Argentīna, Brazīl
     <string name="osm_live_payment_annual_title">Ikgadēja</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mēnesī</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mēnesī</string>
-    <string name="osm_live_payment_discount_descr">Ietaupiet %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ietaupiet %1$s</string>
     <string name="osm_live_payment_current_subscription">Patreizējais abonoments</string>
     <string name="osm_live_payment_renews_monthly">Atjaunojas katru mēnesi</string>
     <string name="osm_live_payment_renews_quarterly">Atjaunojas katru ceturksni</string>

OsmAnd/res/values-ml/strings.xml

@@ -1797,7 +1797,7 @@
     <string name="osm_live_payment_annual_title">വര്ഷത്തിലൊരിക്കൽ</string>
     <string name="osm_live_payment_month_cost_descr">"പ്റതിമാസം  %1$s"</string>
     <string name="osm_live_payment_month_cost_descr_ex">"പ്റതിമാസം %1$.2f %2$s "</string>
-    <string name="osm_live_payment_discount_descr">%1$s ലാഭിക്കുക .</string>
+    <string name="osm_live_payment_discount_descr">%1$s ലാഭിക്കുക</string>
     <string name="osm_live_payment_current_subscription">നിലവിലെ സബ്സ്ക്രിപ്ഷൻ</string>
     <string name="osm_live_payment_renews_monthly">മാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>
     <string name="osm_live_payment_renews_quarterly">മൂന്നുമാസത്തിലൊരിക്കൽ ആവര്‍ത്തിക്കുക</string>

OsmAnd/res/values-nb/strings.xml

@@ -2846,7 +2846,7 @@
     <string name="osm_live_payment_annual_title">Årlig</string>
     <string name="osm_live_payment_month_cost_descr">%1$s per måned</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s per måned</string>
-    <string name="osm_live_payment_discount_descr">Lagre %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Lagre %1$s</string>
     <string name="osm_live_payment_current_subscription">Nåværende abonnement</string>
     <string name="osm_live_payment_renews_monthly">Fornyes månedlig</string>
     <string name="osm_live_payment_renews_quarterly">Fornyes kvartalsvis</string>
@@ -3531,4 +3531,8 @@
     <string name="profile_prefs_reset_successful">Alle profilinnstillinger gjenopprettet til forvalg.</string>
     <string name="shared_string_transparency">Gjennomsiktighet</string>
     <string name="shared_string_legend">Tegnforklaring</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="reset_plugin_to_default">Tilbakestill programtilleggsinnstillinger til forvalg</string>
+    <string name="download_unsupported_action">Ustøttet handling %1$s</string>
+    <string name="extra_maps_menu_group">Ekstra kart</string>
 </resources>

OsmAnd/res/values-nl/strings.xml

@@ -117,7 +117,7 @@
     <string name="fav_export_confirmation">Er is al een bestand met geëxporteerde favorieten. Wil je dat bestand overschrijven?</string>
     <string name="profile_settings">Instellingen voor profiel</string>
     <string name="settings_preset">Standaardprofiel</string>
-    <string name="settings_preset_descr">Kaart en navigatie instellingen worden per profiel onthouden. Kies hier het standaardprofiel.</string>
+    <string name="settings_preset_descr">Kaart- en navigatie instellingen worden per profiel onthouden. Kies hier het standaardprofiel.</string>
     <string name="routing_settings">Navigatie</string>
     <string name="routing_settings_descr">Opties voor navigatie.</string>
     <string name="global_settings">Algemene instellingen</string>
@@ -326,7 +326,7 @@
     <string name="voice_is_not_available_title">Kies een stem-begeleidingspakket</string>
     <string name="daynight_mode_day">Dag</string>
     <string name="daynight_mode_night">Nacht</string>
-    <string name="daynight_mode_auto">Zonsopgang/-ondergang</string>
+    <string name="daynight_mode_auto">Zonsopgang/Zonsondergang</string>
     <string name="daynight_mode_sensor">Lichtsensor</string>
     <string name="daynight_descr">Regel omschakeling tussen dag- en nachtmodus.</string>
     <string name="daynight">Dag/nacht modus</string>
@@ -372,7 +372,7 @@
     <string name="rotate_map_bearing_opt">In beweegrichting</string>
     <string name="rotate_map_none_opt">Niet roteren (noorden boven)</string>
     <string name="rotate_map_to_bearing_descr">Kaart-uitlijning:</string>
-    <string name="rotate_map_to_bearing">Kaartrotatie</string>
+    <string name="rotate_map_to_bearing">Kaart oriëntatie</string>
     <string name="show_route">Route-details</string>
     <string name="fav_imported_sucessfully">Favorieten succesvol geïmporteerd</string>
     <string name="fav_file_to_load_not_found">GPX-bestand met favorieten niet gevonden op {0}</string>
@@ -484,7 +484,7 @@
     <string name="route_general_information">Totale afstand %1$s, reistijd %2$d u %3$d min.</string>
     <string name="router_service_descr">Online of offline routeberekening-dienst.</string>
     <string name="router_service">Routeberekening</string>
-    <string name="sd_dir_not_accessible">Opslagmap op SD kaart is niet toegankelijk!</string>
+    <string name="sd_dir_not_accessible">De opslagmap op de geheugenkaart is niet toegankelijk!</string>
     <string name="download_question">Download {0} - {1} ?</string>
     <string name="download_question_exist">Offline gegevens voor {0} bestaan al ({1}). Wil je deze bijwerken ({2})?</string>
     <string name="address">Adres</string>
@@ -500,8 +500,8 @@
     <string name="mark_final_location_first">Kies eerst een bestemming</string>
     <string name="get_directions">Routebeschrijving</string>
     <string name="opening_hours">Openingstijden</string>
-    <string name="opening_changeset">Changeset wordt geopend…</string>
-    <string name="closing_changeset">Changeset wordt gesloten…</string>
+    <string name="opening_changeset">Wijzigingsset openen…</string>
+    <string name="closing_changeset">Wijzigingsset sluiten…</string>
     <string name="commiting_node">Punt wordt vastgelegd…</string>
     <string name="loading_poi_obj">Interessepunt wordt geladen…</string>
     <string name="auth_failed">Authorisatie mislukt</string>
@@ -645,8 +645,8 @@
 \n 
 \nTegelkaarten zijn direct via online bronnen verkrijgbaar of kunnen voor offline gebruik gereedgemaakt worden (en handmatig gekopieerd naar de OsmAnd gegevensmap) als SQLite database door diverse hulpprogramma\'s van derden.</string>
     <string name="osmand_background_plugin_description">Instellingen om tracking en navigatie te kunnen gebruiken met het scherm uit (schakelt de GPS periodiek in).</string>
-    <string name="osmand_accessibility_description">Deze plugin maakt de toegankelijkheids-opties van uw toestel beschikbaar in OsmAnd. Het vergemakkelijkt o.a. het aanpassen van de spreeksnelheid van tekst-naar-spraak stemmen, het configureren van D-pad scherm navigatie door gebruik van een trackbal voor zoomregeling of het gebruiken van tekst-naar-spraak opties voor het automatisch aankondigen van uw positie.</string>
-    <string name="osmand_development_plugin_description">Deze plugin toont de instellingen voor ontwikkel- en debug-opties, zoals routetest en -simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
+    <string name="osmand_accessibility_description">Deze plug-in maakt de toegankelijkheids-opties van uw toestel beschikbaar in OsmAnd. Het vergemakkelijkt o.a. het aanpassen van de spreeksnelheid van tekst-naar-spraak stemmen, het configureren van D-pad scherm navigatie door gebruik van een trackbal voor zoomregeling of het gebruiken van tekst-naar-spraak opties voor het automatisch aankondigen van uw positie.</string>
+    <string name="osmand_development_plugin_description">Deze plug-in toont de instellingen voor ontwikkel- en debug-opties, zoals routetest en -simulatie, schermweergave-prestaties, en spraaksturing. Deze instellingen zijn bedoeld voor programmeurs die OsmAnd willen verbeteren en zijn niet nodig voor normaal gebruik.</string>
     <string name="plugins_screen">Plugins beheren</string>
     <string name="prefs_plugins_descr">Schakel plugins in voor speciale functies en extra instellingen.</string>
     <string name="prefs_plugins">Plugin-manager</string>
@@ -718,7 +718,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="route_updated_loc_found">Route wordt herberekend als positie gevonden is</string>
     <string name="continue_follow_previous_route_auto">Vorige navigatie was nog niet klaar. Nu daarmee doorgaan? (%1$s seconden)</string>
     <string name="show_cameras">Snelheidscamera\'s</string>
-    <string name="show_traffic_warnings">Verkeers waarschuwingen</string>
+    <string name="show_traffic_warnings">Verkeerswaarschuwingen</string>
     <string name="avoid_toll_roads">Geen tolwegen</string>
     <string name="map_widget_top_text">Straatnaam</string>
     <string name="map_widget_config">Configuratie</string>
@@ -950,7 +950,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="plugin_distance_point">Punt</string>
     <string name="gpx_file_name">GPX-bestandsnaam</string>
     <string name="gpx_saved_sucessfully">GPX-bestand succesvol opgeslagen als {0}</string>
-    <string name="osmand_distance_planning_plugin_description">Deze plugin voorziet een kaart-widget waarmee u een route kan ontwerpen door op de kaart te tikken, of gebruik te maken (of wijzigen) van bestaande GPX-bestanden. Plan zo een reis en bereken de afstand tussen punten. Het resultaat kan worden bewaard als GPX-bestand, om later te gebruiken als navigatieroute.</string>
+    <string name="osmand_distance_planning_plugin_description">Deze plug-in voorziet een kaart-widget waarmee u een route kan ontwerpen door op de kaart te tikken, of gebruik te maken (of wijzigen) van bestaande GPX-bestanden. Plan zo een reis en bereken de afstand tussen punten. Het resultaat kan worden bewaard als GPX-bestand, om later te gebruiken als navigatieroute.</string>
     <string name="osmand_distance_planning_plugin_name">Afstand meten en Route plannen</string>
     <string name="use_distance_measurement_help">* Tik om een punt te markeren.
 \n* Druk lang op de kaart om het vorige punt te verwijderen. 
@@ -981,8 +981,8 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="av_camera_focus_continuous">Voortdurend blijven scherpstellen</string>
     <string name="av_photo_play_sound_descr">Kies of er al dan niet een sluitergeluid wordt afgespeeld bij foto opname.</string>
     <string name="speak_speed_limit">Snelheidslimiet</string>
-    <string name="speak_cameras">Snelheidscamera\'s</string>
-    <string name="speak_traffic_warnings">Verkeers Waarschuwingen</string>
+    <string name="speak_cameras">Flitspalen</string>
+    <string name="speak_traffic_warnings">Verkeerswaarschuwingen</string>
     <string name="route_from">Van:</string>
     <string name="osb_author_or_password_not_specified">Specificeer OSM-gebruikersnaam en -wachtwoord in Instellingen</string>
     <string name="clear_intermediate_points">Wis Tussenpunten</string>
@@ -1028,7 +1028,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="auto_zoom_close">Zoom naar close-up</string>
     <string name="auto_zoom_far">Zoom naar gemiddelde afstand</string>
     <string name="auto_zoom_farthest">Zoom naar grote afstand</string>
-    <string name="animate_routing_route_not_calculated">U moet eerst een route berekenen</string>
+    <string name="animate_routing_route_not_calculated">Gelieve eerst de route te berekenen</string>
     <string name="animate_routing_route">"Routesimulatie met de berekende route "</string>
     <string name="animate_routing_gpx">Routesimulatie met een GPX-track</string>
     <string name="local_osm_changes_delete_all_confirm">Bent u zeker om %1$d OSM-wijzigingen te verwijderen\?</string>
@@ -1309,7 +1309,7 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="everything_up_to_date">Alle bestanden zijn bijgewerkt</string>
     <string name="use_opengl_render">Gebruik OpenGL</string>
     <string name="use_opengl_render_descr">Gebruik snelle hardware-gebaseerde OpenGL weergave (gebruikt mogelijk meer stroom en werkt mogelijk niet op oudere apparaten).</string>
-    <string name="error_avoid_specific_road">Er is geen alternatieve weg gevonden</string>
+    <string name="error_avoid_specific_road">Geen omweg gevonden</string>
     <string name="no_internet_connection">Downloaden mislukt. Controleer de internetverbinding.</string>
     <string name="download_tab_downloads">Alle downloads</string>
     <string name="download_tab_updates">Updates</string>
@@ -1334,8 +1334,8 @@ Proportioneel werkgeheugen %4$s MB (Android limiet %5$s MB, Dalvik %6$s MB).</st
     <string name="traffic_warning_railways">Spoorwegovergang</string>
     <string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
     <string name="show_railway_warnings">Spoorwegovergangen</string>
-    <string name="show_pedestrian_warnings">Voetgangers oversteekplaatsen</string>
-    <string name="speak_pedestrian">Voetgangers oversteekplaatsen</string>
+    <string name="show_pedestrian_warnings">Zebrapaden</string>
+    <string name="speak_pedestrian">Zebrapaden</string>
     <string name="parking_place">Parkeerplek</string>
     <string name="remove_the_tag">Verwijder de parkeerlocatie</string>
     <string name="gps_status">GPS-status</string>
@@ -1842,7 +1842,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="shared_string_remove">Verwijder</string>
     <string name="clear_updates_proposition_message">Je kan gedownloade updates verwijderen en terugkeren naar de originele kaart</string>
     <string name="add_time_span">Periode toevoegen</string>
-    <string name="road_blocked">Weg geblokkeerd</string>
+    <string name="road_blocked">Weg afgesloten</string>
     <string name="shared_string_select">Kies</string>
     <string name="reports_for">Verslag over</string>
     <string name="data_is_not_available">Gegevens niet beschikbaar</string>
@@ -1860,7 +1860,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="osm_user_stat">%1$s bewerkingen, rang %2$s, wereldwijd: %3$s bewerkingen</string>
     <string name="osm_editors_ranking">OSM-Bijdragersplaats</string>
     <string name="osm_live_subscription">OsmAnd Live abonnement</string>
-    <string name="osm_live_subscribe_btn">Abonneren</string>
+    <string name="osm_live_subscribe_btn">Abonneer</string>
     <string name="osm_live_email_desc">Nodig om u updates te bezorgen over uw bijdragen.</string>
     <string name="osm_live_user_public_name">Openbare naam</string>
     <string name="osm_live_hide_user_name">Mijn naam niet tonen in verslagen</string>
@@ -1957,7 +1957,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="access_direction_haptic_feedback_descr">Geef de richting van de bestemming aan met trillingen.</string>
     <string name="move_marker_bottom_sheet_title">Verplaats de kaart om de positie van de markering te wijzigen</string>
     <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
-    <string name="map_widget_battery">Accuniveau</string>
+    <string name="map_widget_battery">Batterij niveau</string>
     <string name="lang_hu_formal">Hongaars (formeel)</string>
     <string name="current_track">Huidig pad</string>
     <string name="change_markers_position">Verschuif markering</string>
@@ -1968,10 +1968,10 @@ Lengtegraad:\t\t%2$s</string>
     <string name="lang_ast">Asturisch</string>
     <string name="app_mode_bus">Lijnbus</string>
     <string name="app_mode_train">Trein</string>
-    <string name="coords_format">Coördinatensysteem</string>
+    <string name="coords_format">Coördinaten formaat</string>
     <string name="shared_string_is_open_24_7">24/7 geopend</string>
     <string name="storage_directory_card">Geheugenkaart</string>
-    <string name="coords_format_descr">Formaat voor de geografische coördinaten.</string>
+    <string name="coords_format_descr">Formaat voor geografische coördinaten.</string>
     <string name="map_widget_search">Zoek</string>
     <string name="search_categories">Categorie</string>
     <string name="postcode">Postcode</string>
@@ -2010,7 +2010,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="no_update_info">Geen updates tonen</string>
     <string name="clear_tile_data">Alle opgeslagen kaarttegels wissen</string>
     <string name="osm_live_payment_desc">Het abonnementsgeld is maandelijks. Het abonnement kan elk moment via Google Play worden gestopt.</string>
-    <string name="donation_to_osm">Gift aan de OSM-gemeenschap</string>
+    <string name="donation_to_osm">Gift aan de OpenStreetMap community</string>
     <string name="donation_to_osm_desc">Een deel van de gift gaat naar OSM-medewerkers. Het abonnementsgeld verandert niet.</string>
     <string name="osm_live_subscription_desc">Het abonnement geeft toegang tot Live Updates (elk uur, elke dag of elke week) en onbeperkte downloads van kaarten van de gehele wereld.</string>
     <string name="get_it">Abonnement nemen</string>
@@ -2039,7 +2039,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="search_hint">Plaatsnaam, adres of naam invoeren</string>
     <string name="rendering_value_light_brown_name">Lichtbruin</string>
     <string name="rendering_value_dark_brown_name">Donkerbruin</string>
-    <string name="rendering_attr_contourColorScheme_name">Kleurschema hoogtelijnen</string>
+    <string name="rendering_attr_contourColorScheme_name">Hoogtelijnen kleurenschema</string>
     <string name="rendering_attr_surfaceIntegrity_name">Kwaliteit van het wegdek</string>
     <string name="christmas_poi">Kerstmis-POI</string>
     <string name="christmas_desc">Voor Kerst en Oud en Nieuw: u kan kiezen om de POI voor kerstbomen en kerstmarkten enz. tonen.</string>
@@ -2060,7 +2060,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="gpx_no_tracks_title">Je hebt nog geen GPX-tracks</string>
     <string name="gpx_no_tracks_title_folder">Je kunt ook GPX-tracks toevoegen aan de map</string>
     <string name="gpx_add_track">Meer toevoegen…</string>
-    <string name="shared_string_appearance">GPX-stijl</string>
+    <string name="shared_string_appearance">Weergave</string>
     <string name="trip_rec_notification_settings">Snelle opname activeren</string>
     <string name="trip_rec_notification_settings_desc">Toon systeemmelding waarmee ritopname toegestaan wordt.</string>
     <string name="shared_string_notifications">Meldingen</string>
@@ -2078,7 +2078,7 @@ Lengtegraad:\t\t%2$s</string>
     <string name="lang_sr_latn">Servisch (Latijns schrift)</string>
     <string name="lang_zh_hk">Chinees (Hong Kong)</string>
     <string name="rendering_attr_contourDensity_description">Hoogtelijnen: dichtheid</string>
-    <string name="rendering_attr_contourDensity_name">Hoogtelijnen dichtheid</string>
+    <string name="rendering_attr_contourDensity_name">Dichtheid hoogtelijnen</string>
     <string name="rendering_value_high_name">Hoog</string>
     <string name="rendering_value_medium_w_name">Gemiddeld</string>
     <string name="rendering_value_low_name">Laag</string>
@@ -2242,12 +2242,12 @@ voor Gebied: %1$s x %2$s</string>
     <string name="routing_attr_relief_smoothness_factor_more_plains_name">Vlak</string>
     <string name="routing_attr_driving_style_speed_name">Kortere routes</string>
     <string name="routing_attr_driving_style_balance_name">Uitgebalanceerd</string>
-    <string name="routing_attr_driving_style_safety_name">Bij voorkeur secundaire wegen</string>
+    <string name="routing_attr_driving_style_safety_name">Verkies binnenwegen</string>
     <string name="relief_smoothness_factor_descr">Terrein-voorkeur: vlakke- of heuvelachtige wegen.</string>
     <string name="favorite_group_name">Groepsnaam</string>
     <string name="change_color">Kleur wijzigen</string>
     <string name="edit_name">Naam wijzigen</string>
-    <string name="animate_my_location">Verlevendig eigen positie</string>
+    <string name="animate_my_location">Animeer eigen positie</string>
     <string name="animate_my_location_desc">Schakel levendige kaartverschuiving in van \'Mijn positie\' tijdens navigatie.</string>
     <string name="shared_string_slope">Helling</string>
     <string name="add_new_folder">Nieuwe map toevoegen</string>
@@ -2563,15 +2563,15 @@ voor Gebied: %1$s x %2$s</string>
     <string name="wikivoyage_travel_guide_descr">Voert je binnen OsmAnd naar de meest interessante plaatsen op aarde, zonder internetverbinding.</string>
     <string name="monthly_map_updates">Maandelijkse kaartupdates</string>
     <string name="daily_map_updates">Kaartupdates: Elk uur</string>
-    <string name="in_app_purchase">"In-app aankopen "</string>
+    <string name="in_app_purchase">In-app aankoop</string>
     <string name="in_app_purchase_desc">Eenmalige betaling</string>
-    <string name="in_app_purchase_desc_ex">Na aankoop is het permanent voor je beschikbaar.</string>
+    <string name="in_app_purchase_desc_ex">"Eens aangekocht,  kun je het permanent blijven gebruiken."</string>
     <string name="purchase_unlim_title">%1$s Kopen</string>
     <string name="wikivoyage_offline">Wikivoyage offline</string>
     <string name="unlimited_downloads">Onbeperkte downloads</string>
     <string name="wikipedia_offline">Wikipedia offline</string>
-    <string name="contour_lines_hillshade_maps">Kaarten met hoogtelijnen en reliëfschaduw</string>
-    <string name="unlock_all_features">Alle mogelijkheden van OsmAnd ontsluiten</string>
+    <string name="contour_lines_hillshade_maps">Hoogtelijnen &amp; Reliëfschaduwkaarten</string>
+    <string name="unlock_all_features">Ontgrendel alle OsmAnd mogelijkheden</string>
     <string name="purchase_dialog_title">Kies je aankoop</string>
     <string name="purchase_dialog_travel_description">Kies een van onderstaande aankopen om de offline reisgids te kunnen gebruiken:</string>
     <string name="purchase_dialog_subtitle">Kies een passend product</string>
@@ -2599,7 +2599,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="use_two_digits_longitude">"Twee cijfers gebruiken voor lengtegraad (i.p.v. drie) "</string>
     <string name="shared_string_travel_guides">"Reisgids "</string>
     <string name="nothing_found_in_radius">Niets gevonden:</string>
-    <string name="clear_all_intermediates">Alle tussenpunten wissen</string>
+    <string name="clear_all_intermediates">Wis alle tussenpunten</string>
     <string name="group_deleted">"Groep verwijderd "</string>
     <string name="rendering_attr_whiteWaterSports_name">Wildwatersporten</string>
     <string name="distance_farthest">Het verste eerst</string>
@@ -2641,8 +2641,8 @@ voor Gebied: %1$s x %2$s</string>
     <string name="rendering_attr_hidePOILabels_name">POI-namen</string>
     <string name="shared_string_without_name">Zonder naam</string>
     <string name="what_is_here">Wat is dit hier:</string>
-    <string name="open_from">Geopend vanaf</string>
-    <string name="open_till">Geopend tot</string>
+    <string name="open_from">Open van</string>
+    <string name="open_till">Open tot</string>
     <string name="will_close_at">Sluit om</string>
     <string name="will_open_at">Gaat open om</string>
     <string name="shared_string_total">Totaal</string>
@@ -2739,7 +2739,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Jaarlijks</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / maand</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / maand</string>
-    <string name="osm_live_payment_discount_descr">Bespaar %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Bespaar %1$s</string>
     <string name="osm_live_payment_current_subscription">"Uw huidige abonnement "</string>
     <string name="osm_live_payment_renews_monthly">Wordt maandelijks verlengd</string>
     <string name="osm_live_payment_renews_quarterly">"Wordt per kwartaal verlengd "</string>
@@ -2917,7 +2917,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="files_failed">Kopiëren van %1$d bestanden mislukt (%2$s).</string>
     <string name="files_present">%1$d bestanden (%2$s) aanwezig op de vorige locatie \'%3$s\'.</string>
     <string name="dont_move_maps">Niet verplaatsen</string>
-    <string name="public_transport_no_route_title">Helaas kan OsmAnd geen route vinden die bij jouw instellingen past.</string>
+    <string name="public_transport_no_route_title">Helaas, OsmAnd kan geen route vinden die geschikt is voor jouw instellingen.</string>
     <string name="shared_string_no_thank_you">Nee, dankje</string>
     <string name="shared_string_allow">Toestaan</string>
     <string name="app_mode_taxi">Taxi</string>
@@ -2931,7 +2931,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="new_profile">Nieuw profiel</string>
     <string name="app_mode_ufo">UFO</string>
     <string name="route_way">Weg</string>
-    <string name="searching_gps">GPS locatie zoeken</string>
+    <string name="searching_gps">Aan het zoeken naar GPS</string>
     <string name="routing_profile_straightline">Rechte lijn</string>
     <string name="configure_profile_info">Profielinstellingen:</string>
     <string name="utm_format_descr">OsmAnd gebruikt het UTM Standard formaat. Dit lijkt sterk op het UTM Nato formaat, maar is niet identiek.</string>
@@ -2971,7 +2971,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="profile_alert_cant_delete_base">Basisprofielen van OsmAnd kun je niet verwijderen</string>
     <string name="profile_alert_need_save_title">Wijzigingen opslaan</string>
     <string name="profile_alert_need_save_msg">Sla wijzigingen aan het profiel eerst op</string>
-    <string name="profile_alert_delete_title">Verwijder profiel</string>
+    <string name="profile_alert_delete_title">Profiel verwijderen</string>
     <string name="profile_alert_delete_msg">Weet je zeker dat je profiel \"%s\" wilt verwijderen</string>
     <string name="select_base_profile_dialog_title">Selecteer een profiel om mee te starten</string>
     <string name="select_nav_profile_dialog_title">Selecteer navigatietype</string>
@@ -2986,10 +2986,10 @@ voor Gebied: %1$s x %2$s</string>
     <string name="shared_string_color_magenta">Magenta</string>
     <string name="shared_string_icon">Icoon</string>
     <string name="press_again_to_change_the_map_orientation">Tik nogmaals om de kaartoriëntatie te wijzigen</string>
-    <string name="default_speed_setting_title">Standaardsnelheid</string>
-    <string name="default_speed_setting_descr">Standaard snelheden instellingen aanpassen</string>
-    <string name="minmax_speed_dialog_title">Stel min/max snelheid in</string>
-    <string name="shared_string_crash">Vastgelopen</string>
+    <string name="default_speed_setting_title">Standaard snelheid</string>
+    <string name="default_speed_setting_descr">Standaard snelheidsinstellingen aanpassen</string>
+    <string name="minmax_speed_dialog_title">Min/max snelheid instellen</string>
+    <string name="shared_string_crash">Crash</string>
     <string name="app_mode_monowheel">Monowheel, Hoverboard</string>
     <string name="edit_profile_setup_title">Profiel instellen</string>
     <string name="edit_profile_setup_subtitle">Het profiel behoudt haar eigen instellingen</string>
@@ -3083,7 +3083,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="route_start_point">Vertrekpunt</string>
     <string name="swap_start_and_destination">Begin- en eindpunt omwisselen</string>
     <string name="public_transport_type">Transporttype</string>
-    <string name="coordinates_widget">Coördinatenwidget</string>
+    <string name="coordinates_widget">Coördinaten widget</string>
     <string name="osmand_routing_promo">Je kunt je eigen, aangepaste versie van routing.xml in ..osmand/routing toevoegen</string>
     <string name="application_profiles">Profielen</string>
     <string name="app_mode_scooter">Scooter</string>
@@ -3142,7 +3142,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Toon knooppunt van de fietsroutes</string>
     <string name="contour_lines_and_hillshade">Hoogtelijnen en reliëflaag</string>
     <string name="send_log">Verzend log</string>
-    <string name="move_maps">Verplaats kaarten</string>
+    <string name="move_maps">Kaarten verplaatsen</string>
     <string name="rate_dialog_descr">Deel alstublieft uw terugkoppeling en waardeer ons werk op Google Play.</string>
     <string name="shared_string_privacy_policy">Privacybeleid</string>
     <string name="make_osmand_better_descr">Sta OsmAnd toe om app gebruik anoniem te verzamelen en bewerken. Er wordt geen enkele data over uw positie of locatie verzameld..
@@ -3191,7 +3191,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="routing_attr_freeride_policy_description">Freeride en off-piste zijn officieuze routes en passages. Officieel meestal niet geprepareerd en onderhouden, en niet \'s avonds gecheckt. Op eigen risico betreden.</string>
     <string name="collected_data">Verzamelde data</string>
     <string name="last_launch_crashed">Laatste OsmAnd uitvoering gecrasht. Help ons alstublieft OsmAnd te verbeteren door de foutmelding te delen.</string>
-    <string name="app_mode_personal_transporter">Persoonlijke transporter</string>
+    <string name="app_mode_personal_transporter">Persoonlijk vervoer</string>
     <string name="app_mode_offroad">Offroad</string>
     <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
     <string name="routeInfo_roadClass_name">Wegtype</string>
@@ -3201,7 +3201,7 @@ voor Gebied: %1$s x %2$s</string>
 \nBerekening: %.1f sec, %d wegen, %d tegels)</string>
     <string name="lang_oc">Occitaans</string>
     <string name="app_mode_wagon">Stationwagon</string>
-    <string name="app_mode_pickup_truck">Pickup truck</string>
+    <string name="app_mode_pickup_truck">Pick-up truck</string>
     <string name="get_discount_title">Verkrijg %1$d %2$s met %3$s korting.</string>
     <string name="get_discount_first_part">%1$s voor de eerste %2$s</string>
     <string name="get_discount_first_few_part">%1$s voor de eerste %2$s</string>
@@ -3316,7 +3316,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="live_monitoring">Online volgen</string>
     <string name="save_track_logging_accuracy">Opnamenauwkeurigheid</string>
     <string name="tracks_view_descr">U kan al uw opgenomen tracks terugvinden bij %1$s of in OsmAnd-map met een bestand verkenner.</string>
-    <string name="multimedia_notes_view_descr">U kan al uw notities terugvinden in %1$s</string>
+    <string name="multimedia_notes_view_descr">U kan al uw notities terugvinden in %1$s.</string>
     <string name="video_notes">Videonotities</string>
     <string name="photo_notes">Fotonotities</string>
     <string name="route_recalculation">Route herberekening</string>

OsmAnd/res/values-oc/strings.xml

@@ -184,7 +184,7 @@
     <string name="osm_live_payment_annual_title">Cada an</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mes</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mes</string>
-    <string name="osm_live_payment_discount_descr">Esparnha %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Esparnha %1$s</string>
     <string name="osm_live_payment_current_subscription">Soscripcion actuala</string>
     <string name="osm_live_payment_renews_monthly">Abonament mesadier</string>
     <string name="osm_live_payment_renews_quarterly">Abonament trimestriau</string>

OsmAnd/res/values-pl/strings.xml

@@ -18,7 +18,7 @@
     <string name="city_type_village">Wieś</string>
     <string name="city_type_town">Miasteczko</string>
     <string name="city_type_city">Miasto</string>
-    <string name="animate_route_off">Zatrzymaj symulację</string>
+    <string name="animate_route_off">Zakończ symulację</string>
     <string name="animate_route">Rozpocznij symulację</string>
     <string name="file_can_not_be_renamed">Nie można zmienić nazwy pliku.</string>
     <string name="file_with_name_already_exists">Plik o takiej nazwie już istnieje.</string>
@@ -303,7 +303,7 @@
     <string name="search_poi_filter">Filtr</string>
     <string name="menu_mute_off">Wyłącz dźwięk</string>
     <string name="menu_mute_on">Włącz dźwięk</string>
-    <string name="voice_provider_descr">Wybiera głos komunikatów nawigatora.</string>
+    <string name="voice_provider_descr">Wybiera głos komunikatów nawigacji.</string>
     <string name="voice_provider">Głos komunikatów</string>
     <string name="voice_data_initializing">Inicjowanie danych głosowych…</string>
     <string name="voice_data_not_supported">Niewspierana wersja danych głosowych</string>
@@ -423,7 +423,7 @@
     <string name="saving_gpx_tracks">Zapisywanie pliku GPX…</string>
     <string name="finished_task">Zakończono</string>
     <string name="use_online_routing_descr">Użyj Internetu do wyznaczenia trasy.</string>
-    <string name="use_online_routing">Użyj routingu online</string>
+    <string name="use_online_routing">Użyj nawigacji online</string>
     <string name="user_password">Hasło konta OSM</string>
     <string name="osm_settings_descr">Skonfiguruj ustawienia potrzebne do wysyłania danych do Openstreetmap.org (OSM).</string>
     <string name="data_settings_descr">Ustaw język, pobierz/wczytaj ponownie dane.</string>
@@ -437,9 +437,9 @@
     <string name="shared_string_settings">Opcje</string>
     <string name="save_current_track_descr">Zapisuje bieżący ślad jako plik GPX.</string>
     <string name="save_current_track">Zapisz aktualny ślad</string>
-    <string name="save_track_interval_descr">Określ tempo rejestrowania śladów podczas nawigowania</string>
+    <string name="save_track_interval_descr">Określ tempo rejestrowania śladów podczas nawigacji</string>
     <string name="save_track_interval">Częstość rejestrowania podczas nawigacji</string>
-    <string name="save_track_to_gpx_descrp">Zapisuje ślady do katalogu śladów podczas nawigowania.</string>
+    <string name="save_track_to_gpx_descrp">Zapisuje ślady do katalogu śladów podczas nawigacji.</string>
     <string name="save_track_to_gpx">Automatyczne rejestrowanie śladu podczas nawigacji</string>
     <string name="update_tile">Uaktualnij mapę</string>
     <string name="reload_tile">Wczytaj ponownie kafelki</string>
@@ -467,7 +467,7 @@
     <string name="show_location">Wyświetl aktualne położenie</string>
     <string name="show_gps_coordinates_text">Pokaż współrzędne GPS na mapie</string>
     <string name="use_internet_to_download_tile">Pobiera brakujące kafelki map</string>
-    <string name="app_description">Aplikacja do nawigacji satelitarnej</string>
+    <string name="app_description">Aplikacja do nawigacji</string>
     <string name="shared_string_exit">Zakończ</string>
     <string name="search_button">Wyszukaj</string>
     <string name="search_activity">Wyszukaj</string>
@@ -739,7 +739,7 @@
     <string name="use_compass_navigation_descr">Użyj kompasu, gdy nie zostanie wykryty kierunek.</string>
     <string name="use_compass_navigation">Użyj kompasu</string>
     <string name="route_updated_loc_found">Oczekiwanie na aktualne położenie w celu wyznaczenia trasy</string>
-    <string name="continue_follow_previous_route_auto">Poprzednia trasa nie została ukończona. Kontynuować ją? (%1$s sekund)</string>
+    <string name="continue_follow_previous_route_auto">Nawigacja nie została ukończona. Kontynuować ją\? (%1$s sekund)</string>
     <string name="show_cameras">Fotoradary</string>
     <string name="show_traffic_warnings">Ostrzeżenia drogowe</string>
     <string name="avoid_toll_roads">Omijanie płatnych dróg</string>
@@ -765,7 +765,8 @@
     <string name="screen_is_locked">Naciśnij ikonę kłódki, aby odblokować</string>
     <string name="bg_service_screen_unlock">Odblokuj ekran</string>
     <string name="bg_service_sleep_mode_off">Uruchom\n aplikację w tle</string>
-    <string name="bg_service_sleep_mode_on">Zatrzymaj\n działanie aplikacji w tle</string>
+    <string name="bg_service_sleep_mode_on">Zakończ
+\n działanie aplikacji w tle</string>
     <string name="filterpoi_activity">Utwórz filtr użytecznych miejsc</string>
     <string name="day_night_info_description">Wschód: %1$s
 \nZachód: %2$s</string>
@@ -777,7 +778,7 @@
     <string name="show_warnings_title">Wyświetlanie ostrzeżeń…</string>
     <string name="show_warnings_descr">Konfiguruje ostrzeżenia ruchu drogowego (ograniczenia prędkości, znaki \"stop\", progi zwalniające, tunele), ostrzeżenia o fotoradarach i informacje o pasach ruchu.</string>
     <string name="osmand_short_description_80_chars">Mapy dla całego świata i nawigacja działająca w oparciu o stacjonarne jak i sieciowe mapy OSM</string>
-    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automatyczne Nawigowanie Do celu) 
+    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automatyczna nawigacja do celu) 
 \n 
 \nOsmAnd jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map (OSM). Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użytku offline. OsmAnd oferuje również nawigację w trybie offline i online zawierającą zapowiedzi głosowe. 
 \n 
@@ -796,12 +797,12 @@
 \n 
 \n Ograniczenia w tej bezpłatnej wersji OsmAnd: 
 \n - Limitowana liczba pobrań mapy 
-\n - Brak dostępu do Użytecznych Miejsc z Wikipedii w trybie offline 
+\n - Brak dostępu do Użytecznych miejsc z Wikipedii w trybie offline 
 \n 
 \nOsmAnd jest aktywnie rozwijany i dalszy rozwój jest uzależniony od wkładu pieniężnego na finansowanie rozwoju i testowania nowych funkcjonalności. Proszę rozważyć zakup OsmAnd+, lub finansowanie konkretnych nowych funkcji lub dokonania ogólnej darowizny na https://osmand.net.</string>
     <string name="osmand_plus_short_description_80_chars">OsmAnd to aplikacja open source do nawigacji obsługująca mapy offline i online</string>
     <string name="avoid_motorway">Unikaj autostrad</string>
-    <string name="snap_to_road_descr">Przyciąga położenie do dróg podczas nawigowania.</string>
+    <string name="snap_to_road_descr">Przyciąga położenie do dróg podczas nawigacji.</string>
     <string name="snap_to_road">Przyciąganie do drogi</string>
     <string name="day_night_info">Informacja o dniu/nocy</string>
     <string name="map_widget_vector_attributes">Atrybuty renderowania</string>
@@ -835,7 +836,7 @@
     <string name="poi_filter_sightseeing">Zwiedzanie</string>
     <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (OSM Automated Navigation Directions) 
 \n 
-\nOsmAnd+ jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OSM. Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras oraz nawigowanie zarówno w trybie stacjonarnym jak i sieciowym z komunikatami głosowymi. 
+\nOsmAnd+ jest otwarto-źródłowym programem do nawigacji z dostępem do szerokiej gamy globalnych map OSM. Wszystkie dane map (wektorowe lub kafelkowe) mogą być przechowywane na karcie pamięci telefonu do użycia bez połączenia z siecią. OsmAnd umożliwia również wyznaczanie tras oraz nawigacja zarówno w trybie stacjonarnym jak i sieciowym z komunikatami głosowymi. 
 \n 
 \nOsmAnd + to płatna wersja aplikacji, kupując ją wspierasz projekt, finansujesz rozwój nowych funkcji i otrzymujesz najnowsze aktualizacje. 
 \n 
@@ -920,7 +921,7 @@
     <string name="recording_context_menu_play">Odtwórz</string>
     <string name="recording_description">Nagranie %1$s %3$s %2$s</string>
     <string name="recording_default_name">Nagranie</string>
-    <string name="shared_string_control_stop">Zatrzymaj</string>
+    <string name="shared_string_control_stop">Zakończ</string>
     <string name="shared_string_control_start">Start</string>
     <string name="map_widget_av_notes">Notatki audio/video</string>
     <string name="osmand_srtm_short_description_80_chars">Wtyczka OsmAnd do rysowania poziomic offline</string>
@@ -939,7 +940,7 @@
     <string name="recording_photo_description">Zdjęcie %1$s %2$s</string>
     <string name="av_def_action_picture">Zrobienie zdjęcia</string>
     <string name="recording_context_menu_precord">Zrób zdjęcie</string>
-    <string name="stop_routing_confirm">Zatrzymać nawigowanie?</string>
+    <string name="stop_routing_confirm">Na pewno zatrzymać nawigację\?</string>
     <string name="clear_dest_confirm">Usunąć cel trasy i jej cele pośrednie?</string>
     <string name="precise_routing_mode">Precyzyjne trasy (alpha)</string>
     <string name="precise_routing_mode_descr">Obliczanie precyzyjnych tras w nawigacji. Funkcja nadal jest dość powolna i ograniczona odległością.</string>
@@ -975,7 +976,7 @@
     <string name="favourites_list_activity">Wybierz Ulubione miejsca</string>
     <string name="download_using_mobile_internet">Brak połączenia z Wi-Fi. Użyć do pobierania obecnego połączenia z Internetem?</string>
     <string name="clear_destination">Usuń cel trasy</string>
-    <string name="cancel_navigation">Zatrzymaj nawigację</string>
+    <string name="cancel_navigation">Zakończ nawigację</string>
     <string name="cancel_route">Odrzucenie trasy</string>
     <string name="install_paid">Pełna wersja</string>
     <string name="other_location">Inna</string>
@@ -1126,9 +1127,9 @@
     <string name="route_info">Informacje o trasie</string>
     <string name="calculate_osmand_route_gpx">Wyznacz trasę offline w OsmAnd</string>
     <string name="keep_and_add_destination_point">Dodaj kolejny cel</string>
-    <string name="use_displayed_track_for_navigation">Wykorzystać wyświetlany ślad do nawigacji?</string>
+    <string name="use_displayed_track_for_navigation">Użyć wyświetlanego śladu do nawigacji\?</string>
     <string name="calculate_osmand_route_without_internet">Wyznaczanie segmentów trasy offline</string>
-    <string name="gpx_option_calculate_first_last_segment">Wyznacza trasę usługi OsmAnd dla pierwszego i ostatniego segmentu</string>
+    <string name="gpx_option_calculate_first_last_segment">Niech OsmAnd ułoży trasę od pierwszego do ostatniego segmentu</string>
     <string name="lang_en">Angielski</string>
     <string name="lang_af">Afrykański</string>
     <string name="lang_hy">Armeński</string>
@@ -1260,9 +1261,9 @@
     <string name="live_monitoring_m_descr">Wysyła dane śledzenia do określonej usługi internetowej jeżeli rejestrowanie śladów jest włączone.</string>
     <string name="live_monitoring_m">Śledzenie online (wymagane GPX)</string>
     <string name="live_monitoring_start">Rozpocznij śledzenie online</string>
-    <string name="live_monitoring_stop">Zatrzymaj śledzenie online</string>
+    <string name="live_monitoring_stop">Zakończ śledzenie online</string>
     <string name="gpx_monitoring_start">Rozpocznij rejestrowanie śladu</string>
-    <string name="gpx_monitoring_stop">Zatrzymaj rejestrowanie śladu</string>
+    <string name="gpx_monitoring_stop">Zakończ rejestrowanie śladu</string>
     <string name="gpx_start_new_segment">Rozpocznij nowy segment</string>
     <string name="rendering_attr_hideBuildings_name">Budynki</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">Trasy niedostępne dla aut</string>
@@ -1488,7 +1489,7 @@ Długość %2$s</string>
     <string name="remove_the_tag">Usuń znacznik</string>
     <string name="version_settings">Kompilacje</string>
     <string name="shared_string_gpx_points">Punkty</string>
-    <string name="navigation_over_track">Rozpocząć nawigowanie wzdłuż śladu?</string>
+    <string name="navigation_over_track">Rozpocząć nawigację wzdłuż śladu\?</string>
     <string name="save_track_to_gpx_globally_headline">Zapis śladu na żądanie</string>
     <string name="enable_proxy_descr">Konfiguruje proxy HTTP dla wszystkich zapytań sieciowych.</string>
     <string name="proxy_host_descr">Określ nazwę hosta serwera proxy (np. 127.0.0.1).</string>
@@ -1820,7 +1821,7 @@ Długość %2$s</string>
     <string name="missing_write_external_storage_permission">OsmAnd nie posiada uprawnień do użycia karty pamięci</string>
     <string name="select_voice_provider">Wybór komunikatów głosowych</string>
     <string name="select_voice_provider_descr">Proszę wybrać lub pobrać komunikaty głosowe właściwe dla danego języka.</string>
-    <string name="impassable_road_desc">Wskazuje drogi, których należy unikać podczas nawigowania.</string>
+    <string name="impassable_road_desc">Wskazuje drogi, których należy unikać podczas nawigacji.</string>
     <string name="shared_string_sound">Dźwięk</string>
     <string name="no_location_permission">Przyznaj dostęp do danych o lokalizacji.</string>
     <string name="no_camera_permission">Przyznaj dostęp do aparatu.</string>
@@ -1959,7 +1960,7 @@ Długość %2$s</string>
     <string name="map_widget_magnetic_bearing">Orientacja magnetyczna</string>
     <string name="map_widget_bearing">Orientacja względna</string>
     <string name="access_disable_wrong_direction_recalc">Utrzymywanie trasy po obraniu niewłaściwego kierunku</string>
-    <string name="use_osm_live_routing_description">Włącza nawigację dla bieżących aktualizacji mapy.</string>
+    <string name="use_osm_live_routing_description">Włącza nawigację dla zmian z OsmAnd Live.</string>
     <string name="access_disable_wrong_direction_recalc_descr">Brak ponownego wyznaczania nowej trasy podczas poruszania się w niewłaściwym kierunku.</string>
     <string name="map_widget_battery">Stan akumulatora</string>
     <string name="access_direction_audio_feedback_descr">Wskazuje kierunek do celu używając dźwięku.</string>
@@ -2008,7 +2009,7 @@ Długość %2$s</string>
     <string name="shared_string_change">Zmień</string>
     <string name="get_started">Rozpocznij</string>
     <string name="routing_attr_short_way_name">Ekonomiczna trasa</string>
-    <string name="routing_attr_short_way_description">Wyznacza ekonomiczną trasę (zwykle najkrótszą).</string>
+    <string name="routing_attr_short_way_description">Użyj trasy oszczędzającej paliwo (zwykle najkrótszej).</string>
     <string name="replace_favorite_confirmation">Zastąpić ulubiony punkt %1$s?</string>
     <string name="skip_map_downloading">Pomiń pobieranie map</string>
     <string name="first_usage_greeting">Otrzymuj wskazówki dojazdu i odkrywaj nowe miejsca bez połączenia z Internetem</string>
@@ -2275,7 +2276,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_in_name">w %1$s</string>
     <string name="shared_string_overview">Podsumowanie</string>
     <string name="animate_my_location">Animowanie położenia</string>
-    <string name="animate_my_location_desc">Animuje aktualne położenie na mapie podczas nawigowania.</string>
+    <string name="animate_my_location_desc">Animuje aktualne położenie na mapie podczas nawigacji.</string>
     <string name="osmand_extended_description_part2">Nawigacja GPS
 \n • Możesz wybrać pomiędzy trybem offline (brak kosztów roamingu za granicą) lub online (szybciej)
 \n • Podpowiedzi głosowe zakręt-za-zakrętem poprowadzą cię do celu (nagrane lub syntetyzowane głosy)
@@ -2366,11 +2367,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="ascent_descent">Podjazd/zjazd</string>
     <string name="moving_time">Czas w ruchu</string>
     <string name="max_min">Maks./min.</string>
-    <string name="quick_action_resume_pause_navigation">Wstrzymaj/wznów nawigowanie</string>
+    <string name="quick_action_resume_pause_navigation">Wstrzymaj/wznów nawigację</string>
     <string name="quick_action_resume_pause_navigation_descr">Przycisk do wstrzymania lub wznowienia nawigacji.</string>
-    <string name="quick_action_start_stop_navigation">Rozpocznij/zatrzymaj nawigowanie</string>
+    <string name="quick_action_start_stop_navigation">Rozpocznij/zakończ nawigację</string>
     <string name="quick_action_start_stop_navigation_descr">Przycisk rozpoczęcia lub zakończenia nawigacji.</string>
-    <string name="quick_action_show_navigation_finish_dialog">Wyświetl ekran końca nawigowania</string>
+    <string name="quick_action_show_navigation_finish_dialog">Wyświetl ekran końca nawigacji</string>
     <string name="measurement_tool_action_bar">Przeglądanie mapy i dodawanie punktów</string>
     <string name="measurement_tool">Mierzenie odległości</string>
     <string name="enter_gpx_name">Nazwa pliku GPX:</string>
@@ -2854,7 +2855,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Raz w roku</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / miesiąc</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / miesiąc</string>
-    <string name="osm_live_payment_discount_descr">Oszczędź %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Oszczędź %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktualna subskrypcja</string>
     <string name="osm_live_payment_renews_monthly">Odnawia się co miesiąc</string>
     <string name="osm_live_payment_renews_quarterly">Odnawia się co kwartał</string>
@@ -2886,7 +2887,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="app_mode_public_transport">Transport publiczny</string>
     <string name="avoid_roads_descr">Proszę wybrać na mapie lub z poniższej listy, drogę omijaną podczas nawigacji:</string>
     <string name="show_along_the_route">Wyświetlanie wzdłuż trasy</string>
-    <string name="simulate_navigation">Symulacja nawigowania</string>
+    <string name="simulate_navigation">Symulacja nawigacji</string>
     <string name="choose_track_file_to_follow">Wybierz plik śladu do podążania</string>
     <string name="voice_announcements">Komunikaty głosowe</string>
     <string name="intermediate_destinations">Pośrednie cele podróży</string>
@@ -2917,7 +2918,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="quick_action_gpx_tracks_show">Wyświetl ślady GPX</string>
     <string name="add_destination_query">Proszę najpierw ustalić cel</string>
     <string name="previous_route">Poprzednia trasa</string>
-    <string name="public_transport_warning_descr_blog">Dowiedz się więcej z wpisu na naszym blogu jak OsmAnd wyznacza trasy.</string>
+    <string name="public_transport_warning_descr_blog">Dowiedz się więcej na naszym blogu, jak OsmAnd wyznacza trasy.</string>
     <string name="route_add_start_point">Dodawanie punktu początkowego</string>
     <string name="route_descr_select_start_point">Wybierz punkt początkowy</string>
     <string name="rendering_attr_surface_unpaved_name">Nieutwardzona</string>
@@ -3250,7 +3251,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="copy_from_other_profile">Skopiuj z innego profilu</string>
     <string name="vehicle_parameters_descr">Ciężar, wysokość, prędkość</string>
     <string name="vehicle_parameters">Parametry pojazdu</string>
-    <string name="voice_announces_info">Komunikaty głosowe są odtwarzane tylko podczas nawigowania.</string>
+    <string name="voice_announces_info">Komunikaty głosowe są odtwarzane tylko podczas nawigacji.</string>
     <string name="voice_announces">Komunikaty głosowe</string>
     <string name="screen_alerts">Ostrzeżenia ekranowe</string>
     <string name="route_parameters">Parametry trasy</string>
@@ -3262,11 +3263,11 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="get_discount_second_part">następnie %1$s</string>
     <string name="navigate_point_format_olc">Otwórz kod lokalizacji</string>
     <string name="analytics_pref_title">Analityka</string>
-    <string name="turn_screen_on_info">Wyświetla mapę na ekranie blokady podczas nawigowania.</string>
+    <string name="turn_screen_on_info">Wyświetla mapę na ekranie blokady podczas nawigacji.</string>
     <string name="route_parameters_info">Ustawienia wyznaczania trasy w wybranym profilu „%1$s”.</string>
     <string name="wake_time">Czas wybudzenia</string>
     <string name="configure_navigation">Konfiguruje nawigację</string>
-    <string name="screen_alerts_descr">Alerty będą wyświetlane w lewym dolnym rogu podczas nawigowania.</string>
+    <string name="screen_alerts_descr">Alerty będą wyświetlane w lewym dolnym rogu podczas nawigacji.</string>
     <string name="reset_to_default">Przywróć ustawienia domyślne</string>
     <string name="osmand_settings_descr">Konfiguruje opcje działające w całej aplikacji</string>
     <string name="turn_screen_on">Włącz ekran</string>
@@ -3391,7 +3392,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="download_map_dialog">Dialog pobierania map</string>
     <string name="dialogs_and_notifications_title">Dialogi i powiadomienia</string>
     <string name="suggested_maps">Sugerowane mapy</string>
-    <string name="suggested_maps_descr">Te mapy są wymagane do użycia z wtyczką.</string>
+    <string name="suggested_maps_descr">Wtyczka wymaga wymienionych map.</string>
     <string name="added_profiles">Dodano profile</string>
     <string name="added_profiles_descr">Profile dodane przez wtyczkę</string>
     <string name="shared_string_turn_off">Wyłącz</string>
@@ -3407,7 +3408,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="personal_category_name">Osobiste</string>
     <string name="shared_string_downloading_formatted">Pobieranie %s</string>
     <string name="desert_render_descr">Dla pustyń i innych słabo zaludnionych obszarów. Bardziej szczegółowa.</string>
-    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż punkty sieci tras rowerowych</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Pokaż trasy rowerowe z sieci węzłów</string>
     <string name="rendering_value_thick_name">Gruby</string>
     <string name="select_navigation_icon">Ikona położenia podczas ruchu</string>
     <string name="select_map_icon">Ikona położenia podczas spoczynku</string>
@@ -3547,7 +3548,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="recalc_angle_dialog_descr">Dodatkowy prosty odcinek pomiędzy moją pozycją a obliczoną trasą zostanie wyświetlony do czasu ponownego obliczenia trasy</string>
     <string name="recalc_angle_dialog_title">Minimalny kąt między moją lokalizacją a trasą</string>
     <string name="shared_string_preparing">Przygotowanie</string>
-    <string name="shared_string_poi_types">Rodzaje POI</string>
+    <string name="shared_string_poi_types">Rodzaje użytecznych miejsc</string>
     <string name="shared_string_nothing_selected">Nic nie zaznaczono</string>
     <string name="shared_string_profiles">Profile</string>
     <string name="listed_exist">Wymienione %1$s, już istnieją w OsmAnd.</string>
@@ -3575,7 +3576,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_importing">Importowanie</string>
     <string name="items_added">Dodano elementy</string>
     <string name="shared_string_import_complete">Zakończono importowanie</string>
-    <string name="import_complete_description">Zaimportowano wszystkie dane z %1$s. Można użyć poniższych przycisków, aby otworzyć wymaganą cześć aplikacji w celu zarządzania nią.</string>
+    <string name="import_complete_description">Zaimportowano wszystkie dane z %1$s. Możesz użyć poniższych przycisków, aby otworzyć część aplikacji zarządzającą nimi.</string>
     <string name="recalculate_route_distance_promo">Trasa zostanie ponownie obliczona, jeśli odległość od trasy do bieżącej lokalizacji jest większa niż wybrana wartość.</string>
     <string name="select_distance_route_will_recalc">Wybierz odległość, po której trasa zostanie ponownie obliczona.</string>
     <string name="recalculate_route_in_deviation">Przelicz trasę w przypadku odchylenia</string>
@@ -3604,8 +3605,8 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="select_shape">Wybierz kształt</string>
     <string name="hillshade_download_description">Cieniowanie wzniesień wymaga dodatkowych map.</string>
     <string name="shared_string_hillshade">Cieniowanie wzniesień</string>
-    <string name="checking_for_duplicate_description">OsmAnd wyszukuje duplikatów %1$s w istniejących rzeczach w aplikacji.
-\n
+    <string name="checking_for_duplicate_description">OsmAnd wyszukuje duplikaty %1$s wśród istniejących elementów. 
+\n 
 \nTo może zająć chwilę.</string>
     <string name="shared_string_min">Min</string>
     <string name="shared_string_octagon">Ośmiokąt</string>
@@ -3613,13 +3614,13 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="app_mode_ski_snowmobile">Skuter śnieżny</string>
     <string name="replace_point_descr">Zastąp tym inny punkt</string>
     <string name="custom_osmand_plugin">Niestandardowa wtyczka OsmAnd</string>
-    <string name="changes_applied_to_profile">Zmiany zastosowano do profilu %1$s.</string>
-    <string name="settings_item_read_error">Nie udało się odczytać %1$s.</string>
-    <string name="settings_item_write_error">Nie udało się napisać %1$s.</string>
-    <string name="settings_item_import_error">Nie udało się zaimportować %1$s.</string>
-    <string name="ui_customization_short_descr">Elementy szuflady, menu podręczne</string>
+    <string name="changes_applied_to_profile">Zmiany zastosowano do profilu \"%1$s\".</string>
+    <string name="settings_item_read_error">Nie udało się odczytać z \"%1$s\".</string>
+    <string name="settings_item_write_error">Nie udało się zapisać do \"%1$s\".</string>
+    <string name="settings_item_import_error">Nie udało się zaimportować z \"%1$s\".</string>
+    <string name="ui_customization_short_descr">Elementy menu bocznego, menu podręczne</string>
     <string name="ui_customization">Ustawienia interfejsu użytkownika</string>
-    <string name="shared_string_drawer">Szuflada</string>
+    <string name="shared_string_drawer">Menu boczne</string>
     <string name="context_menu_actions">Menu kontekstowe działań</string>
     <string name="reorder_or_hide_from">Przeorganizuj lub ukryj elementy z %1$s.</string>
     <string name="shared_string_divider">Dzielnik</string>
@@ -3627,9 +3628,9 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_hidden">Ukryte</string>
     <string name="hidden_items_descr">Te elementy są ukryte w menu, jednak reprezentowane opcje i wtyczki będą wciąż działać.</string>
     <string name="reset_items_descr">Ustawienia zostaną zrestetowane po schowaniu.</string>
-    <string name="main_actions_descr">Główne działania zajmują tylko 4 przyciski.</string>
+    <string name="main_actions_descr">\"Główne czynności\" zawierają tylko 4 przyciski.</string>
     <string name="main_actions">Główne działania</string>
-    <string name="additional_actions_descr">Możesz uzyskać dostęp do tych akcji, naciskając przycisk „Działania”.</string>
+    <string name="additional_actions_descr">Możesz uzyskać dostęp do tych czynności, naciskając przycisk „Dodatkowe czynności”.</string>
     <string name="move_inside_category">Możesz przemieszczać elementy tylko wewnątrz tej kategorii.</string>
     <string name="developer_plugin">Wtyczka deweloperska</string>
     <string name="shared_string_items">Elementy</string>
@@ -3642,7 +3643,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="wiki_menu_download_descr">Potrzebne są dodatkowe mapy, żeby przeglądać UM Wikipedii na mapie.</string>
     <string name="some_articles_may_not_available_in_lang">Pewne artykuły Wikipedii mogą być nie dostępne w wybranym języku.</string>
     <string name="custom_color">Dostosowany kolor</string>
-    <string name="select_wikipedia_article_langs">Wybierz języki, w których będą pojawiać się artykuły z Wikipedii na mapie. Możesz przełączać się pomiędzy wszystkimi dostępnymi językami podczas czytania artykułu.</string>
+    <string name="select_wikipedia_article_langs">Wybierz języki, w których będą pojawiać się artykuły z Wikipedii na mapie. Możesz przełączać się pomiędzy dostępnymi językami podczas czytania artykułu.</string>
     <string name="lang_zhyue">Kantoński</string>
     <string name="lang_uz">Uzbecki</string>
     <string name="lang_ur">Urdu</string>
@@ -3658,4 +3659,35 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="lang_bar">Bawarski</string>
     <string name="lang_lmo">Lombard</string>
     <string name="extra_maps_menu_group">Dodatkowe mapy</string>
+    <string name="lang_scn">Sycylijski</string>
+    <string name="lang_cv">Czuwaski</string>
+    <string name="lang_my">Birmański</string>
+    <string name="lang_zhminnan">Południowy min</string>
+    <string name="lang_min">Minangkabau</string>
+    <string name="lang_mg">Malgaski</string>
+    <string name="lang_pnb">Pendżabski</string>
+    <string name="download_unsupported_action">Nieobsługiwana czynność %1$s</string>
+    <string name="lang_ba">Baszkirski</string>
+    <string name="lang_war">Waray</string>
+    <string name="lang_sco">Scots</string>
+    <string name="lang_an">Aragoński</string>
+    <string name="lang_gu">Gudźarati</string>
+    <string name="lang_yo">Joruba</string>
+    <string name="ui_customization_description">Dostosuj liczbę elementów w menu bocznym, wyglądzie mapy i menu kontekstowym. 
+\n 
+\nMożesz wyłączyć nieużywane wtyczki, aby ukryć ich elementy w aplikacji %1$s.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Szukaj typów użytecznych miejsc</string>
+    <string name="search_poi_types_descr">Łącz typy użytecznych zmian z różnych kategorii. Stuknij przełącznik, aby zaznaczyć wszystko, stuknij lewą stronę, aby wybrać kategorię.</string>
+    <string name="legend_item_description">Przewodnik po symbolach mapy</string>
+    <string name="navigation_profiles_item">Profile nawigacji</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Szybka czynność</string>
+    <string name="radius_ruler_item">Pomiar kąta</string>
+    <string name="measure_distance_item">Mierzenie odległości</string>
+    <string name="travel_item">Podróże (Wikipodróże i Wikipedia)</string>
+    <string name="map_markers_item">Znaczniki</string>
+    <string name="favorites_item">Ulubione</string>
+    <string name="subscription_osmandlive_item">Subskrypcja - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Zakupy w OsmAnd</string>
 </resources>

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

@@ -1784,7 +1784,7 @@ Pôr do Sol: %2$s</string>
     <string name="faq_item">Perguntas frequentes</string>
     <string name="faq_item_description">Respostas às perguntas frequentes</string>
     <string name="map_viewing_item">Visualização de mapa</string>
-    <string name="search_on_the_map_item">Pesquisa no mapa</string>
+    <string name="search_on_the_map_item">Pesquisando no mapa</string>
     <string name="instalation_troubleshooting_item">Instalação e solução de problemas</string>
     <string name="techical_articles_item">Artigos técnicos</string>
     <string name="versions_item">Versões</string>
@@ -2829,7 +2829,7 @@ Pôr do Sol: %2$s</string>
     <string name="osm_live_payment_annual_title">Anualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mês</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mês</string>
-    <string name="osm_live_payment_discount_descr">Menos %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Menos %1$s</string>
     <string name="osm_live_payment_current_subscription">Assinatura atual</string>
     <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
     <string name="osm_live_payment_renews_annually">Renova anualmente</string>
@@ -3598,18 +3598,18 @@ Pôr do Sol: %2$s</string>
     <string name="app_mode_ski_snowmobile">Moto de neve</string>
     <string name="custom_osmand_plugin">Plug-in OsmAnd personalizado</string>
     <string name="replace_point_descr">Substitua outro ponto por este</string>
-    <string name="changes_applied_to_profile">Alterações aplicadas ao perfil %1$s.</string>
-    <string name="settings_item_read_error">Não foi possível ler %1$s.</string>
-    <string name="settings_item_write_error">Não foi possível escrever %1$s.</string>
-    <string name="settings_item_import_error">Não foi possível importar %1$s.</string>
+    <string name="changes_applied_to_profile">Alterações aplicadas ao perfil \'%1$s\'.</string>
+    <string name="settings_item_read_error">"Não foi possível ler a partir de  \'%1$s\'."</string>
+    <string name="settings_item_write_error">Não foi possível escrever para \'%1$s\'.</string>
+    <string name="settings_item_import_error">Não foi possível importar de \'%1$s\'.</string>
     <string name="select_track_file">Selecionar arquivo de faixa</string>
     <string name="shared_string_languages">Idiomas</string>
     <string name="shared_string_language">Idioma</string>
     <string name="shared_string_all_languages">Todos os idiomas</string>
     <string name="wiki_menu_download_descr">Mapas adicionais são necessários para visualizar os POIs da Wikipédia no mapa.</string>
-    <string name="ui_customization_description">Personalize a quantidade de itens na Gaveta, Configurar mapa e menu de contexto.
+    <string name="ui_customization_description">Personalize a quantidade de itens na gaveta, configure o mapa e o menu de contexto.
 \n
-\nVocê pode desativar plugins não utilizados para ocultar todos os seus controles do aplicativo %1$s.</string>
+\nVocê pode desativar os plugins não utilizados para ocultar todos os controles do aplicativo %1$s.</string>
     <string name="ui_customization_short_descr">Itens da gaveta, menu de contexto</string>
     <string name="ui_customization">Personalização da interface do usuário</string>
     <string name="shared_string_drawer">Gaveta</string>
@@ -3619,10 +3619,10 @@ Pôr do Sol: %2$s</string>
     <string name="divider_descr">Elementos abaixo deste ponto separados por um divisor.</string>
     <string name="shared_string_hidden">Escondido</string>
     <string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados continuarão funcionando.</string>
-    <string name="reset_items_descr">As configurações serão redefinidas para o estado original após ocultar.</string>
-    <string name="main_actions_descr">As ações principais contêm apenas 4 botões.</string>
+    <string name="reset_items_descr">Ocultar configurações redefine-as para o estado original.</string>
+    <string name="main_actions_descr">\'Ações principais\' contém apenas 4 botões.</string>
     <string name="main_actions">Principais ações</string>
-    <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão \"Ações\".</string>
+    <string name="additional_actions_descr">Você pode acessar essas ações tocando no botão \"Ações adicionais\".</string>
     <string name="move_inside_category">Você pode mover itens somente dentro desta categoria.</string>
     <string name="developer_plugin">Plugin do desenvolvedor</string>
     <string name="shared_string_items">Itens</string>
@@ -3658,4 +3658,22 @@ Pôr do Sol: %2$s</string>
     <string name="custom_color">Cor customizada</string>
     <string name="extra_maps_menu_group">Mapas extras</string>
     <string name="download_unsupported_action">Ação não suportada %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">Sua conta do Google Play é cobrada mediante a compra de uma assinatura
+\ne quando expirar (mês/três meses/ano),
+\nele não será renovado se for cancelado antes pelas configurações do Google Play.</string>
+    <string name="search_poi_types">Pesquisar tipos de POI</string>
+    <string name="search_poi_types_descr">Combine tipos de PIs de diferentes categorias. Toque em \"Alternar\" para selecionar todos, toque no lado esquerdo para selecionar a categoria.</string>
+    <string name="tracker_item">Rastreador do OsmAnd</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Ação rápida</string>
+    <string name="radius_ruler_item">Régua de raio</string>
+    <string name="measure_distance_item">Medir distância</string>
+    <string name="travel_item">Viagem (Wikivoyage e Wikipédia)</string>
+    <string name="map_markers_item">Marcadores de mapa</string>
+    <string name="favorites_item">Favoritos</string>
+    <string name="subscription_osmandlive_item">Assinatura - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compras de OsmAnd</string>
+    <string name="legend_item_description">O guia para a simbologia de um mapa</string>
+    <string name="navigation_profiles_item">Perfis de navegação</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -1747,7 +1747,7 @@
     <string name="upload_anonymously">Enviar anonimamente</string>
     <string name="download_files_error_not_enough_space">Não há espaço suficiente! O espaço de armazenamento necessário é {3} MB temporariamente, {1} MB permanentemente. O espaço disponível é apenas {2} MB.</string>
     <string name="download_files_question_space_with_temp">Descarregar mesmo {0} ficheiro(s)\? Isso precisa de {3} MB temporariamente e {1} MB permanentemente. ({2} MB disponíveis.)</string>
-    <string name="upload_osm_note_description">Pode enviar a sua anotação OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
+    <string name="upload_osm_note_description">Envie a sua anotação OSM anonimamente ou utilizando o seu perfil do OpenStreetMap.org.</string>
     <string name="upload_osm_note">Enviar a anotação OSM</string>
     <string name="map_marker_1st">Primeiro marcador de mapa</string>
     <string name="map_marker_2nd">Segundo marcador de mapa</string>
@@ -1945,26 +1945,26 @@
     <string name="change_color">Mudar cor</string>
     <string name="edit_name">Editar nome</string>
     <string name="animate_my_location">Animar a própria posição</string>
-    <string name="animate_my_location_desc">Ativar animação panorâmica do mapa da \'Minha Posição\' durante navegação.</string>
+    <string name="animate_my_location_desc">Ativar animação panorâmica do mapa da \'Minha posição\' durante navegação.</string>
     <string name="shared_string_overview">Visão Geral</string>
     <string name="select_street">Selecionar rua</string>
     <string name="shared_string_in_name">em %1$s</string>
     <string name="type_address">Escreva morada</string>
-    <string name="type_city_town">Escreva cidade ou município</string>
+    <string name="type_city_town">Digite cidade/vila/localidade</string>
     <string name="type_postcode">Escreva código postal</string>
     <string name="nearest_cities">Cidades próximas</string>
     <string name="select_city">Selecionar cidade</string>
-    <string name="select_postcode">Selecionar código postal</string>
+    <string name="select_postcode">Pesquisa por código postal</string>
     <string name="quick_action_auto_zoom">Auto zoom do mapa ativado/desativado</string>
-    <string name="quick_action_auto_zoom_desc">Selecionar o botão de ação irá ativar/desativar o auto zoom do mapa de acordo com a sua velocidade.</string>
-    <string name="quick_action_auto_zoom_on">Ativar auto zoom do mapa</string>
-    <string name="quick_action_auto_zoom_off">Desativar auto zoom do mapa</string>
-    <string name="quick_action_add_destination">Adicionar destino</string>
+    <string name="quick_action_auto_zoom_desc">Botão para ativar ou desativar o zoom automático controlado por velocidade.</string>
+    <string name="quick_action_auto_zoom_on">Ativar o zoom automático</string>
+    <string name="quick_action_auto_zoom_off">Desativar o zoom automático</string>
+    <string name="quick_action_add_destination">Definir destino</string>
     <string name="quick_action_replace_destination">Substituir destino</string>
     <string name="quick_action_add_first_intermediate">Adicionar primeiro intermediário</string>
-    <string name="quick_action_add_destination_desc">Tocando no botão de ação irá adicionar um destino ao localização do centro do ecrã. Destinos definidos anteriormente tornam-se o último ponto intermediário.</string>
-    <string name="quick_action_replace_destination_desc">Tocando neste botão de ação torna o centro do ecrã o novo destino de rota, substituindo o destino selecionado anteriormente (se houver).</string>
-    <string name="quick_action_add_first_intermediate_desc">Tocando neste botão de ação torna o centro do ecrã o primeiro destino intermediário.</string>
+    <string name="quick_action_add_destination_desc">Um botão para fazer com que o ecrã centralize o destino da rota, um destino selecionado anteriormente se tornaria o último destino intermediário.</string>
+    <string name="quick_action_replace_destination_desc">Um botão para fazer com que o ecrã centralize o novo destino da rota, substituindo o destino selecionado anteriormente (se houver).</string>
+    <string name="quick_action_add_first_intermediate_desc">Um botão para fazer com que o ecrã centralize o primeiro destino intermediário.</string>
     <string name="no_overlay">Sem sobreposição</string>
     <string name="no_underlay">Sem subposição</string>
     <string name="subscribe_email_error">Erro</string>
@@ -1980,7 +1980,7 @@
     <string name="shared_string_visible">Visível</string>
     <string name="restore_purchases">Restaurar compras</string>
     <string name="fonts_header">Fontes do mapa</string>
-    <string name="right_side_navigation">Condução destra</string>
+    <string name="right_side_navigation">Circulação pela direita</string>
     <string name="driving_region_automatic">Automático</string>
     <string name="do_not_send_anonymous_app_usage">Não envie estatísticas anónimas de utilização da aplicação</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd recolhe informação sobre as secções da aplicação que abriu. Não são enviadas: a sua localização; a informação que introduz na aplicação; detalhes de áreas que veja, procure ou descarregue.</string>
@@ -1998,7 +1998,7 @@
     <string name="shared_string_slope">Encosta</string>
     <string name="add_new_folder">Adicionar nova pasta</string>
     <string name="points_delete_multiple_succesful">Ponto(s) eliminado(s).</string>
-    <string name="points_delete_multiple">Vai eliminar %1$d ponto(s). Tem a certeza\?</string>
+    <string name="points_delete_multiple">Tem certeza de que deseja apagar %1$d ponto(s)\?</string>
     <string name="route_points_category_name">Mudanças de direção a passar neste percurso</string>
     <string name="track_points_category_name">Pontos de passagem, pontos de interesse, elementos com nome</string>
     <string name="shared_string_gpx_track">Percurso</string>
@@ -2011,7 +2011,7 @@
     <string name="shared_string_end_time">Hora de fim</string>
     <string name="shared_string_color">Cor</string>
     <string name="select_gpx_folder">Selecionar diretório do ficheiro GPX</string>
-    <string name="file_can_not_be_moved">Ficheiro não pode ser movido.</string>
+    <string name="file_can_not_be_moved">Não foi possível mover o ficheiro.</string>
     <string name="shared_string_move">Mover</string>
     <string name="shared_string_gpx_tracks">Percursos</string>
     <string name="routing_attr_driving_style_name">Estilo de condução</string>
@@ -2044,10 +2044,10 @@
     <string name="legacy_search">Pesquisa antiga</string>
     <string name="show_legacy_search">Mostrar pesquisa antiga</string>
     <string name="show_legacy_search_desc">Adicionar pesquisa antiga à lista da gaveta</string>
-    <string name="routing_attr_allow_motorway_name">Permitir vias de motociclos</string>
-    <string name="routing_attr_allow_motorway_description">Permitir vias de motociclos.</string>
+    <string name="routing_attr_allow_motorway_name">Utilizar autoestradas</string>
+    <string name="routing_attr_allow_motorway_description">Permite autoestradas.</string>
     <string name="wiki_around">Artigos da Wikipédia próximos</string>
-    <string name="search_map_hint">Procurar cidade ou região</string>
+    <string name="search_map_hint">Cidade ou região</string>
     <string name="route_roundabout_short">Use a saída %1$d e continue</string>
     <string name="upload_poi">Enviar Pontos de Interesse (POI)</string>
     <string name="route_calculation">Cálculo da rota</string>
@@ -2055,8 +2055,8 @@
     <string name="gpx_no_tracks_title_folder">Também pode adicionar ficheiros GPX ao diretório</string>
     <string name="gpx_add_track">Adicionar mais…</string>
     <string name="shared_string_appearance">Aparência</string>
-    <string name="trip_rec_notification_settings">Ativar a gravação de início rápido</string>
-    <string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite iniciar a gravação da viagem.</string>
+    <string name="trip_rec_notification_settings">Ativar gravação rápida</string>
+    <string name="trip_rec_notification_settings_desc">Mostrar uma notificação de sistema que permite a gravação da viagem.</string>
     <string name="shared_string_notifications">Notificações</string>
     <string name="shared_string_continue">Continuar</string>
     <string name="shared_string_pause">Pausa</string>
@@ -2073,7 +2073,7 @@
     <string name="save_track_precision">Acuidade mínima para registo</string>
     <string name="save_track_precision_descr">Filtro: Definir acuidade mínima para um ponto poder ser registado.</string>
     <string name="christmas_poi">Pontos de interesse (POI) de Natal</string>
-    <string name="christmas_desc">Antes do Natal e Ano Novo, pode escolher mostrar pontos de interesse (POI) relacionados com o Natal: Árvores de Natal, mercados, etc.</string>
+    <string name="christmas_desc">Antes do Natal e Ano Novo, pode escolher mostrar os pontos de interesse (POI) relacionados com o Natal como árvores de Natal, mercados, etc.</string>
     <string name="christmas_desc_q">Mostrar pontos de interesse (POI) de Natal?</string>
     <string name="rendering_value_light_brown_name">Castanho claro</string>
     <string name="rendering_value_dark_brown_name">Castanho escuro</string>
@@ -2094,12 +2094,12 @@
     <string name="new_filter">Novo filtro</string>
     <string name="new_filter_desc">Por favor introduza o nome do novo filtro, este vai ser adicionado ao seu separador \'Categorias\'.</string>
     <string name="osm_live_payment_desc">A assinatura é cobrada mensalmente. Cancele a assinatura no Google Play a qualquer altura.</string>
-    <string name="donation_to_osm">Doação para a comunidade OpenStreetMap</string>
-    <string name="donation_to_osm_desc">Parte da sua doação é enviada aos utilizadores OSM que submetem alterações ao OpenStreetMap. O custo da assinatura continua a ser o mesmo.</string>
+    <string name="donation_to_osm">Doação para a comunidade OSM</string>
+    <string name="donation_to_osm_desc">Parte da sua doação é enviada aos colaboradores do OSM. O custo da assinatura permanece o mesmo.</string>
     <string name="osm_live_subscription_desc">Subscrição permite atualizações a cada hora, diárias, semanais, e descarregamentos ilimitados de todos os mapas globalmente.</string>
     <string name="get_it">Comprá-lo</string>
     <string name="get_for">Comprar por %1$s</string>
-    <string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas e atualizações de mapas mais do que uma vez por mês: semanal, diário, ou a cada hora.</string>
+    <string name="osm_live_banner_desc">Obter descarregamentos ilimitados de mapas, adicionando atualizações semanais, diárias e a cada hora.</string>
     <string name="osmand_plus_banner_desc">Descarregamentos ilimitados de mapas, atualizações e complemento Wikipédia.</string>
     <string name="si_mi_meters">Milhas/metros</string>
     <string name="search_map">À procura de mapas…</string>
@@ -2182,7 +2182,7 @@
     <string name="osm_live_payment_annual_title">Anualmente</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mês</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mês</string>
-    <string name="osm_live_payment_discount_descr">Poupe %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Poupe %1$s</string>
     <string name="osm_live_payment_current_subscription">Assinatura atual</string>
     <string name="osm_live_payment_renews_monthly">Renova mensalmente</string>
     <string name="osm_live_payment_renews_quarterly">Renova trimestralmente</string>
@@ -3401,7 +3401,7 @@
     <string name="track_saved">Caminho gravado</string>
     <string name="empty_filename">O nome do ficheiro está vazio</string>
     <string name="shared_string_revert">Reverter</string>
-    <string name="quick_action_directions_from_desc">Um botão para centrar o ecrã no ponto de partida e calcular a rota até ao destino ou abrir um diálogo para selecionar o destino se o marcador de destino não estiver no mapa.</string>
+    <string name="quick_action_directions_from_desc">Um botão para centrar o ecrã no 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 nós da rede de ciclovias</string>
     <string name="clear_confirmation_msg">Limpar %1$s\?</string>
     <string name="download_map_dialog">Diálogo de descarregar mapas</string>
@@ -3623,7 +3623,7 @@
     <string name="shared_string_divider">Divisor</string>
     <string name="divider_descr">Elementos abaixo deste ponto separados por um divisor.</string>
     <string name="shared_string_hidden">Ocultado</string>
-    <string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados ainda estão funcionando.</string>
+    <string name="hidden_items_descr">Esses itens estão ocultos no menu, mas as opções ou plug-ins representados continuarão funcionando.</string>
     <string name="reset_items_descr">As configurações serão redefinidas para o estado original após ocultar.</string>
     <string name="main_actions_descr">As ações principais contêm apenas 4 botões.</string>
     <string name="main_actions">Principais ações</string>
@@ -3638,4 +3638,55 @@
     <string name="wikipedia_poi_languages_promo">Alguns artigos da Wikipédia podem não estar disponíveis em seu nome. Selecione os idiomas nos quais os artigos da Wikipédia aparecerão no mapa. 
 \nPoderá alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
     <string name="wiki_menu_download_descr">Mapas adicionais são necessários para visualizar os POIs da Wikipédia no mapa.</string>
+    <string name="select_wikipedia_article_langs">Selecione os idiomas em que os artigos da Wikipédia aparecerão no mapa. Pode alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="tracker_item">Rastreador do OsmAnd</string>
+    <string name="quick_action_item">Ação rápida</string>
+    <string name="radius_ruler_item">Régua de raio</string>
+    <string name="measure_distance_item">Medir distância</string>
+    <string name="travel_item">Viagem (Wikivoyage e Wikipédia)</string>
+    <string name="map_markers_item">Marcadores de mapa</string>
+    <string name="favorites_item">Favoritos</string>
+    <string name="subscription_osmandlive_item">Assinatura - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compras de OsmAnd</string>
+    <string name="legend_item_description">O guia para a simbologia de um mapa</string>
+    <string name="navigation_profiles_item">Perfis de navegação</string>
+    <string name="search_poi_types">Pesquisar tipos de poi</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">O pagamento será cobrado na sua conta do Google Play na confirmação da compra. 
+\n 
+\nA assinatura é renovada automaticamente, a menos que seja cancelada antes da data de renovação. Sua conta será cobrada pelo período de renovação (mensal/trimestrial/anual) somente na data de renovação. 
+\n 
+\nPode gerir e cancelar suas assinaturas acessando as configurações do Google Play.</string>
+    <string name="download_unsupported_action">Ação %1$s não suportada</string>
+    <string name="extra_maps_menu_group">Mapas adicionais</string>
+    <string name="some_articles_may_not_available_in_lang">Alguns artigos da Wikipédia podem não estar disponíveis no seu idioma.</string>
+    <string name="lang_zhyue">Cantonês</string>
+    <string name="lang_zhminnan">Min do Sul</string>
+    <string name="lang_yo">Iorubá</string>
+    <string name="lang_war">Samarenho</string>
+    <string name="lang_uz">Uzbeque</string>
+    <string name="lang_ur">Urdu</string>
+    <string name="lang_tt">Tártaro</string>
+    <string name="lang_tg">Tajique</string>
+    <string name="lang_sco">Ânglico Escocês</string>
+    <string name="lang_scn">Siciliano</string>
+    <string name="lang_pnb">Panjábi</string>
+    <string name="lang_ne">Nepali</string>
+    <string name="lang_nap">Napolitano</string>
+    <string name="lang_my">Birmanês</string>
+    <string name="lang_mn">Mongol</string>
+    <string name="lang_min">Minangkabau</string>
+    <string name="lang_mg">Malgaxe</string>
+    <string name="lang_ky">Quirguiz</string>
+    <string name="lang_kk">Cazaque</string>
+    <string name="lang_jv">Javanês</string>
+    <string name="lang_gu">Guzerate</string>
+    <string name="lang_cv">Tchuvache</string>
+    <string name="lang_ce">Checheno</string>
+    <string name="lang_bar">Bávaro</string>
+    <string name="lang_ba">Basquires</string>
+    <string name="lang_an">Aragonês</string>
+    <string name="lang_lmo">Lombardo</string>
+    <string name="custom_color">Cor customizada</string>
 </resources>

OsmAnd/res/values-ro/strings.xml

@@ -2238,7 +2238,7 @@
     <string name="osm_live_payment_annual_title">Anual</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / lună</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / lună</string>
-    <string name="osm_live_payment_discount_descr">Salvați %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Salvați %1$s</string>
     <string name="osm_live_payment_current_subscription">Abonament curent</string>
     <string name="osm_live_payment_renews_monthly">Reînnoire lunară</string>
     <string name="osm_live_payment_renews_quarterly">Se reînnoiește trimestrial</string>

OsmAnd/res/values-ru/phrases.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="poi_bakery">Булочная</string>
-    <string name="poi_alcohol">Вино-водочный магазин;Алкоголь</string>
+    <string name="poi_alcohol">Винно-водочный магазин;Алкоголь</string>
     <string name="poi_convenience">Продукты</string>
     <string name="poi_mall">Торговый центр</string>
     <string name="poi_beverages">Напитки</string>
@@ -105,7 +105,7 @@
     <string name="poi_games">Магазин игр;Игры</string>
     <string name="poi_garden_furniture">Садовая мебель, аксессуары</string>
     <string name="poi_furnace">Системы отопления</string>
-    <string name="poi_leather">Магазин кожи, галантарея</string>
+    <string name="poi_leather">Магазин кожи, галантерея</string>
     <string name="poi_pyrotechnics">Пиротехника;Фейерверки</string>
     <string name="poi_weapons">Оружие</string>
     <string name="poi_model">Масштабные модели</string>
@@ -239,7 +239,7 @@
     <string name="poi_recycling_batteries">Батарейки</string>
     <string name="poi_recycling_plastic_bottles">Пластиковые бутылки</string>
     <string name="poi_recycling_green_waste">Растительный мусор</string>
-    <string name="poi_recycling_waste">Мусор (черные мешки)</string>
+    <string name="poi_recycling_waste">Мусор (чёрные мешки)</string>
     <string name="poi_recycling_plastic_packaging">Пластиковая тара</string>
     <string name="poi_recycling_newspaper">Газеты</string>
     <string name="poi_recycling_cartons">Картон для пищевых упаковок</string>
@@ -318,7 +318,7 @@
     <string name="poi_government">Государственное учреждение;Госучреждение</string>
     <string name="poi_bailiff">Служба судебных приставов;Судебные приставы</string>
     <string name="poi_prosecutor">Прокуратура</string>
-    <string name="poi_pension_fund">Пенсионый фонд</string>
+    <string name="poi_pension_fund">Пенсионный фонд</string>
     <string name="poi_migration">Миграционная служба</string>
     <string name="poi_tax_inspection">Налоговая инспекция</string>
     <string name="poi_office_administrative">Административное учреждение</string>
@@ -353,7 +353,7 @@
     <string name="poi_lawyer">Юридические услуги;Юрист</string>
     <string name="poi_office_telecommunication">Телекоммуникационная компания</string>
     <string name="poi_ngo">Общественная организация</string>
-    <string name="poi_townhall">Администрация населенного пункта</string>
+    <string name="poi_townhall">Администрация населённого пункта</string>
     <string name="poi_employment_agency">Биржа труда</string>
     <string name="poi_research">Исследовательский центр</string>
     <string name="poi_it">Информационные технологии</string>
@@ -427,7 +427,7 @@
     <string name="poi_table_tennis">Пинг-понг</string>
     <string name="poi_tennis">Теннис</string>
     <string name="poi_toboggan">Санный спорт</string>
-    <string name="poi_volleyball">Воллейбол</string>
+    <string name="poi_volleyball">Волейбол</string>
     <string name="poi_museum">Музей</string>
     <string name="poi_attraction">Достопримечательность</string>
     <string name="poi_memorial">Памятник, мемориал</string>
@@ -469,7 +469,7 @@
     <string name="poi_wayside_shrine">Придорожная святыня</string>
     <string name="poi_information">Информация</string>
     <string name="poi_clock">Часы</string>
-    <string name="poi_travel_agent">Турагентство;Туристическое агенство</string>
+    <string name="poi_travel_agent">Турагентство;Туристическое агентство</string>
     <string name="poi_viewpoint">Место с хорошим видом;Обзорная площадка</string>
     <string name="poi_camp_site">Место для лагеря</string>
     <string name="poi_caravan_site">Ночлег</string>
@@ -503,7 +503,7 @@
     <string name="poi_club_hunting">Клуб охотников</string>
     <string name="poi_club_shooting">Оружейный клуб</string>
     <string name="poi_club_tourism">Туристический клуб</string>
-    <string name="poi_club_charity">Благотворительский клуб</string>
+    <string name="poi_club_charity">Благотворительный клуб</string>
     <string name="poi_library">Библиотека</string>
     <string name="poi_arts_centre">Центр искусств</string>
     <string name="poi_cinema">Кинотеатр</string>
@@ -658,7 +658,7 @@
     <string name="poi_signal_station_traffic">Сигнальная станция</string>
     <string name="poi_signal_station_warning">Сигнал опасности</string>
     <string name="poi_small_craft_facility">Лодочная станция</string>
-    <string name="poi_seamark_rock">Скала</string>
+    <string name="poi_seamark_rock">Скала (навигационный ориентир)</string>
     <string name="poi_seamark_wreck">Кораблекрушение (навигационный ориентир)</string>
     <string name="poi_seamark_light_major">Большой маяк (навигационный ориентир)</string>
     <string name="poi_seamark_light_minor">Небольшой маяк (навигационный ориентир)</string>
@@ -739,12 +739,12 @@
     <string name="poi_man_made">Сооружения</string>
     <string name="poi_administrative">Административные объекты</string>
     <string name="poi_seamark">Морские объекты</string>
-    <string name="poi_internet_access_wlan">Доступ в Интернет: беспроводной</string>
-    <string name="poi_internet_access_terminal">Доступ в Интернет: терминал</string>
-    <string name="poi_internet_access_wired">Доступ в Интернет: проводное подключение</string>
-    <string name="poi_internet_access_public">Доступ в Интернет: общедоступный</string>
-    <string name="poi_internet_access_yes">Доступ в Интернет: есть</string>
-    <string name="poi_internet_access_no">Доступ в Интернет: отсутствует</string>
+    <string name="poi_internet_access_wlan">Доступ в интернет: беспроводной</string>
+    <string name="poi_internet_access_terminal">Доступ в интернет: терминал</string>
+    <string name="poi_internet_access_wired">Доступ в интернет: проводное подключение</string>
+    <string name="poi_internet_access_public">Доступ в интернет: общедоступный</string>
+    <string name="poi_internet_access_yes">Доступ в интернет: есть</string>
+    <string name="poi_internet_access_no">Доступ в интернет: отсутствует</string>
     <string name="poi_farm">Фермерский магазин</string>
     <string name="poi_personal_transport">Личный транспорт</string>
     <string name="poi_public_transport">Общественный транспорт</string>
@@ -752,7 +752,7 @@
     <string name="poi_water_transport">Водный транспорт</string>
     <string name="poi_bicycle_transport">Велосипедный транспорт</string>
     <string name="poi_sightseeing">Достопримечательности</string>
-    <string name="poi_internet_access">Доступ в Интернет</string>
+    <string name="poi_internet_access">Доступ в интернет</string>
     <string name="poi_club">Клуб</string>
     <string name="poi_cafe_and_restaurant">Кафе и ресторан</string>
     <string name="poi_shop_food">Продуктовый магазин и супермаркет</string>
@@ -820,7 +820,7 @@
     <string name="poi_residential">Жилой район</string>
     <string name="poi_religious">Религиозное землепользование</string>
     <!--	<string name="poi_general_tourist_attraction_yes">Достопримечательность (тип неизвестен)</string>-->
-    <string name="poi_attraction_amusement_ride">Атракцион</string>
+    <string name="poi_attraction_amusement_ride">Аттракцион</string>
     <string name="poi_wilderness_hut">Лесной домик</string>
     <string name="poi_hunting_lodge">Охотничий домик</string>
     <string name="poi_picnic_table">Стол для пикника</string>
@@ -830,13 +830,13 @@
     <string name="poi_gallery">Художественная галерея</string>
     <string name="poi_ski_resort">Горнолыжный курорт</string>
     <string name="poi_recreation_ground">Площадка для игр</string>
-    <string name="poi_payment_terminal">Платежный терминал</string>
+    <string name="poi_payment_terminal">Платёжный терминал</string>
     <string name="poi_opening_hours">Часы работы</string>
     <string name="poi_collection_times">Время выемки</string>
     <string name="poi_description">Описание</string>
     <string name="poi_phone">Телефон</string>
     <string name="poi_website">Веб-сайт</string>
-    <string name="poi_email">Email</string>
+    <string name="poi_email">Эл. почта</string>
     <string name="poi_fax">Факс</string>
     <string name="poi_mobile">Сотовый телефон</string>
     <string name="poi_service_times">Время обслуживания</string>
@@ -886,7 +886,7 @@
     <string name="poi_access_private">Частный доступ</string>
     <string name="poi_access_no">Нет доступа</string>
     <string name="poi_access_destination">Доступ: пункт назначения</string>
-    <string name="poi_access_permissive">Доступ разрешен владельцем</string>
+    <string name="poi_access_permissive">Доступ разрешён владельцем</string>
     <string name="poi_access_customers">Доступ для клиентов</string>
     <string name="poi_access_delivery">Доступ только для доставки</string>
     <string name="poi_access_agricultural">Доступ только для с/х техники</string>
@@ -957,7 +957,7 @@
     <string name="poi_trees_mango">Манго</string>
     <string name="poi_trees_rubber">Каучук</string>
     <string name="poi_trees_date">Финики</string>
-    <string name="poi_trees_coffea">Кофe</string>
+    <string name="poi_trees_coffea">Кофе</string>
     <string name="poi_trees_pomegranate">Гранат</string>
     <string name="poi_height">Высота</string>
     <string name="poi_ele">Высота над уровнем моря</string>
@@ -991,7 +991,7 @@
     <string name="poi_pump_no">Без насоса</string>
     <string name="poi_pump_yes">Есть</string>
     <string name="poi_water_characteristic">Характеристика воды</string>
-    <string name="poi_water_characteristic_mineral">Минеральная</string>
+    <string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
     <string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>
     <string name="poi_water_characteristic_sulfuric">Серная</string>
     <string name="poi_water_point">Пункт водоснабжения</string>
@@ -1191,7 +1191,7 @@
     <string name="poi_payment_type">Тип оплаты</string>
     <string name="poi_payment_fuel_type">Топливные карты</string>
     <string name="poi_fuel_type">Вид топлива</string>
-    <string name="poi_fuel_avia_type">Вид топлива (для самолетов)</string>
+    <string name="poi_fuel_avia_type">Вид топлива (для самолётов)</string>
     <string name="poi_payment_coins_yes">Монеты</string>
     <string name="poi_payment_coins_no">Монеты не принимаются</string>
     <string name="poi_payment_coins_0_5">Монеты по $0.5</string>
@@ -1281,21 +1281,21 @@
     <string name="poi_payment_ep_avant_yes">AvantCard</string>
     <string name="poi_payment_ep_avant_no">AvantCard не принимаются</string>
     <string name="poi_payment_ep_mep_yes">MEP</string>
-    <string name="poi_payment_ep_mep_no">MEP не принимется</string>
+    <string name="poi_payment_ep_mep_no">MEP не принимаются</string>
     <string name="poi_payment_ep_minipay_yes">Minipay</string>
-    <string name="poi_payment_ep_minipay_no">Minipay не принимается</string>
+    <string name="poi_payment_ep_minipay_no">Minipay не принимаются</string>
     <string name="poi_payment_ep_minicash_yes">miniCash</string>
-    <string name="poi_payment_ep_minicash_no">miniCash не принимается</string>
+    <string name="poi_payment_ep_minicash_no">miniCash не принимаются</string>
     <string name="poi_payment_ep_moneo_yes">Moneo</string>
-    <string name="poi_payment_ep_moneo_no">Moneo не принимается</string>
+    <string name="poi_payment_ep_moneo_no">Moneo не принимаются</string>
     <string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
-    <string name="poi_payment_ep_monedero4b_no">Monedero 4B не принимается</string>
+    <string name="poi_payment_ep_monedero4b_no">Monedero 4B не принимаются</string>
     <string name="poi_payment_ep_monedero_yes">Monedero</string>
-    <string name="poi_payment_ep_monedero_no">Monedero не принимается</string>
+    <string name="poi_payment_ep_monedero_no">Monedero не принимаются</string>
     <string name="poi_payment_bankaxess_yes">BankAxess</string>
-    <string name="poi_payment_bankaxess_no">BankAxess не принимается</string>
+    <string name="poi_payment_bankaxess_no">BankAxess не принимаются</string>
     <string name="poi_payment_coinkite_yes">Coinkite</string>
-    <string name="poi_payment_coinkite_no">Оплата через Coinkite не принимается</string>
+    <string name="poi_payment_coinkite_no">Оплата через Coinkite не принимаются</string>
     <string name="poi_payment_roadrunner_yes">Roadrunner</string>
     <string name="poi_payment_roadrunner_no">Roadrunner карты не принимаются</string>
     <string name="poi_payment_svg_yes">SVG</string>
@@ -1309,7 +1309,7 @@
     <string name="poi_payment_sube_yes">SUBE</string>
     <string name="poi_payment_sube_no">Карты SUBE не принимаются</string>
     <string name="poi_payment_via_verde_yes">Via Verde</string>
-    <string name="poi_payment_via_verde_no">Via Verde не принимается</string>
+    <string name="poi_payment_via_verde_no">Via Verde не принимаются</string>
     <string name="poi_payment_meal_voucher_yes">Талоны на питание</string>
     <string name="poi_payment_meal_voucher_no">Талоны на питание не принимаются</string>
     <string name="poi_payment_paypal_yes">PayPal</string>
@@ -1341,9 +1341,9 @@
     <string name="poi_diet_vegetarian_yes">Вегетарианское питание</string>
     <string name="poi_diet_vegetarian_no">Вегетарианское питание не предлагается</string>
     <string name="poi_diet_vegan_filter_yes">Для веганов</string>
-    <string name="poi_diet_vegan_only">Только веганское питание</string>
-    <string name="poi_diet_vegan_yes">Веганское питание</string>
-    <string name="poi_diet_vegan_no">Веганское питание не предлагается</string>
+    <string name="poi_diet_vegan_only">Только вегетарианское питание</string>
+    <string name="poi_diet_vegan_yes">Вегетарианское питание</string>
+    <string name="poi_diet_vegan_no">Вегетарианское питание не предлагается</string>
     <string name="poi_diet_gluten_free_filter_yes">Безглютеновое питание</string>
     <string name="poi_diet_gluten_free_only">Только безглютеновое питание</string>
     <string name="poi_diet_gluten_free_yes">Безглютеновое питание</string>
@@ -1575,7 +1575,7 @@
     <string name="poi_internet_access_type_wlan">Беспроводной</string>
     <string name="poi_internet_access_type_wired">Кабельный</string>
     <string name="poi_internet_access_type_public">Публичный доступ в интернет</string>
-    <string name="poi_internet_access_type_no">Без доступа в Интернет</string>
+    <string name="poi_internet_access_type_no">Без доступа в интернет</string>
     <string name="poi_internet_access_type_yes">C доступом в интернет</string>
     <string name="poi_maxwidth">Максимальная ширина</string>
     <string name="poi_iata">Код IATA</string>
@@ -1589,7 +1589,7 @@
     <string name="poi_artwork_type_stone">Тип: камень</string>
     <string name="poi_artwork_type_bust">Тип: бюст</string>
     <string name="poi_artwork_type_installation">Тип: инсталляция</string>
-    <string name="poi_artwork_type_mosaic">Тип: мозайка</string>
+    <string name="poi_artwork_type_mosaic">Тип: мозаика</string>
     <string name="poi_artwork_type_relief">Тип: барельеф</string>
     <string name="poi_artwork_type_graffiti">Тип: граффити</string>
     <string name="poi_artwork_type_stele">Тип: стела</string>
@@ -1771,9 +1771,9 @@
     <string name="poi_religion_multifaith">Многоконфессиональность</string>
     <string name="poi_religion_jain">Джайнизм</string>
     <string name="poi_religion_scientologist">Саентология</string>
-    <string name="poi_denomination_united_reformed">Объединенная реформированная церковь</string>
+    <string name="poi_denomination_united_reformed">Объединённая реформированная церковь</string>
     <string name="poi_denomination_nazarene">Назаряне</string>
-    <string name="poi_denomination_united_methodist">Объединенная методистская церковь</string>
+    <string name="poi_denomination_united_methodist">Объединённая методистская церковь</string>
     <string name="poi_denomination_congregational">Конгрегационная церковь</string>
     <string name="poi_denomination_dutch_reformed">Нидерландская реформатская церковь</string>
     <string name="poi_denomination_apostolic">Апостольская церковь</string>
@@ -1880,7 +1880,7 @@
     <string name="poi_content_salt">Содержимое: соль</string>
     <string name="poi_content_grain">Содержимое: зерно</string>
     <string name="poi_nudism">Нудизм</string>
-    <string name="poi_nudism_yes">Разрешен</string>
+    <string name="poi_nudism_yes">Разрешён</string>
     <string name="poi_nudism_no">Запрещён</string>
     <string name="poi_nudism_obligatory">Обязательно</string>
     <string name="poi_nudism_customary">Приветствуется</string>
@@ -2004,7 +2004,7 @@
     <string name="poi_power_supply">Источник питания</string>
     <string name="poi_power_supply_yes">Есть</string>
     <string name="poi_power_supply_no">Источник питания: отсутствует</string>
-    <string name="poi_power_supply_cee_17_blue">Источник питания (разъём): CEE 17 blue</string>
+    <string name="poi_power_supply_cee_17_blue">Источник питания (разъём): CEE 17 синий</string>
     <string name="poi_power_supply_cee_7_4">Источник питания (разъём): CEE 7/4</string>
     <string name="poi_power_supply_cee_7_5">Источник питания (разъём): CEE 7/5</string>
     <string name="poi_power_supply_nema_5_15">Источник питания (разъём): NEMA 5-15</string>
@@ -2052,7 +2052,7 @@
     <string name="poi_bandstand">Отдельностоящая сцена</string>
     <string name="poi_kiln">Печь для обжига</string>
     <string name="poi_product_brick">Производимый продукт: кирпич</string>
-    <string name="poi_product_quicklime">Производимый продукт: негашеная известь</string>
+    <string name="poi_product_quicklime">Производимый продукт: негашёная известь</string>
     <string name="poi_product_leather">Производимый продукт: кожа</string>
     <string name="poi_product_lime">Производимый продукт: известь</string>
     <string name="poi_product_beer">Производимый продукт: пиво</string>
@@ -2430,7 +2430,7 @@
     <string name="poi_firepit">Место для разведения огня</string>
     <string name="poi_street_cabinet">Распределительный шкаф</string>
     <string name="poi_fair_trade_yes">Справедливая торговля (Fairtrade): есть</string>
-    <string name="poi_fair_trade_no">Справедливая торговля (Fairtrade): no</string>
+    <string name="poi_fair_trade_no">Справедливая торговля (Fairtrade): нет</string>
     <string name="poi_fair_trade_only">Только товары с маркировкой Справедливой торговли (Fairtrade)</string>
     <string name="poi_ice_hockey">Хоккей с шайбой</string>
     <string name="poi_bandy">Хоккей с мячом</string>
@@ -2440,7 +2440,7 @@
     <string name="poi_protection_object_nature">Объект охраны: природа</string>
     <string name="poi_protection_object_habitat">Объект охраны: среда обитания</string>
     <string name="poi_protection_object_water">Объект охраны: вода</string>
-    <string name="poi_nuclear_explosion_country">Страна, произведшая взрыв</string>
+    <string name="poi_nuclear_explosion_country">Страна, произвёдшая взрыв</string>
     <string name="poi_nuclear_explosion_site">Название места взрыва</string>
     <string name="poi_nuclear_explosion_type_underground_shaft">Тип взрыва: подземный, шахта</string>
     <string name="poi_nuclear_explosion_type_underground_tunnel">Тип взрыва: подземный, туннель</string>
@@ -2504,8 +2504,8 @@
     <string name="poi_free_flying_paragliding_no">Парапланеризм: нет</string>
     <string name="poi_free_flying_hanggliding_yes">Дельтапланеризм</string>
     <string name="poi_free_flying_hanggliding_no">Дельтапланеризм: нет</string>
-    <string name="poi_free_flying_rigid_yes">Дельтаплан с жестким крылом</string>
-    <string name="poi_free_flying_rigid_no">Дельтаплан с жестким крылом: нет</string>
+    <string name="poi_free_flying_rigid_yes">Дельтаплан с жёстким крылом</string>
+    <string name="poi_free_flying_rigid_no">Дельтаплан с жёстким крылом: нет</string>
     <string name="poi_free_flying_site_orientation_n">Ориентация площадки для свободного полёта: С</string>
     <string name="poi_free_flying_site_orientation_ne">Ориентация площадки для свободного полёта: СВ</string>
     <string name="poi_free_flying_site_orientation_e">Ориентация площадки для свободного полёта: В</string>
@@ -2514,7 +2514,7 @@
     <string name="poi_free_flying_site_orientation_sw">Ориентация площадки для свободного полёта: ЮЗ</string>
     <string name="poi_free_flying_site_orientation_w">Ориентация площадки для свободного полёта: З</string>
     <string name="poi_free_flying_site_orientation_nw">Ориентация площадки для свободного полёта: СЗ</string>
-    <string name="poi_free_flying_no_flight_time">Запрещенное для свободного полёта время</string>
+    <string name="poi_free_flying_no_flight_time">Запрещённое для свободного полёта время</string>
     <string name="poi_free_flying_guest_guidelines_yes">Инструктаж для посетителей: есть</string>
     <string name="poi_free_flying_guest_guidelines_no">Инструктаж для посетителей: нет</string>
     <string name="poi_tanning_salon">Солярий</string>
@@ -2540,8 +2540,8 @@
     <string name="poi_health_service_prevention_no">Медицинские услуги: профилактика: нет</string>
     <string name="poi_health_service_prevention_vaccination_yes">Медицинские услуги: вакцинация: есть</string>
     <string name="poi_health_service_prevention_vaccination_no">Медицинские услуги: вакцинация: нет</string>
-    <string name="poi_health_service_support_yes">Медицинские услуги: support: есть</string>
-    <string name="poi_health_service_support_no">Медицинские услуги: support: нет</string>
+    <string name="poi_health_service_support_yes">Медицинские услуги: поддержание: есть</string>
+    <string name="poi_health_service_support_no">Медицинские услуги: поддержание: нет</string>
     <string name="poi_health_service_test_yes">Медицинские услуги: тестирование: есть</string>
     <string name="poi_health_service_test_no">Медицинские услуги: тестирование: нет</string>
     <string name="poi_health_facility_type_office">Медицинский офис</string>
@@ -2569,7 +2569,7 @@
     <string name="poi_health_person_type_nurse">Роль медработника: медсестра</string>
     <string name="poi_health_person_type_paramedic">Роль медработника: фельдшер</string>
     <string name="poi_health_person_type_physician">Роль медработника: врач</string>
-    <string name="poi_health_person_type_podologist">Роль медработника: подолог</string>
+    <string name="poi_health_person_type_podologist">Роль медработника: ортопед</string>
     <string name="poi_health_person_type_psychologist">Роль медработника: психолог</string>
     <string name="poi_health_person_type_therapist">Роль медработника: терапевт</string>
     <string name="poi_health_person_type_physician_assitant">Роль медработника: ассистент врача</string>
@@ -2648,7 +2648,7 @@
     <string name="poi_disease_aids_no">СПИД: нет</string>
     <string name="poi_office_physician">Офис врача</string>
     <string name="poi_office_therapist">Офис терапевта</string>
-    <string name="poi_office_podologist">Офис подолога</string>
+    <string name="poi_office_podologist">Офис ортопеда</string>
     <string name="poi_office_healer">Офис целителя</string>
     <string name="poi_office_psychologist">Офис психолога</string>
     <string name="poi_office_nursing_service">Офис службы ухода за больными</string>
@@ -2681,7 +2681,7 @@
     <string name="poi_bicycle_parking_tree">Велопарковка в форме дерева</string>
     <string name="poi_bicycle_parking_streetpod">Открытый отсек</string>
     <string name="poi_depth">Глубина</string>
-    <string name="poi_salt_yes">Соль</string>
+    <string name="poi_salt_yes">Соль: есть</string>
     <string name="poi_salt_no">Соль: нет</string>
     <string name="poi_wheelchair_designated">Только для инвалидных кресел</string>
     <string name="poi_spoil_heap">Отвал породы</string>
@@ -2690,25 +2690,25 @@
     <string name="poi_crossing_activation_automatic">Управление переездом: автоматическое</string>
     <string name="poi_crossing_activation_local">Управление переездом: местное</string>
     <string name="poi_crossing_activation_remote">Управление переездом: дистанционное</string>
-    <string name="poi_crossing_barrier_no">Барьер на перезде: нет</string>
-    <string name="poi_crossing_barrier_yes">Барьер на переезде</string>
+    <string name="poi_crossing_barrier_no">Барьер на переезде: нет</string>
+    <string name="poi_crossing_barrier_yes">Барьер на переезде: есть</string>
     <string name="poi_crossing_barrier_full">Барьер на переезде: полный</string>
     <string name="poi_crossing_barrier_half">Барьер на переезде: половинный</string>
     <string name="poi_crossing_barrier_double_half">Барьер на переезде: двойной половинный</string>
-    <string name="poi_crossing_bell_yes">Звуковой сигнал у переезда</string>
+    <string name="poi_crossing_bell_yes">Звуковой сигнал у переезда: есть</string>
     <string name="poi_crossing_bell_no">Звуковой сигнал у переезда: нет</string>
-    <string name="poi_crossing_light_yes">Светофор у переезда</string>
+    <string name="poi_crossing_light_yes">Светофор у переезда: есть</string>
     <string name="poi_crossing_light_no">Светофор у переезда: нет</string>
-    <string name="poi_crossing_on_demand_yes">Пересечение переезда по требованию</string>
+    <string name="poi_crossing_on_demand_yes">Пересечение переезда по требованию: есть</string>
     <string name="poi_crossing_on_demand_no">Пересечение переезда по требованию: нет</string>
-    <string name="poi_crossing_saltire_yes">Знак у переезда</string>
+    <string name="poi_crossing_saltire_yes">Знак у переезда: есть</string>
     <string name="poi_crossing_saltire_no">Знак у переезда: нет</string>
-    <string name="poi_crossing_supervision_yes">Наблюдение за переездом</string>
-    <string name="poi_crossing_supervision_no">Наблюдение за переездом: отсутствует</string>
+    <string name="poi_crossing_supervision_yes">Наблюдение за переездом: есть</string>
+    <string name="poi_crossing_supervision_no">Наблюдение за переездом: нет</string>
     <string name="poi_crossing_supervision_attendant">Наблюдение за переездом: смотрящий</string>
     <string name="poi_crossing_supervision_camera">Наблюдение за переездом: камера</string>
     <string name="poi_pharmacy_dispensing">Продажа лекарств по рецептам</string>
-    <string name="poi_dispensing_yes">Есть</string>
+    <string name="poi_dispensing_yes">Продажа лекарств по рецептам: есть</string>
     <string name="poi_dispensing_no">Продажа лекарств по рецептам: нет</string>
     <string name="poi_aerodrome_type_international">Международный</string>
     <string name="poi_aerodrome_type_regional">Региональный</string>
@@ -2758,18 +2758,18 @@
     <string name="poi_generator_output_biogas_yes">Производит: биогаз</string>
     <string name="poi_pumping_station">Насосная станция</string>
     <string name="poi_display_yes">Дисплей: есть</string>
-    <string name="poi_display_no">Дисплей: отсутствует</string>
+    <string name="poi_display_no">Дисплей: нет</string>
     <string name="poi_display_analog_yes">Аналоговый дисплей</string>
     <string name="poi_display_digital_yes">Цифровой дисплей</string>
     <string name="poi_display_sundial_yes">Солнечные часы</string>
     <string name="poi_clock_option">Дополнительно</string>
-    <string name="poi_barometer_yes">Барометр</string>
-    <string name="poi_barometer_no">Барометр: отсутствует</string>
-    <string name="poi_thermometer_yes">Термометр</string>
-    <string name="poi_thermometer_no">Термометр: отсутствует</string>
-    <string name="poi_hygrometer_yes">Гигрометр</string>
-    <string name="poi_hygrometer_no">Гигрометр: отсутствует</string>
-    <string name="poi_date_yes">Дата</string>
+    <string name="poi_barometer_yes">Барометр: есть</string>
+    <string name="poi_barometer_no">Барометр: нет</string>
+    <string name="poi_thermometer_yes">Термометр: есть</string>
+    <string name="poi_thermometer_no">Термометр: нет</string>
+    <string name="poi_hygrometer_yes">Гигрометр: есть</string>
+    <string name="poi_hygrometer_no">Гигрометр: нет</string>
+    <string name="poi_date_yes">Дата: есть</string>
     <string name="poi_date_no">Дата: нет</string>
     <string name="poi_support_pole">Опора: столб</string>
     <string name="poi_support_wall_mounted">Опора: стена</string>
@@ -2782,7 +2782,7 @@
     <string name="poi_support_roof">Опора: крыша</string>
     <string name="poi_support_tower">Опора: башня</string>
     <string name="poi_passenger_information_display_yes">Информационный дисплей пассажира: есть</string>
-    <string name="poi_passenger_information_display_no">Информационный дисплей пассажира: отсутствует</string>
+    <string name="poi_passenger_information_display_no">Информационный дисплей пассажира: нет</string>
     <string name="poi_aquaculture">Аквакультура</string>
     <string name="poi_aquaculture_shrimp">Разведение креветок</string>
     <string name="poi_aquaculture_fish">Разведение рыбы</string>
@@ -2796,7 +2796,7 @@
     <string name="poi_embassy_type">Вид</string>
     <string name="poi_diplomatic_consulate">Консульство</string>
     <string name="poi_diplomatic_consulate_general">Генеральное консульство</string>
-    <string name="poi_diplomatic_honorary_consulate">Почетное консульство</string>
+    <string name="poi_diplomatic_honorary_consulate">Почётное консульство</string>
     <string name="poi_diplomatic_permanent_mission">Постоянное представительство</string>
     <string name="poi_diplomatic_delegation">Делегация</string>
     <string name="poi_diplomatic_ambassadors_residence">Резиденция посла</string>
@@ -3041,7 +3041,7 @@
     <string name="poi_zoo_petting_zoo">Контактный зоопарк</string>
     <string name="poi_zoo_wildlife_park">Парк дикой природы</string>
     <string name="poi_zoo_enclosure">Клетки</string>
-    <string name="poi_zoo_safari_park">Сафари парк</string>
+    <string name="poi_zoo_safari_park">Сафари-парк</string>
     <string name="poi_zoo_birds">Птицы</string>
     <string name="poi_zoo_aviary">Вольер для птиц</string>
     <string name="poi_zoo_falconry">Соколиная охота</string>
@@ -3049,19 +3049,19 @@
     <string name="poi_zoo_type">Тип</string>
     <string name="poi_stands">Спортивная трибуна</string>
     <string name="poi_motorcycle_services">Услуги</string>
-    <string name="poi_motorcycle_sales_yes">Продажа</string>
+    <string name="poi_motorcycle_sales_yes">Продажа: есть</string>
     <string name="poi_motorcycle_sales_no">Продажа: нет</string>
     <string name="poi_motorcycle_sales_yes_used">Продажа: есть, б/у</string>
     <string name="poi_motorcycle_sales_used">Продажа: б/у</string>
-    <string name="poi_motorcycle_rental_yes">Аренда</string>
+    <string name="poi_motorcycle_rental_yes">Аренда: есть</string>
     <string name="poi_motorcycle_rental_no">Аренда: нет</string>
-    <string name="poi_motorcycle_repair_yes">Ремонт</string>
+    <string name="poi_motorcycle_repair_yes">Ремонт: есть</string>
     <string name="poi_motorcycle_repair_no">Ремонт: нет</string>
-    <string name="poi_motorcycle_parts_yes">Запчасти</string>
+    <string name="poi_motorcycle_parts_yes">Запчасти: есть</string>
     <string name="poi_motorcycle_parts_no">Запчасти: нет</string>
-    <string name="poi_motorcycle_tyres_yes">Шины</string>
+    <string name="poi_motorcycle_tyres_yes">Шины: есть</string>
     <string name="poi_motorcycle_tyres_no">Шины: нет</string>
-    <string name="poi_motorcycle_clothes_yes">Мотоциклетная одежда</string>
+    <string name="poi_motorcycle_clothes_yes">Мотоциклетная одежда: есть</string>
     <string name="poi_motorcycle_clothes_no">Мотоциклетная одежда: нет</string>
     <string name="poi_motorcycle_type">Тип мотоциклов</string>
     <string name="poi_motorcycle_type_scooter">Мотороллеры</string>
@@ -3108,27 +3108,27 @@
     <string name="poi_winter_room_no">Зимняя комната: нет</string>
     <string name="poi_reservation_required">Бронирование: требуется</string>
     <string name="poi_reservation_recommended">Бронирование: рекомендуется</string>
-    <string name="poi_reservation_yes">Бронирование: возможно</string>
-    <string name="poi_reservation_no">Бронирование: не предусмотрено</string>
+    <string name="poi_reservation_yes">Бронирование: есть</string>
+    <string name="poi_reservation_no">Бронирование: нет</string>
     <string name="poi_reservation_members_only">Бронирование: для узкого круга лиц</string>
     <string name="poi_beds">Кровати</string>
     <string name="poi_boat_rental_type">Арендуемые лодки</string>
     <string name="poi_boat_rental">Прокат лодок</string>
-    <string name="poi_boat_motorboat_rental_yes">Моторные лодки: да</string>
+    <string name="poi_boat_motorboat_rental_yes">Моторные лодки: есть</string>
     <string name="poi_boat_motorboat_rental_no">Моторные лодки: нет</string>
-    <string name="poi_boat_houseboat_rental_yes">Плавучие дома: да</string>
+    <string name="poi_boat_houseboat_rental_yes">Плавучие дома: есть</string>
     <string name="poi_boat_houseboat_rental_no">Плавучие дома: нет</string>
-    <string name="poi_boat_pedalboat_rental_yes">Педальные лодки: да</string>
+    <string name="poi_boat_pedalboat_rental_yes">Педальные лодки: есть</string>
     <string name="poi_boat_pedalboat_rental_no">Педальные лодки: нет</string>
-    <string name="poi_boat_jetski_rental_yes">Гидроциклы: да</string>
+    <string name="poi_boat_jetski_rental_yes">Гидроциклы: есть</string>
     <string name="poi_boat_jetski_rental_no">Гидроциклы: нет</string>
-    <string name="poi_boat_sailboat_rental_yes">Парусники: да</string>
+    <string name="poi_boat_sailboat_rental_yes">Парусники: есть</string>
     <string name="poi_boat_sailboat_rental_no">Парусники: нет</string>
-    <string name="poi_boat_dinghy_rental_rental_yes">Шлюпки: да</string>
+    <string name="poi_boat_dinghy_rental_rental_yes">Шлюпки: есть</string>
     <string name="poi_boat_dinghy_rental_rental_no">Шлюпки: нет</string>
-    <string name="poi_boat_kayak_rental_rental_yes">Каяки: да</string>
+    <string name="poi_boat_kayak_rental_rental_yes">Каяки: есть</string>
     <string name="poi_boat_kayak_rental_rental_no">Каяки: нет</string>
-    <string name="poi_boat_canoe_rental_rental_yes">Каноэ: да</string>
+    <string name="poi_boat_canoe_rental_rental_yes">Каноэ: есть</string>
     <string name="poi_boat_canoe_rental_rental_no">Каноэ: нет</string>
     <string name="poi_government_archive">Архив</string>
     <string name="poi_government_ministry">Министерство</string>
@@ -3180,35 +3180,35 @@
     <string name="poi_water_place_access_family">Семья</string>
     <string name="poi_water_place_access_multifamilies">Несколько семей</string>
     <string name="poi_socket_cee_blue">Разъём: CEE blue</string>
-    <string name="poi_socket_cee_blue_current">Разъём: CEE blue: ток</string>
-    <string name="poi_socket_cee_blue_output">Разъём: CEE blue: мощность</string>
-    <string name="poi_socket_cee_red_16a">Разъём: CEE red 16A</string>
-    <string name="poi_socket_cee_red_16a_current">Разъём: CEE red 16A: ток</string>
-    <string name="poi_socket_cee_red_16a_output">Разъём: CEE red 16A: мощность</string>
-    <string name="poi_socket_cee_red_32a">Разъём: CEE red 32A</string>
-    <string name="poi_socket_cee_red_32a_current">Разъём: CEE red 32A: ток</string>
-    <string name="poi_socket_cee_red_32a_output">Разъём: CEE red 32A: мощность</string>
-    <string name="poi_socket_cee_red_64a">Разъём: CEE red 64A</string>
-    <string name="poi_socket_cee_red_64a_current">Разъём: CEE red 64A: ток</string>
-    <string name="poi_socket_cee_red_64a_output">Разъём: CEE red 64A: мощность</string>
-    <string name="poi_socket_cee_red_125a">Разъём: CEE red 125A</string>
-    <string name="poi_socket_cee_red_125a_current">Разъём: CEE red 125A: ток</string>
-    <string name="poi_socket_cee_red_125a_output">Разъём: CEE red 125A: мощность</string>
-    <string name="poi_socket_type1">Разъём: Type 1</string>
-    <string name="poi_socket_type1_current">Разъём: Type 1: ток</string>
-    <string name="poi_socket_type1_output">Разъём: Type 1: мощность</string>
-    <string name="poi_socket_type1_combo">Разъём: Type 1 combo</string>
-    <string name="poi_socket_type1_combo_current">Разъём: Type 1 combo: ток</string>
-    <string name="poi_socket_type1_combo_output">Разъём: Type 1 combo: мощность</string>
-    <string name="poi_socket_type2">Разъём: Type 2</string>
-    <string name="poi_socket_type2_current">Разъём: Type 2: ток</string>
-    <string name="poi_socket_type2_output">Разъём: Type 2: мощность</string>
-    <string name="poi_socket_type2_combo">Разъём: Type 2 combo</string>
-    <string name="poi_socket_type2_combo_current">Разъём: Type 2 combo: ток</string>
-    <string name="poi_socket_type2_combo_output">Разъём: Type 2 combo: мощность</string>
-    <string name="poi_socket_type3">Разъём: Type 3</string>
-    <string name="poi_socket_type3_current">Разъём: Type 3: ток</string>
-    <string name="poi_socket_type3_output">Разъём: Type 3: мощность</string>
+    <string name="poi_socket_cee_blue_current">Разъём: CEE синий: ток</string>
+    <string name="poi_socket_cee_blue_output">Разъём: CEE синий: мощность</string>
+    <string name="poi_socket_cee_red_16a">Разъём: CEE красный 16A</string>
+    <string name="poi_socket_cee_red_16a_current">Разъём: CEE красный 16A: ток</string>
+    <string name="poi_socket_cee_red_16a_output">Разъём: CEE красный 16A: мощность</string>
+    <string name="poi_socket_cee_red_32a">Разъём: CEE красный 32A</string>
+    <string name="poi_socket_cee_red_32a_current">Разъём: CEE красный 32A: ток</string>
+    <string name="poi_socket_cee_red_32a_output">Разъём: CEE красный 32A: мощность</string>
+    <string name="poi_socket_cee_red_64a">Разъём: CEE красный 64A</string>
+    <string name="poi_socket_cee_red_64a_current">Разъём: CEE красный 64A: ток</string>
+    <string name="poi_socket_cee_red_64a_output">Разъём: CEE красный 64A: мощность</string>
+    <string name="poi_socket_cee_red_125a">Разъём: CEE красный 125A</string>
+    <string name="poi_socket_cee_red_125a_current">Разъём: CEE красный 125A: ток</string>
+    <string name="poi_socket_cee_red_125a_output">Разъём: CEE красный 125A: мощность</string>
+    <string name="poi_socket_type1">Разъём: Тип 1</string>
+    <string name="poi_socket_type1_current">Разъём: Тип 1: ток</string>
+    <string name="poi_socket_type1_output">Разъём: Тип 1: мощность</string>
+    <string name="poi_socket_type1_combo">Разъём: Тип 1 combo</string>
+    <string name="poi_socket_type1_combo_current">Разъём: Тип 1 combo: ток</string>
+    <string name="poi_socket_type1_combo_output">Разъём: Тип 1 combo: мощность</string>
+    <string name="poi_socket_type2">Разъём: Тип 2</string>
+    <string name="poi_socket_type2_current">Разъём: Тип 2: ток</string>
+    <string name="poi_socket_type2_output">Разъём: Тип 2: мощность</string>
+    <string name="poi_socket_type2_combo">Разъём: Тип 2 combo</string>
+    <string name="poi_socket_type2_combo_current">Разъём: Тип 2 combo: ток</string>
+    <string name="poi_socket_type2_combo_output">Разъём: Тип 2 combo: мощность</string>
+    <string name="poi_socket_type3">Разъём: Тип 3</string>
+    <string name="poi_socket_type3_current">Разъём: Тип 3: ток</string>
+    <string name="poi_socket_type3_output">Разъём: Тип 3: мощность</string>
     <string name="poi_socket_chademo">Разъём: CHAdeMO</string>
     <string name="poi_socket_chademo_current">Разъём: CHAdeMO: ток</string>
     <string name="poi_socket_chademo_output">Разъём: CHAdeMO: мощность</string>
@@ -3250,7 +3250,7 @@
     <string name="poi_scooter_no">Скутер: нет</string>
     <string name="poi_truck_yes">Грузовик: да</string>
     <string name="poi_truck_no">Грузовик: нет</string>
-    <string name="poi_parking_fee_yes">Оплата за парковку: да</string>
+    <string name="poi_parking_fee_yes">Оплата за парковку: есть</string>
     <string name="poi_parking_fee_no">Оплата за парковку: нет</string>
     <string name="poi_amperage">Ток</string>
     <string name="poi_charging_station_output">Мощность зарядной станции</string>
@@ -3276,7 +3276,7 @@
     <string name="poi_google_plus">Google+</string>
     <string name="poi_content_wastewater">Содержимое: стоки</string>
     <string name="poi_enforcement_check">Требование: контроль</string>
-    <string name="poi_payment_account_cards_no">Платежные карты не принимаются</string>
+    <string name="poi_payment_account_cards_no">Платёжные карты не принимаются</string>
     <string name="poi_payment_prepaid_ticket_yes">Предоплаченные билеты</string>
     <string name="poi_depot">Депо</string>
     <string name="poi_letter_box">Абонентский почтовый ящик</string>
@@ -3503,7 +3503,7 @@
     <string name="poi_fire_hydrant_position_green">Трава</string>
     <string name="poi_fire_hydrant_position_lane">Полоса движения</string>
     <string name="poi_fire_hydrant_style_wsh">Дизайн гидранта: wsh</string>
-    <string name="poi_payment_account_cards_yes">Платежные карты</string>
+    <string name="poi_payment_account_cards_yes">Платёжные карты</string>
     <string name="poi_memorial_koshinto">Косинто</string>
     <string name="poi_fuel_autogas">Автогаз</string>
     <string name="poi_dolphin">Дельфинариум</string>
@@ -3519,15 +3519,15 @@
     <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
     <string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
     <string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
-    <string name="poi_socket_schuko_yes">Schuko/Шуко</string>
+    <string name="poi_socket_schuko_yes">Schuko</string>
     <string name="poi_socket_bs1363_yes">BS 1363</string>
     <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
-    <string name="poi_socket_chademo_output_filter">CHAdeMO вывод</string>
-    <string name="poi_socket_type2_output_filter">Type 2 вывод</string>
-    <string name="poi_socket_type2_combo_output_filter">Type 2 combo вывод</string>
-    <string name="poi_socket_type3_output_filter">Type 3 вывод</string>
-    <string name="poi_socket_cee_blue_output_filter">CEE blue вывод</string>
-    <string name="poi_socket_schuko_output_filter">Schuko вывод</string>
+    <string name="poi_socket_chademo_output_filter">Выход: CHAdeMO</string>
+    <string name="poi_socket_type2_output_filter">Выход: Тип 2</string>
+    <string name="poi_socket_type2_combo_output_filter">Выход: Тип 2 combo</string>
+    <string name="poi_socket_type3_output_filter">Выход: Тип 3</string>
+    <string name="poi_socket_cee_blue_output_filter">Выход: CEE синий</string>
+    <string name="poi_socket_schuko_output_filter">Выход: Schuko</string>
     <string name="poi_car_pooling">Точка сбора карпулинга</string>
     <string name="poi_park_ride_hov">Полоса HOV; Карпул; Полоса для проезда загруженного пассажирского транспорта</string>
     <string name="poi_hazard">Опасность</string>
@@ -3561,8 +3561,8 @@
     <string name="poi_access_motorcycle">Доступ для мотоциклов</string>
     <string name="poi_access_moped">Доступ для мопедов</string>
     <string name="poi_access_mofa">Доступ для мопедов Mofa</string>
-    <string name="poi_access_hgv">Доступ для тяжелых грузовых автомобилей (HGV)</string>
-    <string name="poi_access_goods">Доступ для легких грузовых автомобилей (LGV)</string>
+    <string name="poi_access_hgv">Доступ для тяжёлых грузовых автомобилей (HGV)</string>
+    <string name="poi_access_goods">Доступ для лёгких грузовых автомобилей (LGV)</string>
     <string name="poi_vehicle_yes">Доступ для транспортных средств: да</string>
     <string name="poi_vehicle_private">Доступ для транспортных средств: частный</string>
     <string name="poi_vehicle_no">Доступ для транспортных средств: нет</string>
@@ -3589,12 +3589,12 @@
     <string name="poi_motor_vehicle_delivery">Доступ для механического транспортного средства: курьеры/доставка</string>
     <string name="poi_motor_vehicle_forestry">Доступ для механического транспортного средства: лесное хозяйство</string>
     <string name="poi_motor_vehicle_agricultural">Доступ для механического транспортного средства: сельскохозяйственные</string>
-    <string name="poi_hgv_private">Доступ для тяжелых грузовых автомобилей (HGV): частный</string>
-    <string name="poi_hgv_no">Доступ для тяжелых грузовых автомобилей (HGV): нет</string>
-    <string name="poi_hgv_agricultural">Доступ для тяжелых грузовых автомобилей (HGV): сельскохозяйственные</string>
-    <string name="poi_hgv_discouraged">Доступ для тяжелых грузовых автомобилей (HGV): затруднен</string>
-    <string name="poi_hgv_unsuitable">Доступ для тяжелых грузовых автомобилей (HGV): непригоден</string>
-    <string name="poi_goods_no">Доступ для легких грузовых автомобилей (LGV): нет</string>
+    <string name="poi_hgv_private">Доступ для тяжёлых грузовых автомобилей (HGV): частный</string>
+    <string name="poi_hgv_no">Доступ для тяжёлых грузовых автомобилей (HGV): нет</string>
+    <string name="poi_hgv_agricultural">Доступ для тяжёлых грузовых автомобилей (HGV): сельскохозяйственные</string>
+    <string name="poi_hgv_discouraged">Доступ для тяжёлых грузовых автомобилей (HGV): затруднён</string>
+    <string name="poi_hgv_unsuitable">Доступ для тяжёлых грузовых автомобилей (HGV): непригоден</string>
+    <string name="poi_goods_no">Доступ для лёгких грузовых автомобилей (LGV): нет</string>
     <string name="poi_motorcycle_private">Доступ для мотоциклов: частный</string>
     <string name="poi_motorcycle_no">Доступ для мотоциклов: нет</string>
     <string name="poi_moped_no">Доступ для мопедов: нет</string>
@@ -3749,4 +3749,8 @@
     <string name="poi_surface_metal_grid">Металлическая сетка</string>
     <string name="poi_surface_decoturf">DecoTurf</string>
     <string name="poi_surface_tartan">Тартан</string>
+    <string name="poi_snowmobile_permissive">С разрешения</string>
+    <string name="poi_motorcycle_permissive">С разрешения</string>
+    <string name="poi_hgv_permissive">С разрешения</string>
+    <string name="poi_seamark_obstruction">Препятствие</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -2856,7 +2856,7 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="osm_live_payment_annual_title">Una borta a s\'annu</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mese</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mese</string>
-    <string name="osm_live_payment_discount_descr">Rispàrmia %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Rispàrmia %1$s</string>
     <string name="osm_live_payment_current_subscription">Abbonamentu atuale</string>
     <string name="osm_live_payment_renews_monthly">Si rinnovat cada mese</string>
     <string name="osm_live_payment_renews_quarterly">Si rinnovat cada tres meses</string>
@@ -3670,4 +3670,12 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="custom_color">Colore personalizadu</string>
     <string name="extra_maps_menu_group">Mapas additzionales</string>
     <string name="download_unsupported_action">Atzione %1$s non suportada</string>
+    <string name="osm_live_payment_subscription_management">Su pagamentu at a èssere addebitadu a su contu tuo de Google Play cando sa còmpora at a èssere cunfirmada.
+\n
+\nS\'abbonamentu si rinnovat a sa sola automaticamente, francu chi siat istadu annulladu in antis de sa die de su rinnovu. Su contu tuo at a bènnere addebitadu pro su perìodu de rinnovu (mese/tres meses/annu) in sa die de rinnovu ebbia.
+\n
+\nPodes amministrare e annullare sos abbonamentos tuos intrende in sas impostatziones de Google Play tuas.</string>
+    <string name="search_poi_types">Chirca castas de PDI</string>
+    <string name="search_poi_types_descr">Cumbina castas de PDI de catogorias diferentes. Incarca su buone pro ischertare totu, incarca s\'ala a manca pro sa seletzione de sas categorias.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
 </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -102,7 +102,7 @@
     <string name="poi_video">Videotéka</string>
     <string name="poi_window_blind">Žalúzie</string>
     <string name="poi_department_store">Obchodný dom</string>
-    <string name="poi_electronics">Elektro</string>
+    <string name="poi_electronics">Elektrospotrebiče/Elektronika</string>
     <string name="poi_car">Automobily</string>
     <string name="poi_car_parts">Autodiely</string>
     <string name="poi_atv">Terénne štvorkolky</string>
@@ -3554,4 +3554,5 @@
     <string name="poi_dive_centre">Potápačské centrum</string>
     <string name="poi_video_telephone">Video</string>
     <string name="poi_sms">SMS</string>
+    <string name="poi_climbing_crag_filter">Lezecká stena</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1231,7 +1231,7 @@
     <string name="lang_sc">Sardínsky</string>
     <string name="lang_sr">Srbsky (Cyrilika)</string>
     <string name="lang_zh_cn">Čínština (Zjednodušená)</string>
-    <string name="lang_zh_tw">Čínština (Tradičná)</string>
+    <string name="lang_zh_tw">Čínsky (Tradičná)</string>
     <string name="continue_navigation">Pokračovať v navigácii</string>
     <string name="pause_navigation">Pozastaviť navigáciu</string>
     <string name="rendering_attr_alpineHiking_name">Alpinistická stupnica (SAC)</string>
@@ -2843,7 +2843,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Ročne</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mesiac</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesiac</string>
-    <string name="osm_live_payment_discount_descr">Ušetríte %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Ušetríte %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuálne predplatné</string>
     <string name="osm_live_payment_renews_monthly">Obnovuje sa mesačne</string>
     <string name="osm_live_payment_renews_quarterly">Obnovuje sa štvrťročne</string>
@@ -3600,10 +3600,10 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="app_mode_ski_snowmobile">Snežný skúter</string>
     <string name="custom_osmand_plugin">Vlastný modul pre OsmAnd</string>
     <string name="replace_point_descr">Nahradiť iný bod týmto</string>
-    <string name="changes_applied_to_profile">Zmeny boli použité na profil %1$s.</string>
-    <string name="settings_item_read_error">Nepodarilo sa prečítať %1$s.</string>
-    <string name="settings_item_write_error">Nepodarilo sa zapísať %1$s.</string>
-    <string name="settings_item_import_error">Nepodarilo sa importovať %1$s.</string>
+    <string name="changes_applied_to_profile">Zmeny boli použité na profil \"%1$s\".</string>
+    <string name="settings_item_read_error">Nepodarilo sa prečítať z \"%1$s\".</string>
+    <string name="settings_item_write_error">Nepodarilo sa zapísať do \"%1$s\".</string>
+    <string name="settings_item_import_error">Nepodarilo sa importovať z \"%1$s\".</string>
     <string name="select_track_file">Zvoľte súbor stopy</string>
     <string name="shared_string_languages">Jazyky</string>
     <string name="shared_string_language">Jazyk</string>
@@ -3623,14 +3623,61 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="divider_descr">Položky pod týmto bodom sú oddelené rozdeľovačom.</string>
     <string name="shared_string_hidden">Skryté</string>
     <string name="hidden_items_descr">Tieto položky sú skryté z menu, ale ich možnosti a moduly zostanú funkčné.</string>
-    <string name="reset_items_descr">Po skrytí sa nastavenia resetujú do pôvodného stavu.</string>
-    <string name="main_actions_descr">Hlavné akcie sú obmedzené na 4 tlačidlá.</string>
+    <string name="reset_items_descr">Skrytie nastavení ich resetuje do pôvodného stavu.</string>
+    <string name="main_actions_descr">\"Hlavné akcie\" obsahujú len 4 tlačidlá.</string>
     <string name="main_actions">Hlavné akcie</string>
-    <string name="additional_actions_descr">K akciám môžete pristúpiť stlačením tlačidla \"Akcie\".</string>
+    <string name="additional_actions_descr">K týmto akciám môžete pristúpiť stlačením tlačidla \"Ďalšie akcie\".</string>
     <string name="move_inside_category">Môžete presúvať položky len v rámci tejto kategórie.</string>
     <string name="developer_plugin">Doplnok pre vývojárov</string>
     <string name="shared_string_items">Položky</string>
     <string name="custom_color">Vlastná farba</string>
     <string name="extra_maps_menu_group">Ďalšie mapy</string>
     <string name="download_unsupported_action">Nepodporovaná akcia %1$s</string>
+    <string name="select_wikipedia_article_langs">Zvoľte jazyky, v ktorých sa zobrazia články Wikipedia na mape. Počas čítania článku môžete prepnúť medzi všetkými dostupnými jazykmi.</string>
+    <string name="some_articles_may_not_available_in_lang">Niektoré články Wikipedia nemusia byť dostupné vo vašom jazyku.</string>
+    <string name="lang_zhyue">Kantonsky</string>
+    <string name="lang_zhminnan">Južnominsky</string>
+    <string name="lang_yo">Jorubsky</string>
+    <string name="lang_war">Warajsky</string>
+    <string name="lang_uz">Uzbecky</string>
+    <string name="lang_ur">Urdsky</string>
+    <string name="lang_tt">Tatársky</string>
+    <string name="lang_tg">Tadžicky</string>
+    <string name="lang_sco">Škótsky</string>
+    <string name="lang_scn">Sicílsky</string>
+    <string name="lang_pnb">Pandžábsky</string>
+    <string name="lang_ne">Nepálsky</string>
+    <string name="lang_nap">Neapolsky</string>
+    <string name="lang_my">Barmsky</string>
+    <string name="lang_mn">Mongolsky</string>
+    <string name="lang_min">Minangkabausky</string>
+    <string name="lang_mg">Malagašsky</string>
+    <string name="lang_ky">Kirgizsky</string>
+    <string name="lang_kk">Kazašsky</string>
+    <string name="lang_jv">Jávsky</string>
+    <string name="lang_gu">Gudžarátsky</string>
+    <string name="lang_cv">Baškir</string>
+    <string name="lang_ce">Čečensky</string>
+    <string name="lang_bar">Bavorsky</string>
+    <string name="lang_ba">Baškirsky</string>
+    <string name="lang_an">Aragonsky</string>
+    <string name="lang_lmo">Lombardsky</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 stiahnutá z vášho účtu Google Play po zakúpení predplatného 
+\n a keď dôjde k uplynutiu jeho platnosti (mesiac/štvrťrok/rok),
+\navšak nepredĺži sa automaticky ak ho zrušíte v nastaveniach Google Play.</string>
+    <string name="search_poi_types">Hľadať typy bodov záujmu</string>
+    <string name="search_poi_types_descr">Skombinovať typy bodov záujmov z rôznych kategórií. Stlačte \"Prepnúť\" pre zvolenie všetkých, stlačte ľavú stranu pre výber kategórií.</string>
+    <string name="tracker_item">Stopovanie OsmAnd</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Rýchla akcia</string>
+    <string name="radius_ruler_item">Polomerové pravítko</string>
+    <string name="measure_distance_item">Merať vzdialenosť</string>
+    <string name="travel_item">Cestovanie (Wikivoyage a Wikipédia)</string>
+    <string name="map_markers_item">Mapové značky</string>
+    <string name="favorites_item">Obľúbené</string>
+    <string name="subscription_osmandlive_item">Predplatné - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Nákupy v OsmAnd</string>
+    <string name="legend_item_description">Sprievodca symbolmi na mape</string>
+    <string name="navigation_profiles_item">Navigačné profily</string>
 </resources>

OsmAnd/res/values-sl/strings.xml

@@ -2763,7 +2763,7 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="osm_live_payment_annual_title">Letno</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / mesec</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / mesec</string>
-    <string name="osm_live_payment_discount_descr">Prihranite %1$s!</string>
+    <string name="osm_live_payment_discount_descr">Prihranite %1$s</string>
     <string name="osm_live_payment_current_subscription">Trenutno naročen paket</string>
     <string name="osm_live_payment_renews_monthly">Mesečna obnovitev</string>
     <string name="osm_live_payment_renews_quarterly">Četrtletna obnovitev</string>

OsmAnd/res/values-sr/strings.xml

@@ -2856,7 +2856,7 @@
     <string name="osm_live_payment_annual_title">годишње</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / месечно</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / месечно</string>
-    <string name="osm_live_payment_discount_descr">Уштедите %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Уштедите %1$s</string>
     <string name="osm_live_payment_current_subscription">Тренутна претплата</string>
     <string name="osm_live_payment_renews_monthly">Месечно обнављање</string>
     <string name="osm_live_payment_renews_quarterly">Квартално обнављање</string>

OsmAnd/res/values-sv/strings.xml

@@ -2725,7 +2725,7 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="osm_live_payment_annual_title">Årligen</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / månad</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / månad</string>
-    <string name="osm_live_payment_discount_descr">Spara %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Spara %1$s</string>
     <string name="osm_live_payment_current_subscription">Aktuell prenumeration</string>
     <string name="osm_live_payment_renews_monthly">Förnyas varje månad</string>
     <string name="osm_live_payment_renews_quarterly">Förnyas kvartalsvis</string>

OsmAnd/res/values-ta/strings.xml

@@ -266,7 +266,7 @@
     <string name="record_plugin_name">பயண பதிவுகள்</string>
     <string name="srtm_paid_version_title">எல்லைகொடு வரிகளின் செருகி</string>
     <string name="srtm_plugin_name">"எல்லைகோடு  "</string>
-    <string name="osm_live_payment_discount_descr">சேமிக்க %1$s!</string>
+    <string name="osm_live_payment_discount_descr">சேமிக்க %1$s</string>
     <string name="markers_remove_dialog_msg">\'%s\' வரைப்படப் புள்ளியை அழிக்க\?</string>
     <string name="unirs_render_descr">பாதசாரி மற்றும் மிதிவண்டி சாலைகள் வேறுபடுவதை இயல்புநிலை பாணியின் மாற்றல். மரபுவழி Mapnik வண்ணங்களைப் பயன்படுத்துகிறது.</string>
     <string name="shared_string_bookmark">அடையாளக்குறி</string>

OsmAnd/res/values-tr/strings.xml

@@ -2229,7 +2229,7 @@
     <string name="postcode">Posta-kodu</string>
     <string name="shared_string_from">-dan</string>
     <string name="map_widget_search">Ara</string>
-    <string name="use_osm_live_routing">OsmAnd Canlı navigasyon</string>
+    <string name="use_osm_live_routing">OsmAnd Live navigasyon</string>
     <string name="access_collapsed_list">Daraltılmış liste</string>
     <string name="access_expanded_list">Genişletilmiş liste</string>
     <string name="no_map_markers_found">Lütfen harita üzerinden harita işaretleyicileri ekleyin</string>
@@ -2910,7 +2910,7 @@
     <string name="markers_remove_dialog_msg">\'%s\' harita işaretleyicisini sil\?</string>
     <string name="edit_map_marker">Harita işaretleyicisini düzenle</string>
     <string name="osm_live_plan_pricing">Plan ve Fiyatlandırma</string>
-    <string name="osm_live_payment_discount_descr">%1$s tasarruf edin.</string>
+    <string name="osm_live_payment_discount_descr">%1$s tasarruf edin</string>
     <string name="osm_live_payment_current_subscription">Mevcut abonelik</string>
     <string name="osm_live_payment_renews_quarterly">Üç ayda bir yeniler</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
@@ -3406,7 +3406,7 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Navigasyon sırasında veya harekete halindeyken gösterilen simge.</string>
     <string name="select_map_icon_descr">Dinlenme anında gösterilen simge.</string>
-    <string name="logcat_buffer_descr">Uygulamanın detaylı log kayıtlarını kontrol edin ve paylaşın</string>
+    <string name="logcat_buffer_descr">Uygulamanın detaylı log kayıtlarına göz atın ve paylaşın</string>
     <string name="search_offline_geo_error">Geo intent \'%s\' ayrıştırılamadı.</string>
     <string name="tracks_view_descr">Kayıtlı yollarınız %1$s veya OsmAnd klasöründe.</string>
     <string name="multimedia_notes_view_descr">OSM notlarınız %1$s içindedir.</string>
@@ -3535,8 +3535,8 @@
     <string name="import_complete_description">%1$s\'deki tüm veriler içe aktarıldı, yönetmek amacıyla uygulamanın gerekli bölümünü açmak için aşağıdaki düğmeleri kullanabilirsiniz.</string>
     <string name="shared_string_import_complete">İçe aktarma tamamlandı</string>
     <string name="items_added">Eklenen ögeler</string>
-    <string name="checking_for_duplicate_description">OsmAns, uygulamadaki mevcut ögelerle yinelenme durumu için %1$s\'i kontrol ediyor.
-\n
+    <string name="checking_for_duplicate_description">OsmAnd, uygulamadaki mevcut ögelerle yinelenme durumu için %1$s\'i denetliyor. 
+\n 
 \nBu biraz zaman alabilir.</string>
     <string name="shared_string_importing">İçe aktarılıyor</string>
     <string name="importing_from">Veriler %1$s\'den içe aktarılıyor</string>
@@ -3566,10 +3566,10 @@
     <string name="app_mode_ski_touring">Kayak turu</string>
     <string name="app_mode_ski_snowmobile">Kar arabası</string>
     <string name="custom_osmand_plugin">Özel OsmAnd eklentisi</string>
-    <string name="changes_applied_to_profile">%1$s profiline değişiklikler uygulandı.</string>
-    <string name="settings_item_read_error">%1$s okunamadı.</string>
-    <string name="settings_item_write_error">%1$s yazılamadı.</string>
-    <string name="settings_item_import_error">%1$s içe aktarılamadı.</string>
+    <string name="changes_applied_to_profile">\'%1$s\' profiline değişiklikler uygulandı.</string>
+    <string name="settings_item_read_error">\'%1$s\'den okunamadı.</string>
+    <string name="settings_item_write_error">\'%1$s\'e yazılamadı.</string>
+    <string name="settings_item_import_error">\'%1$s\'den içe aktarılamadı.</string>
     <string name="select_track_file">İzlenen yol dosyasını seç</string>
     <string name="shared_string_languages">Diller</string>
     <string name="shared_string_language">Dil</string>
@@ -3577,21 +3577,71 @@
     <string name="wiki_menu_download_descr">Wikipedia POI\'lerini haritada görüntülemek için ek haritalara ihtiyaç vardır.</string>
     <string name="ui_customization_short_descr">Çekmece ögeleri, içerik menüsü</string>
     <string name="shared_string_drawer">Çekmece</string>
-    <string name="reset_items_descr">Gizlendikten sonra ayarlar orijinal durumuna sıfırlanacaktır.</string>
+    <string name="reset_items_descr">Ayarları gizlemek onları orijinal durumlarına sıfırlar.</string>
     <string name="shared_string_items">Ögeler</string>
-    <string name="ui_customization_description">Çekmecedeki ögelerin sayısını özelleştirin, haritayı ve içerik menüsünü yapılandırın.
-\n
-\n%1$s uygulamasından tüm denetimlerini gizlemek için kullanılmayan eklentileri devre dışı bırakabilirsiniz.</string>
+    <string name="ui_customization_description">Çekmecedeki ögelerin sayısını özelleştirin, haritayı ve içerik menüsünü yapılandırın. 
+\n 
+\n%1$s uygulamasından tüm denetimlerini gizlemek için kullanılmayan eklentileri kapatabilirsiniz.</string>
     <string name="ui_customization">Kullanıcı Arayüzü Özelleştirme</string>
     <string name="context_menu_actions">İçerik menüsü eylemleri</string>
     <string name="reorder_or_hide_from">%1$s\'den ögeleri yeniden sırala veya gizle.</string>
     <string name="shared_string_divider">Bölücü</string>
     <string name="divider_descr">Bu noktanın altındaki ögeler bir bölücü ile ayrılır.</string>
     <string name="shared_string_hidden">Gizli</string>
-    <string name="hidden_items_descr">Bu ögeler menüden gizlenir, ancak temsil edilen seçenekler veya eklentiler hala çalışır.</string>
-    <string name="main_actions_descr">Ana eylemler sadece 4 düğme içerir.</string>
+    <string name="hidden_items_descr">Bu ögeler menüden gizlenir, ancak temsil edilen seçenekler veya eklentiler çalışmaya devam eder.</string>
+    <string name="main_actions_descr">\'Ana eylemler\' sadece 4 düğme içerir.</string>
     <string name="main_actions">Ana eylemler</string>
-    <string name="additional_actions_descr">Bu eylemlere “Eylemler” düğmesine dokunarak erişebilirsiniz.</string>
+    <string name="additional_actions_descr">Bu eylemlere “Ek eylemler” düğmesine dokunarak erişebilirsiniz.</string>
     <string name="move_inside_category">Ögeleri yalnızca bu kategorinin içine taşıyabilirsiniz.</string>
     <string name="developer_plugin">Geliştirici Eklentisi</string>
+    <string name="select_wikipedia_article_langs">Wikipedia makalelerinin haritada görüneceği dilleri seçin. Makaleyi okurken kullanılabilir bütün diller arasında geçiş yapabilirsiniz.</string>
+    <string name="some_articles_may_not_available_in_lang">Bazı Wikipedia makaleleri sizin dilinizde mevcut olmayabilir.</string>
+    <string name="lang_zhyue">Kantonca</string>
+    <string name="lang_zhminnan">Güney Min</string>
+    <string name="lang_yo">Yorubaca</string>
+    <string name="lang_war">Varayca</string>
+    <string name="lang_uz">Özbekçe</string>
+    <string name="lang_ur">Urduca</string>
+    <string name="lang_tt">Tatarca</string>
+    <string name="lang_tg">Tacikçe</string>
+    <string name="lang_sco">İskoçça</string>
+    <string name="lang_scn">Sicilyaca</string>
+    <string name="lang_pnb">Pencapça</string>
+    <string name="lang_ne">Nepalce</string>
+    <string name="lang_nap">Napolice</string>
+    <string name="lang_my">Birmanca</string>
+    <string name="lang_min">Minangkabau dili</string>
+    <string name="lang_mg">Malgaşça</string>
+    <string name="lang_ky">Kırgızca</string>
+    <string name="lang_kk">Kazakça</string>
+    <string name="lang_jv">Cava dili</string>
+    <string name="lang_gu">Guceratça</string>
+    <string name="lang_cv">Çuvaşça</string>
+    <string name="lang_ce">Çeçence</string>
+    <string name="lang_bar">Bavyeraca</string>
+    <string name="lang_ba">Başkurtça</string>
+    <string name="lang_an">Aragonca</string>
+    <string name="lang_lmo">Lombardca</string>
+    <string name="lang_mn">Moğolca</string>
+    <string name="custom_color">Özel renk</string>
+    <string name="extra_maps_menu_group">Ekstra haritalar</string>
+    <string name="download_unsupported_action">Desteklenmeyen eylem %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">Google Play hesabınız bir abonelik satın aldıktan sonra ve süresi
+\ndolduğunda (ay/üç ay/yıl) ücretlendirilir,
+\nGoogle Play ayarlarınızdan daha önce iptal edilirse yenilenmeyecektir.</string>
+    <string name="search_poi_types">POI türleri ara</string>
+    <string name="search_poi_types_descr">Farklı kategorilerdeki POI türlerini birleştirin. Tümünü seçmek için düğmeye dokunun, kategori seçimi için sol tarafa dokunun.</string>
+    <string name="radius_ruler_item">Yarıçap cetveli</string>
+    <string name="tracker_item">OsmAnd izleyici</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Hızlı eylem</string>
+    <string name="measure_distance_item">Mesafe ölç</string>
+    <string name="travel_item">Seyahat (Wikivoyage ve Wikipedia)</string>
+    <string name="map_markers_item">Harita işaretleyicileri</string>
+    <string name="favorites_item">Sık kullanılanlar</string>
+    <string name="subscription_osmandlive_item">Abonelik - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd satın almaları</string>
+    <string name="legend_item_description">Bir haritadaki sembollerin rehberi</string>
+    <string name="navigation_profiles_item">Navigasyon profilleri</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -2850,7 +2850,7 @@
     <string name="osm_live_payment_annual_title">Щорічно</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / місяць</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / місяць</string>
-    <string name="osm_live_payment_discount_descr">Заощадьте %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Заощадьте %1$s</string>
     <string name="osm_live_payment_current_subscription">Поточна підписка</string>
     <string name="osm_live_payment_renews_monthly">Оновлюється щомісяця</string>
     <string name="osm_live_payment_renews_quarterly">Оновлюється щокварталу</string>

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

@@ -2528,7 +2528,7 @@
     <string name="osm_live_payment_annual_title">年度</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 每月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 每月</string>
-    <string name="osm_live_payment_discount_descr">省下 %1$s。</string>
+    <string name="osm_live_payment_discount_descr">省下 %1$s</string>
     <string name="osm_live_payment_current_subscription">当前订阅</string>
     <string name="open_in_browser_wiki_description">在网页浏览器中查看条目。</string>
     <string name="osm_live_subscriptions">订阅</string>

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

@@ -1734,7 +1734,7 @@
     <string name="faq_item">常見問題</string>
     <string name="faq_item_description">常見的問題</string>
     <string name="map_viewing_item">地圖檢視</string>
-    <string name="search_on_the_map_item">查詢地圖</string>
+    <string name="search_on_the_map_item">正在地圖上搜尋</string>
     <string name="planning_trip_item">規劃一次旅程</string>
     <string name="instalation_troubleshooting_item">安裝和疑難排除</string>
     <string name="techical_articles_item">技術文章</string>
@@ -2846,7 +2846,7 @@
     <string name="osm_live_payment_annual_title">每年</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / 月</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / 月</string>
-    <string name="osm_live_payment_discount_descr">節省 %1$s。</string>
+    <string name="osm_live_payment_discount_descr">節省 %1$s</string>
     <string name="osm_live_payment_current_subscription">目前的訂閱</string>
     <string name="osm_live_payment_renews_monthly">每月續訂</string>
     <string name="osm_live_payment_renews_quarterly">每季續訂</string>
@@ -3602,18 +3602,18 @@
     <string name="app_mode_ski_snowmobile">雪地摩托車</string>
     <string name="custom_osmand_plugin">自訂 OsmAnd 外掛程式</string>
     <string name="replace_point_descr">以此取代另一點</string>
-    <string name="changes_applied_to_profile">變更已套用至 %1$s 設定檔。</string>
-    <string name="settings_item_read_error">無法讀取 %1$s。</string>
-    <string name="settings_item_write_error">無法寫入 %1$s。</string>
-    <string name="settings_item_import_error">無法匯入 %1$s。</string>
+    <string name="changes_applied_to_profile">變更已套用至「%1$s」設定檔。</string>
+    <string name="settings_item_read_error">無法從「%1$s」讀取。</string>
+    <string name="settings_item_write_error">無法寫入至「%1$s」。</string>
+    <string name="settings_item_import_error">無法從「%1$s」匯入。</string>
     <string name="select_track_file">選取軌跡檔案</string>
     <string name="shared_string_languages">語言</string>
     <string name="shared_string_language">語言</string>
     <string name="shared_string_all_languages">所有語言</string>
     <string name="wiki_menu_download_descr">需要額外的地圖才能在地圖上檢視維基百科的 POI。</string>
-    <string name="ui_customization_description">在「抽屜」、「設定地圖」與情境選單中自訂項目數量。
-\n
-\n您可以停用未使用的外掛程式，以從應用程式 %1$s 中隱藏其控制元件。</string>
+    <string name="ui_customization_description">在「抽屜」、「設定地圖」與情境選單中自訂項目數量。 
+\n 
+\n您可以關閉未使用的外掛程式，以從應用程式 %1$s 中隱藏它們的控制元件。</string>
     <string name="ui_customization_short_descr">抽屜項目，情境選單</string>
     <string name="ui_customization">自訂使用者介面</string>
     <string name="shared_string_drawer">抽屜</string>
@@ -3623,10 +3623,10 @@
     <string name="divider_descr">低於此點的元素將由分隔符分離。</string>
     <string name="shared_string_hidden">已隱藏</string>
     <string name="hidden_items_descr">這些項目已從選單隱藏，但對應的選項或外掛程式將會繼續運作。</string>
-    <string name="reset_items_descr">隱藏後，設定將會重設回原始狀態。</string>
+    <string name="reset_items_descr">隱藏設定將會把它們重設回原始狀態。</string>
     <string name="main_actions_descr">主要動作僅包含 4 個按鈕。</string>
     <string name="main_actions">主要動作</string>
-    <string name="additional_actions_descr">您可以透過輕點「動作」按鈕來存取這些動作。</string>
+    <string name="additional_actions_descr">您可以透過輕點「額外動作」按鈕來存取這些動作。</string>
     <string name="move_inside_category">您只能在此分類中移動項目。</string>
     <string name="developer_plugin">開發者外掛程式</string>
     <string name="shared_string_items">項目</string>
@@ -3662,4 +3662,22 @@
     <string name="custom_color">自訂顏色</string>
     <string name="extra_maps_menu_group">額外地圖</string>
     <string name="download_unsupported_action">不支援的動作 %1$s</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="osm_live_payment_subscription_management">購買訂閱時會從您的 Google Play 帳號扣款，
+\n而過期時（一個月／三個月／一年），
+\n若您在這之前於 Google Play 設定中取消的話就不會續訂。</string>
+    <string name="search_poi_types">搜尋 POI 類型</string>
+    <string name="search_poi_types_descr">組合來自不同分類的 POI 類型。點擊開關以全選，點擊左側選取分類。</string>
+    <string name="tracker_item">OsmAnd tracker</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">快速動作</string>
+    <string name="radius_ruler_item">半徑尺規</string>
+    <string name="measure_distance_item">測量距離</string>
+    <string name="travel_item">旅行（維基導遊與維基百科）</string>
+    <string name="map_markers_item">地圖標記</string>
+    <string name="favorites_item">收藏</string>
+    <string name="subscription_osmandlive_item">訂閱 - OsmAnd Live</string>
+    <string name="osmand_purchases_item">OsmAnd 購買</string>
+    <string name="legend_item_description">地圖符號系統指南</string>
+    <string name="navigation_profiles_item">導航設定檔</string>
 </resources>

OsmAnd/res/values/attrs.xml

@@ -103,6 +103,7 @@
 		<attr name="wikivoyage_secondary_btn_bg" format="reference"/>
 		<attr name="wikivoyage_primary_btn_bg" format="reference"/>
         <attr name="purchase_dialog_shadow_btn_bg" format="reference"/>
+		<attr name="purchase_dialog_outline_btn_bg" format="reference"/>
 
         <attr name="bottom_nav_shadow" format="reference"/>
 

OsmAnd/res/values/colors.xml

@@ -461,7 +461,8 @@
 
 	<color name="profile_icon_color_inactive">#727272</color>
 
-	<color name="switch_button_active">#1A237BFF</color>
+	<color name="switch_button_active_light">#1A237BFF</color>
+	<color name="switch_button_active_dark">#1AD28521</color>
 	<color name="switch_button_active_stroke">#80237BFF</color>
 	<color name="empty_hint_bg">#80000000</color>
 

OsmAnd/res/values/sizes.xml

@@ -71,7 +71,7 @@
 
 	<dimen name="favorites_icon_right_margin">24dp</dimen>
 	<dimen name="favorites_icon_size">40dp</dimen>
-	<dimen name="favorites_list_item_height">66dp</dimen>
+	<dimen name="favorites_list_item_height">60dp</dimen>
 	<dimen name="local_index_check_right_margin">10dp</dimen>
 	<dimen name="favorites_icon_top_margin">13dp</dimen>
 	<dimen name="dialog_elements_vertical_margin">16dp</dimen>

OsmAnd/res/values/strings.xml

@@ -14,8 +14,24 @@
     <string name="shared_string_add_edit">Add / Edit</string>
     <string name="parking_positions">Parking positions</string>
     <string name="create_edit_poi">Create/Edit POI</string>
+    <string name="navigation_profiles_item">Navigation profiles</string>
+    <string name="legend_item_description">The guide to a map\'s symbology</string>
+    <string name="osmand_purchases_item">OsmAnd purchases</string>
+    <string name="subscription_osmandlive_item">Subscription - OsmAnd Live</string>
+    <string name="favorites_item">Favorites</string>
+    <string name="map_markers_item">Map markers</string>
+    <string name="travel_item">Travel (Wikivoyage and Wikipedia)</string>
+    <string name="measure_distance_item">Measure distance</string>
+    <string name="radius_ruler_item">Radius ruler</string>
+    <string name="quick_action_item">Quick action</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="tracker_item">OsmAnd tracker</string>
     <string name="download_unsupported_action">Unsupported action %1$s</string>
     <string name="extra_maps_menu_group">Extra maps</string>
+    <string name="search_poi_types_descr">Combine POI types from different categories. Tap \"Switch\" to select all, tap the left side for category selection.</string>
+    <string name="search_poi_types">Search for POI types</string>
+    <string name="osm_live_payment_subscription_management">Your Google Play account is charged upon purchase of a subscription\nand when it expires (month/three month/year),\nit will not renew itself if canceled before then from your Google Play settings.</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
     <string name="custom_color">Custom color</string>
     <string name="lang_lmo">Lombard</string>
     <string name="lang_an">Aragonese</string>
@@ -45,16 +61,16 @@
     <string name="lang_zhminnan">Southern Min</string>
     <string name="lang_zhyue">Cantonese</string>
     <string name="some_articles_may_not_available_in_lang">Some Wikipedia articles may not be available in your language.</string>
-    <string name="select_wikipedia_article_langs">Select the languages ​​in which Wikipedia articles will appear on the map. You can switch between all available languages ​​while reading the article.</string>
+    <string name="select_wikipedia_article_langs">Select the languages ​​in which Wikipedia articles will appear on the map. You can switch between all available languages​​ while reading the article.</string>
     <string name="wiki_menu_download_descr">Additional maps are needed to view Wikipedia POIs on the map.</string>
     <string name="shared_string_all_languages">All languages</string>
     <string name="shared_string_language">Language</string>
     <string name="shared_string_languages">Languages</string>
     <string name="select_track_file">Select track file</string>
-    <string name="settings_item_import_error">Could not import %1$s.</string>
-    <string name="settings_item_write_error">Could not write %1$s.</string>
-    <string name="settings_item_read_error">Could not read %1$s.</string>
-    <string name="changes_applied_to_profile">Changes applied to %1$s profile.</string>
+    <string name="settings_item_import_error">Could not import from \'%1$s\'.</string>
+    <string name="settings_item_write_error">Could not write to \'%1$s\'.</string>
+    <string name="settings_item_read_error">Could not read from \'%1$s\'.</string>
+    <string name="changes_applied_to_profile">Changes applied to the \'%1$s\' profile.</string>
     <string name="shared_string_items">Items</string>
     <string name="custom_osmand_plugin">Custom OsmAnd plugin</string>
     <string name="app_mode_ski_snowmobile">Snowmobile</string>
@@ -64,9 +80,9 @@
     <string name="move_inside_category">You can move items only inside this category.</string>
     <string name="additional_actions_descr">You can access these actions by tapping the “%1$s” button.</string>
     <string name="main_actions">Main actions</string>
-    <string name="main_actions_descr">Main actions containt only 4 buttons.</string>
-    <string name="reset_items_descr">Settings will be reset to the original state after hiding.</string>
-    <string name="hidden_items_descr">These items are hidden from the menu, but the represented options or plugins will remain working.</string>
+    <string name="main_actions_descr">\'Main actions\' only contains 4 buttons.</string>
+    <string name="reset_items_descr">Hiding settings resets them to their original state.</string>
+    <string name="hidden_items_descr">These items are hidden from the menu, but the represented options or plugins will continue to work.</string>
     <string name="shared_string_hidden">Hidden</string>
     <string name="divider_descr">Elements below this point separated by a divider.</string>
     <string name="shared_string_divider">Divider</string>
@@ -75,7 +91,7 @@
     <string name="shared_string_drawer">Drawer</string>
     <string name="ui_customization">UI Customization</string>
     <string name="ui_customization_short_descr">Drawer items, context menu</string>
-    <string name="ui_customization_description">Customize the quantity of items in Drawer, Configure map and context menu.\n\nYou can disable unused plugins, to hide all its controls from the application %1$s.</string>
+    <string name="ui_customization_description">Customize the quantity of items in Drawer, configure the map and context menu.\n\nYou can turn off unused plugins, to hide all their controls from the app %1$s.</string>
     <string name="shared_string_min">Min</string>
     <string name="shared_string_square">Square</string>
     <string name="shared_string_octagon">Octagon</string>
@@ -100,10 +116,10 @@
     <string name="profile_backup_failed">Could not back up profile.</string>
     <string name="importing_from">Importing data from %1$s</string>
     <string name="shared_string_importing">Importing</string>
-    <string name="checking_for_duplicate_description">OsmAnd check %1$s for duplicates with existing items in the application.\n\nIt may take some time.</string>
+    <string name="checking_for_duplicate_description">OsmAnd check %1$s for duplicates with existing items in the app.\n\nIt may take some time.</string>
     <string name="items_added">Items added</string>
     <string name="shared_string_import_complete">Import complete</string>
-    <string name="import_complete_description">All data from the %1$s is imported, you can use buttons below to open needed part of the application to manage it.</string>
+    <string name="import_complete_description">All data from the %1$s is imported, you can use buttons below to open needed part of the app to manage it.</string>
     <string name="shared_string_hillshade">Hillshade</string>
     <string name="terrain_empty_state_text">Enable to view hillshade or slope map. You can read more about this map types on our site</string>
     <string name="shared_string_legend">Legend</string>
@@ -140,7 +156,7 @@
     <string name="no_recalculation_setting">Disable recalculation</string>
     <string name="open_settings">Open settings</string>
     <string name="plugin_disabled">Plugin disabled</string>
-    <string name="plugin_disabled_descr">This plugin is a separate application, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd.</string>
+    <string name="plugin_disabled_descr">This plugin is a separate app, you will need to remove it separately if you no longer plan to use it.\n\nThe plugin will remain on the device after removing OsmAnd.</string>
     <string name="shared_string_menu">Menu</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="route_recalculation_dist_title">Minimal distance to recalculate route</string>
@@ -183,7 +199,7 @@
     <string name="import_profile_dialog_description">The imported profile contains additional data. Click Import to import only profile data or select additional data to import.</string>
     <string name="export_profile_dialog_description">You can select additional data to export along with the profile.</string>
     <string name="permission_is_required">Permission is required to use this option.</string>
-    <string name="logcat_buffer_descr">Check and share detailed logs of the application</string>
+    <string name="logcat_buffer_descr">Check and share detailed logs of the app</string>
     <string name="file_does_not_contain_routing_rules">No routing rules in \'%1$s\'. Please choose another file.</string>
     <string name="not_support_file_type_with_ext">Select a supported %1$s extension file instead.</string>
     <string name="monitoring_min_speed_descr">This is a low-speed cut-off filter to not record points below a certain speed. This may make recorded tracks look "smoother" when viewed on the map.</string>
@@ -720,7 +736,7 @@
     <string name="osm_live_payment_annual_title">Annually</string>
     <string name="osm_live_payment_month_cost_descr">%1$s / month</string>
     <string name="osm_live_payment_month_cost_descr_ex">%1$.2f %2$s / month</string>
-    <string name="osm_live_payment_discount_descr">Save %1$s.</string>
+    <string name="osm_live_payment_discount_descr">Save %1$s</string>
     <string name="osm_live_payment_current_subscription">Current subscription</string>
     <string name="osm_live_payment_renews_monthly">Renews monthly</string>
     <string name="osm_live_payment_renews_quarterly">Renews quarterly</string>
@@ -3520,7 +3536,7 @@
     <string name="faq_item">FAQ</string>
     <string name="faq_item_description">Frequently asked questions</string>
     <string name="map_viewing_item">Map viewing</string>
-    <string name="search_on_the_map_item">Searching the map</string>
+    <string name="search_on_the_map_item">Searching on the map</string>
     <string name="instalation_troubleshooting_item">Installation and troubleshooting</string>
     <string name="techical_articles_item">Technical articles</string>
     <string name="versions_item">Versions</string>

OsmAnd/res/values/styles.xml

@@ -251,6 +251,7 @@
         <item name="wikivoyage_primary_btn_bg">@drawable/wikivoyage_primary_btn_bg_light</item>
         <item name="purchase_dialog_active_card_bg">@drawable/dialog_active_card_bg_light</item>
         <item name="purchase_dialog_shadow_btn_bg">@drawable/purchase_dialog_shadow_btn_bg_light</item>
+        <item name="purchase_dialog_outline_btn_bg">@drawable/purchase_dialog_outline_btn_bg_light</item>
 
         <item name="bottom_nav_shadow">@drawable/bg_bottom_bar_shadow_with_line_day</item>
 
@@ -517,6 +518,7 @@
         <item name="wikivoyage_primary_btn_bg">@drawable/wikivoyage_primary_btn_bg_dark</item>
         <item name="purchase_dialog_active_card_bg">@drawable/dialog_active_card_bg_dark</item>
         <item name="purchase_dialog_shadow_btn_bg">@drawable/purchase_dialog_shadow_btn_bg_dark</item>
+        <item name="purchase_dialog_outline_btn_bg">@drawable/purchase_dialog_outline_btn_bg_dark</item>
 
         <item name="bottom_nav_shadow">@drawable/bg_bottom_bar_shadow_with_line_night</item>
 

OsmAnd/res/xml/development_settings.xml

@@ -25,6 +25,13 @@
 		android:summaryOn="@string/shared_string_enabled"
 		android:title="@string/safe_mode" />
 
+    <net.osmand.plus.settings.preferences.SwitchPreferenceEx
+        android:key="pt_safe_mode"
+        android:layout="@layout/preference_with_descr_dialog_and_switch"
+        android:summaryOff="@string/shared_string_disabled"
+        android:summaryOn="@string/shared_string_enabled"
+        android:title="Native PT development" />
+
 	<PreferenceCategory
 		android:key="routing"
 		android:layout="@layout/preference_category_with_descr"

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

@@ -14,6 +14,8 @@ import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Build;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import net.osmand.AndroidUtils;
@@ -21,6 +23,7 @@ import net.osmand.IProgress;
 import net.osmand.IndexConstants;
 import net.osmand.PlatformUtil;
 import net.osmand.aidl.OsmandAidlApi;
+import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.map.OsmandRegions;
 import net.osmand.map.OsmandRegions.RegionTranslation;
 import net.osmand.map.WorldRegion;
@@ -481,6 +484,16 @@ public class AppInitializer implements IProgress {
 		});
 	}
 
+	private void readPoiTypesFromMap() {
+		final BinaryMapIndexReader[] currentFile = app.resourceManager.getPoiSearchFiles();
+		for (BinaryMapIndexReader r : currentFile) {
+			try {
+				r.initCategories();
+			} catch (IOException e) {
+				LOG.error("Error while read poi types from map " + e);
+			}
+		}
+	}
 
 	public void onCreateApplication() {
 		// always update application mode to default
@@ -606,7 +619,7 @@ public class AppInitializer implements IProgress {
 		});
 	}
 
-	public static void loadRoutingFiles(final OsmandApplication app, final LoadRoutingFilesCallback callback) {
+	public static void loadRoutingFiles(@NonNull final OsmandApplication app, @Nullable final LoadRoutingFilesCallback callback) {
 		new AsyncTask<Void, Void, Map<String, RoutingConfiguration.Builder>>() {
 
 			@Override
@@ -642,7 +655,9 @@ public class AppInitializer implements IProgress {
 					app.getCustomRoutingConfigs().putAll(customConfigs);
 				}
 				app.avoidSpecificRoads.initRouteObjects(false);
-				callback.onRoutingFilesLoaded();
+				if (callback != null) {
+					callback.onRoutingFilesLoaded();
+				}
 			}
 
 			private Map<String, String> getDefaultAttributes() {
@@ -730,6 +745,7 @@ public class AppInitializer implements IProgress {
 			initPoiTypes();
 			notifyEvent(InitEvents.POI_TYPES_INITIALIZED);
 			app.resourceManager.reloadIndexesOnStart(this, warnings);
+			readPoiTypesFromMap();
 
 			// native depends on renderers
 			initNativeCore();

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

@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -368,7 +369,7 @@ public class CustomOsmandPlugin extends OsmandPlugin {
 
 	public static List<CustomRegion> collectRegionsFromJson(@NonNull Context ctx, JSONArray jsonArray) throws JSONException {
 		List<CustomRegion> customRegions = new ArrayList<>();
-		Map<String, CustomRegion> flatRegions = new HashMap<>();
+		Map<String, CustomRegion> flatRegions = new LinkedHashMap<>();
 		for (int i = 0; i < jsonArray.length(); i++) {
 			JSONObject regionJson = jsonArray.getJSONObject(i);
 			CustomRegion region = CustomRegion.fromJson(ctx, regionJson);
@@ -415,6 +416,18 @@ public class CustomOsmandPlugin extends OsmandPlugin {
 				}
 			}
 		}
+		for (WorldRegion region : customRegions) {
+			loadSubregionIndexItems(region);
+		}
+	}
+
+	private void loadSubregionIndexItems(WorldRegion region) {
+		if (region instanceof CustomRegion) {
+			((CustomRegion) region).loadDynamicIndexItems(app);
+		}
+		for (WorldRegion subregion : region.getSubregions()) {
+			loadSubregionIndexItems(subregion);
+		}
 	}
 
 	public void updateSuggestedDownloads(List<SuggestedDownloadItem> items) {

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

@@ -6,6 +6,8 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import net.osmand.AndroidNetworkUtils;
+import net.osmand.AndroidNetworkUtils.OnRequestResultListener;
 import net.osmand.JsonUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.map.WorldRegion;
@@ -24,11 +26,14 @@ import java.io.File;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 public class CustomRegion extends WorldRegion {
 
+	public static final int INVALID_ID = -1;
+
 	private static final Log LOG = PlatformUtil.getLog(CustomRegion.class);
 
 	private String scopeId;
@@ -38,6 +43,9 @@ public class CustomRegion extends WorldRegion {
 	private String subfolder;
 
 	private JSONArray downloadItemsJson;
+	private JSONArray dynamicItemsJson;
+
+	private DynamicDownloadItems dynamicDownloadItems;
 
 	private DownloadDescriptionInfo descriptionInfo;
 
@@ -45,7 +53,7 @@ public class CustomRegion extends WorldRegion {
 	private Map<String, String> icons = new HashMap<>();
 	private Map<String, String> headers = new HashMap<>();
 
-	private int headerColor = -1;
+	private int headerColor = INVALID_ID;
 
 
 	private CustomRegion(String scopeId, String path, String type) {
@@ -69,6 +77,11 @@ public class CustomRegion extends WorldRegion {
 
 	@ColorInt
 	public int getHeaderColor() {
+		if (headerColor != INVALID_ID) {
+			return headerColor;
+		} else if (superregion instanceof CustomRegion) {
+			return ((CustomRegion) superregion).getHeaderColor();
+		}
 		return headerColor;
 	}
 
@@ -77,6 +90,10 @@ public class CustomRegion extends WorldRegion {
 		return descriptionInfo;
 	}
 
+	public String getIconName(Context ctx) {
+		return JsonUtils.getLocalizedResFromMap(ctx, icons, null);
+	}
+
 	public static CustomRegion fromJson(@NonNull Context ctx, JSONObject object) throws JSONException {
 		String scopeId = object.optString("scope-id", null);
 		String path = object.optString("path", null);
@@ -102,12 +119,18 @@ public class CustomRegion extends WorldRegion {
 		region.headers = JsonUtils.getLocalizedMapFromJson("header", object);
 
 		region.downloadItemsJson = object.optJSONArray("items");
+		region.dynamicItemsJson = object.optJSONArray("dynamic-items");
+
+		JSONObject urlItemsJson = object.optJSONObject("items-url");
+		if (urlItemsJson != null) {
+			region.dynamicDownloadItems = DynamicDownloadItems.fromJson(urlItemsJson);
+		}
 
 		String headerColor = object.optString("header-color", null);
 		try {
-			region.headerColor = Algorithms.isEmpty(headerColor) ? 0 : Algorithms.parseColor(headerColor);
+			region.headerColor = Algorithms.isEmpty(headerColor) ? INVALID_ID : Algorithms.parseColor(headerColor);
 		} catch (IllegalArgumentException e) {
-			region.headerColor = 0;
+			region.headerColor = INVALID_ID;
 		}
 		region.descriptionInfo = DownloadDescriptionInfo.fromJson(object.optJSONObject("description"));
 
@@ -126,20 +149,33 @@ public class CustomRegion extends WorldRegion {
 		JsonUtils.writeLocalizedMapToJson("icon", jsonObject, icons);
 		JsonUtils.writeLocalizedMapToJson("header", jsonObject, headers);
 
+		if (headerColor != INVALID_ID) {
+			jsonObject.putOpt("header-color", Algorithms.colorToString(headerColor));
+		}
 		if (descriptionInfo != null) {
 			jsonObject.putOpt("description", descriptionInfo.toJson());
 		}
 		jsonObject.putOpt("items", downloadItemsJson);
-
+		jsonObject.putOpt("dynamic-items", dynamicItemsJson);
+		if (dynamicDownloadItems != null) {
+			jsonObject.putOpt("items-url", dynamicDownloadItems.toJson());
+		}
 		return jsonObject;
 	}
 
 	public List<IndexItem> loadIndexItems() {
 		List<IndexItem> items = new ArrayList<>();
-		if (downloadItemsJson != null) {
+		items.addAll(loadIndexItems(downloadItemsJson));
+		items.addAll(loadIndexItems(dynamicItemsJson));
+		return items;
+	}
+
+	private List<IndexItem> loadIndexItems(JSONArray itemsJson) {
+		List<IndexItem> items = new ArrayList<>();
+		if (itemsJson != null) {
 			try {
-				for (int i = 0; i < downloadItemsJson.length(); i++) {
-					JSONObject itemJson = downloadItemsJson.getJSONObject(i);
+				for (int i = 0; i < itemsJson.length(); i++) {
+					JSONObject itemJson = itemsJson.getJSONObject(i);
 
 					long timestamp = itemJson.optLong("timestamp") * 1000;
 					long contentSize = itemJson.optLong("contentSize");
@@ -182,4 +218,132 @@ public class CustomRegion extends WorldRegion {
 		}
 		return items;
 	}
+
+	void loadDynamicIndexItems(final OsmandApplication app) {
+		if (dynamicItemsJson == null && dynamicDownloadItems != null
+				&& !Algorithms.isEmpty(dynamicDownloadItems.url)
+				&& app.getSettings().isInternetConnectionAvailable()) {
+			OnRequestResultListener resultListener = new OnRequestResultListener() {
+				@Override
+				public void onResult(String result) {
+					if (!Algorithms.isEmpty(result)) {
+						if ("json".equalsIgnoreCase(dynamicDownloadItems.format)) {
+							dynamicItemsJson = mapJsonItems(result);
+						}
+						app.getDownloadThread().runReloadIndexFilesSilent();
+					}
+				}
+			};
+
+			AndroidNetworkUtils.sendRequestAsync(app, dynamicDownloadItems.getUrl(), null,
+					null, false, false, resultListener);
+		}
+	}
+
+	private JSONArray mapJsonItems(String jsonStr) {
+		try {
+			JSONObject json = new JSONObject(jsonStr);
+			JSONArray jsonArray = json.optJSONArray(dynamicDownloadItems.itemsPath);
+			if (jsonArray != null) {
+				JSONArray itemsJson = new JSONArray();
+				for (int i = 0; i < jsonArray.length(); i++) {
+					JSONObject jsonObject = jsonArray.getJSONObject(i);
+					JSONObject itemJson = mapDynamicJsonItem(jsonObject, dynamicDownloadItems.mapping);
+
+					itemsJson.put(itemJson);
+				}
+				return itemsJson;
+			}
+		} catch (JSONException e) {
+			LOG.error(e);
+		}
+		return null;
+	}
+
+	private JSONObject mapDynamicJsonItem(JSONObject jsonObject, JSONObject mapping) throws JSONException {
+		JSONObject itemJson = new JSONObject();
+		for (Iterator<String> it = mapping.keys(); it.hasNext(); ) {
+			String key = it.next();
+			Object value = checkMappingValue(mapping.opt(key), jsonObject);
+			itemJson.put(key, value);
+		}
+		return itemJson;
+	}
+
+	private Object checkMappingValue(Object value, JSONObject json) throws JSONException {
+		if (value instanceof String) {
+			String key = (String) value;
+			int index = key.indexOf("@");
+			if (index != INVALID_ID) {
+				key = key.substring(index + 1);
+			}
+			return json.opt(key);
+		} else if (value instanceof JSONObject) {
+			JSONObject checkedJsonObject = (JSONObject) value;
+			JSONObject objectJson = new JSONObject();
+
+			for (Iterator<String> iterator = checkedJsonObject.keys(); iterator.hasNext(); ) {
+				String key = iterator.next();
+				Object checkedValue = checkMappingValue(checkedJsonObject.opt(key), json);
+				objectJson.put(key, checkedValue);
+			}
+			return objectJson;
+		} else if (value instanceof JSONArray) {
+			JSONArray checkedJsonArray = new JSONArray();
+			JSONArray jsonArray = (JSONArray) value;
+
+			for (int i = 0; i < jsonArray.length(); i++) {
+				Object checkedValue = checkMappingValue(jsonArray.opt(i), json);
+				checkedJsonArray.put(i, checkedValue);
+			}
+			return checkedJsonArray;
+		}
+		return value;
+	}
+
+	public static class DynamicDownloadItems {
+
+		private String url;
+		private String format;
+		private String itemsPath;
+		private JSONObject mapping;
+
+		public String getUrl() {
+			return url;
+		}
+
+		public String getFormat() {
+			return format;
+		}
+
+		public String getItemsPath() {
+			return itemsPath;
+		}
+
+		public JSONObject getMapping() {
+			return mapping;
+		}
+
+		public static DynamicDownloadItems fromJson(JSONObject object) {
+			DynamicDownloadItems dynamicDownloadItems = new DynamicDownloadItems();
+
+			dynamicDownloadItems.url = object.optString("url", null);
+			dynamicDownloadItems.format = object.optString("format", null);
+			dynamicDownloadItems.itemsPath = object.optString("items-path", null);
+			dynamicDownloadItems.mapping = object.optJSONObject("mapping");
+
+			return dynamicDownloadItems;
+		}
+
+		public JSONObject toJson() throws JSONException {
+			JSONObject jsonObject = new JSONObject();
+
+			jsonObject.putOpt("url", url);
+			jsonObject.putOpt("format", format);
+			jsonObject.putOpt("items-path", itemsPath);
+			jsonObject.putOpt("mapping", mapping);
+
+			return jsonObject;
+		}
+	}
 }

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

@@ -3718,7 +3718,7 @@ public class OsmandSettings {
 
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> SAFE_MODE = new BooleanPreference("safe_mode", false).makeGlobal();
-
+	public final OsmandPreference<Boolean> PT_SAFE_MODE = new BooleanPreference("pt_safe_mode", false).makeGlobal();
 	public final OsmandPreference<Boolean> NATIVE_RENDERING_FAILED = new BooleanPreference("native_rendering_failed_init", false).makeGlobal();
 
 	public final OsmandPreference<Boolean> USE_OPENGL_RENDER = new BooleanPreference("use_opengl_render",

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

@@ -377,7 +377,8 @@ public class UiUtilities {
 		TextView tvMessage = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text);
 		TextView tvAction = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_action);
 		if (messageColor == null) {
-			messageColor = nightMode ? R.color.text_color_primary_dark : R.color.text_color_primary_light;
+			messageColor = nightMode ? R.color.active_buttons_and_links_text_dark
+					: R.color.active_buttons_and_links_text_light;
 		}
 		tvMessage.setTextColor(ContextCompat.getColor(ctx, messageColor));
 		if (actionColor == null) {
@@ -388,7 +389,7 @@ public class UiUtilities {
 			tvMessage.setMaxLines(maxLines);
 		}
 		if (backgroundColor == null) {
-			backgroundColor = nightMode ? R.color.list_background_color_dark : R.color.list_background_color_light;
+			backgroundColor = nightMode ? R.color.list_background_color_dark : R.color.color_black;
 		}
 		view.setBackgroundColor(ContextCompat.getColor(ctx, backgroundColor));
 	}

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

@@ -44,6 +44,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.FavoriteImageDrawable;
 import net.osmand.plus.base.OsmandExpandableListFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
@@ -957,8 +958,14 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 			if (model.isAddressSpecified()) {
 				distanceText.setText(String.format(getString(R.string.ltr_or_rtl_combine_via_comma), distance.trim(), model.getAddress()));
 			}
-			icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(),
-					visible ? model.getColor() : getResources().getColor(disabledIconColor), false, model));
+			if(model.getBackgroundType().equals(FavouritePoint.BackgroundType.CIRCLE)){
+				int color = visible ? model.getColor() : getResources().getColor(disabledIconColor);
+				int col = color == 0 || color == Color.BLACK ? getResources().getColor(R.color.color_favorite) : color;
+				icon.setImageDrawable(UiUtilities.createTintedDrawable(getActivity(),model.getIconId(),col));
+			}else {
+				icon.setImageDrawable(FavoriteImageDrawable.getOrCreate(getActivity(),
+						visible ? model.getColor() : getResources().getColor(disabledIconColor), false, model));
+			}
 			if (visible) {
 				distanceText.setTextColor(getResources().getColor(R.color.color_distance));
 			} else {