Merge branch 'master' of https://github.com/osmandapp/Osmand into import_fixes

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

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

@@ -173,7 +173,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 		return res;
 	}
 
-	private int[][] convertPointNames(int[][] nameTypes, Map<RouteTypeRule, Integer> rules) {
+	private int[][] convertPointNames(int[][] nameTypes, String[][] pointNames, Map<RouteTypeRule, Integer> rules) {
 		if (nameTypes == null || nameTypes.length == 0) {
 			return null;
 		}
@@ -185,7 +185,7 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 				for (int k = 0; k < types.length; k++) {
 					int type = types[k];
 					String tag = object.region.quickGetEncodingRule(type).getTag();
-					String name = object.pointNames[i][k];
+					String name = pointNames[i][k];
 					RouteTypeRule rule = new RouteTypeRule(tag, name);
 					Integer ruleId = rules.get(rule);
 					if (ruleId == null) {
@@ -281,7 +281,8 @@ public class RouteSegmentResult implements StringExternalizable<RouteDataBundle>
 		if (object.pointNameTypes != null && start < object.pointNameTypes.length) {
 			int[][] types = Arrays.copyOfRange(object.pointNameTypes, start, Math.min(end, object.pointNameTypes.length));
 			if (object.pointNames != null) {
-				bundle.putArray("pointNames", convertPointNames(types, rules));
+				String[][] names = Arrays.copyOfRange(object.pointNames, start, Math.min(end, object.pointNames.length));
+				bundle.putArray("pointNames", convertPointNames(types, names, rules));
 			}
 		}
 	}

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

@@ -144,4 +144,9 @@
     <string name="si_km_m">Kilomètres/mètres</string>
     <string name="si_nm">Miles nautiques</string>
     <string name="si_mi_meters">Miles / Mètres</string>
+    <string name="nm_h">nœuds</string>
+    <string name="shared_string_later">Plus tard</string>
+    <string name="shared_string_password">Mot de passe</string>
+    <string name="shared_string_distance">Distance</string>
+    <string name="si_nm_h">Miles nautiques par heure (nœuds)</string>
 </resources>

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

@@ -246,7 +246,7 @@
     <string name="timeline_no_data">Nincs adat</string>
     <string name="shared_string_end">Vég</string>
     <string name="shared_string_start">Kezdet</string>
-    <string name="shared_string_apply">Alkalmazás</string>
+    <string name="shared_string_apply">Alkalmaz</string>
     <string name="set_time_timeline_descr">Megjelenítendő időszak kijelölése</string>
     <string name="start_end_date">Kezdő és záró dátum</string>
     <string name="saved_messages">Mentett üzenetek</string>

OsmAnd/res/drawable/ic_action_context_menu.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,2V19C22,20.6569 20.6569,22 19,22H5C3.3431,22 2,20.6569 2,19V2H4V18H20V2H22Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#727272"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M4,12H20V2H4V12Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M4,12h16v6h-16z"
+      android:fillColor="#727272"/>
+</vector>

OsmAnd/res/drawable/ic_action_drawer.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,22V5C22,3.3431 20.6569,2 19,2H5C3.3431,2 2,3.3431 2,5V22H4V7H20V22H22Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#727272"
+      android:fillAlpha="0.5"/>
+  <path
+      android:pathData="M13,7h7v15h-7z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#727272"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M4,7h9v15h-9z"
+      android:fillColor="#727272"/>
+</vector>

OsmAnd/res/drawable/img_settings_device_top_dark.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="248dp"
+    android:height="200dp"
+    android:viewportWidth="248"
+    android:viewportHeight="200">
+  <path
+      android:pathData="M0,200H248V24C248,10.745 237.255,0 224,0H24C10.745,0 0,10.745 0,24V200Z"
+      android:fillColor="#232324"/>
+  <path
+      android:pathData="M245,24C245,12.402 235.598,3 224,3H24C12.402,3 3,12.402 3,24V200H0V24C0,10.745 10.745,0 24,0H224C237.255,0 248,10.745 248,24V200H245V24Z"
+      android:fillColor="#2D2D2E"/>
+</vector>

OsmAnd/res/drawable/img_settings_device_top_light.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="248dp"
+    android:height="200dp"
+    android:viewportWidth="248"
+    android:viewportHeight="200">
+  <path
+      android:pathData="M0,200H248V24C248,10.745 237.255,0 224,0H24C10.745,0 0,10.745 0,24V200Z"
+      android:fillColor="#E1DFE6"/>
+  <path
+      android:pathData="M245,24C245,12.402 235.598,3 224,3H24C12.402,3 3,12.402 3,24V200H0V24C0,10.745 10.745,0 24,0H224C237.255,0 248,10.745 248,24V200H245V24Z"
+      android:fillColor="#D5D2D9"/>
+</vector>

OsmAnd/res/layout/point_editor_fragment_new.xml

@@ -449,9 +449,9 @@
 							android:layout_height="wrap_content"
 							android:ellipsize="end"
 							android:lines="1"
-							android:text="@string/update_existing"
+							android:text="@string/replace_point_descr"
 							android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
-							tools:text="@string/update_existing" />
+							tools:text="@string/replace_point_descr" />
 
 					</LinearLayout>
 

OsmAnd/res/values-ar/strings.xml

@@ -3018,7 +3018,7 @@
     <string name="change_osmand_data_folder_question">تغيير مجلد البيانات ؟</string>
     <string name="move_maps_to_new_destination">نقل للموقع الجديد</string>
     <string name="avoid_in_routing_descr_">تجنب بعض الطرق، أو بعض أنواع الطرق</string>
-    <string name="app_mode_utv">جنباً إلى جنب</string>
+    <string name="app_mode_utv">جنبًا إلى جنب</string>
     <string name="rendering_attr_piste_difficulty_aerialway_name">طريق تلفريك</string>
     <string name="rendering_attr_piste_difficulty_connection_name">اتصال</string>
     <string name="shared_string_calculate">حساب</string>
@@ -3103,14 +3103,14 @@
     <string name="shared_string_open_track">مسار مفتوح</string>
     <string name="shared_string_track_is_saved">المسار %s تم حفظ</string>
     <string name="gpx_join_gaps">ربط الأجزاء</string>
-    <string name="app_mode_camper">العربة</string>
+    <string name="app_mode_camper">العربه</string>
     <string name="app_mode_campervan">عربة التخييم</string>
     <string name="rendering_attr_showLez_description">إظهار مناطق الانبعاثات المنخفضة علي الخريطة. لا يؤثر علي التوجيه.</string>
     <string name="rendering_attr_showLez_name">إظهار مناطق الانبعاثات المنخفضة</string>
     <string name="temporary_conditional_routing">النظر في القيود المؤقتة</string>
     <string name="shared_string_default">افتراضي</string>
-    <string name="app_mode_wagon">عربة</string>
-    <string name="app_mode_pickup_truck">شاحنة بيك أب</string>
+    <string name="app_mode_wagon">عربه</string>
+    <string name="app_mode_pickup_truck">شاحنه</string>
     <string name="cancel_subscription">إلغاء الاشتراك</string>
     <string name="configure_profile_info">إعدادات الوضع :</string>
     <string name="utm_format_descr">يستخدم أوسماند تنسيق UTM وهو مشابه ولكن غير مطابق لتنسيق UTM الناتو.</string>
@@ -3214,12 +3214,12 @@
 \n• إصلاحات أخرى في الأخطاء
 \n
 \n</string>
-    <string name="app_mode_personal_transporter">الناقل الشخصي</string>
+    <string name="app_mode_personal_transporter">ناقل شخصي</string>
     <string name="app_mode_monowheel">عجلة آحادية</string>
     <string name="app_mode_scooter">سكوتر</string>
     <string name="precision_hdop_and_vdop">الدقة الأفقية: %1$s, عمودي: %2$s</string>
     <string name="precision_hdop">الدقة الأفقية: %s</string>
-    <string name="app_mode_offroad">خارج المسار</string>
+    <string name="app_mode_offroad">الطرق الوعره</string>
     <string name="edit_profile_setup_title">إعداد الوضع</string>
     <string name="edit_profile_setup_subtitle">يحتفظ الوضع بإعداداتك</string>
     <string name="edit_profile_setup_map_subtitle">حدد خيارات الخريطة للملف الشخصي</string>
@@ -3273,7 +3273,7 @@
     <string name="nav_type_hint">نوع الملاحة</string>
     <string name="app_mode_taxi">سيارة أجرة</string>
     <string name="app_mode_shuttle_bus">نقل داخلي</string>
-    <string name="app_mode_subway">مترو الأنفاق</string>
+    <string name="app_mode_subway">مترو انفاق</string>
     <string name="app_mode_horse">حصان</string>
     <string name="app_mode_helicopter">هليكوبتر</string>
     <string name="osmand_routing_promo">يمكنك إضافة نسختك المعدلة من الملف routing.xml في ..أوسماند/routing</string>
@@ -3404,7 +3404,7 @@
     <string name="login_and_pass">اسم المستخدم و كلمة السر</string>
     <string name="plugin_global_prefs_info">إعدادات المكون الإضافي هذه شاملة، وتنطبق على جميع الأوضاع.</string>
     <string name="osm_editing">تعديل OpenStreetMap</string>
-    <string name="app_mode_osm">OSM</string>
+    <string name="app_mode_osm">Osm</string>
     <string name="select_nav_icon_descr">سترى الأيقونة فقط أثناء الملاحة أو أثناء التحرك.</string>
     <string name="button_rate">قيم</string>
     <string name="select_map_icon_descr">تظهر أيقونة الخريطة فقط على الخريطة ، وتتغير أثناء التنقل إلى أيقونة التنقل.</string>
@@ -3568,4 +3568,9 @@
     <string name="hillshade_description">خريطة التضاريس تستخدم ظلال داكنة لإظهار المنحدرات والقمم والأراضي المنخفضة.</string>
     <string name="shared_string_terrain">التضاريس</string>
     <string name="n_items_of_z">%1$s من %2$s</string>
+    <string name="shared_string_octagon">مثمن</string>
+    <string name="shared_string_min">الحد الأدنى</string>
+    <string name="app_mode_ski_touring">جولة التزلج</string>
+    <string name="app_mode_ski_snowmobile">الثلج</string>
+    <string name="custom_osmand_plugin">مخصص البرنامج المساعد أوسماند</string>
 </resources>

OsmAnd/res/values-ca/strings.xml

@@ -18,7 +18,7 @@
     <string name="starting_point_too_far">El punt de sortida massa lluny de la carretera més propera.</string>
     <string name="osmand_parking_time_limit_title">Indica el temps límit d\'aparcament</string>
     <string name="osmand_parking_choose_type">Trieu el tipus de pàrquing</string>
-    <string name="avoid_unpaved">Evita les carreteres no pavimentades</string>
+    <string name="avoid_unpaved">Només vies pavimentades</string>
     <string name="avoid_in_routing_title">Evita…</string>
     <string name="int_continuosly">Sense interrupció</string>
     <string name="map_widget_config">Configura la pantalla</string>
@@ -176,7 +176,8 @@
     <string name="user_name">El vostre nom d\'usuari d\'OSM</string>
     <string name="user_password">La vostra contrasenya a OSM</string>
     <string name="download_files_not_enough_space">No hi ha prou espai lliure per baixar %1$s MB (lliure: %2$s).</string>
-    <string name="download_files_question_space">"Voleu baixar {0} fitxer(s)\? S\'ocuparà  {1} MB (de {2} MB)."</string>
+    <string name="download_files_question_space">"Voleu baixar {0} fitxer(s)\? 
+\nS\'ocuparà  {1} MB (de {2} MB)."</string>
     <string name="use_transparent_map_theme">Tema transparent</string>
     <string name="osmand_parking_event">Traieu el cotxe de l\'aparcament</string>
     <string name="rendering_attr_appMode_description">Optimitza el mapa per</string>
@@ -188,7 +189,7 @@
     <string name="local_openstreetmap_settings_descr">Mostra i gestiona els PDI/notes d\'OSM anotats a la base de dades del dispositiu.</string>
     <string name="day_night_info">Informació de dia/nit</string>
     <string name="show_lanes">Carrils</string>
-    <string name="avoid_ferries">Evita els ferris</string>
+    <string name="avoid_ferries">Sense ferris</string>
     <string name="osmand_parking_warning_text">S\'ha afegit una notificació a la vostra agenda perquè traieu el vostre cotxe que es pot editar o treure allà mateix.</string>
     <string name="route_kl">Mantingueu-vos a l\'esquerra i continueu</string>
     <string name="route_kr">Mantingueu-vos a la dreta i continueu</string>
@@ -419,7 +420,7 @@
     <string name="search_address_street">Carrer</string>
     <string name="app_mode_car">Cotxe</string>
     <string name="app_mode_bicycle">Bicicleta</string>
-    <string name="app_mode_pedestrian">Vianant</string>
+    <string name="app_mode_pedestrian">A peu</string>
     <string name="search_button">Cerca</string>
     <string name="search_activity">Cerca</string>
     <string name="shared_string_exit">Surt</string>
@@ -514,7 +515,7 @@
     <string name="map_view_3d_descr">Activeu la visualització en 3D del mapa.</string>
     <string name="show_gps_coordinates_text">Mostra les coordenades de GPS al mapa</string>
     <string name="position_on_map_center">Centre</string>
-    <string name="app_mode_default">Per defecte</string>
+    <string name="app_mode_default">Mapa esquemàtic</string>
     <string name="navigate_point_latitude">Latitud</string>
     <string name="navigate_point_longitude">Longitud</string>
     <string name="search_address_region">Regió</string>
@@ -627,7 +628,7 @@
     <string name="poi_remove_title">Elimina el PDI</string>
     <string name="poi_create_title">Crea un PDI</string>
     <string name="first_time_msg">"Gràcies per utilitzar l\'OsmAnd. Baixeu informació regional fora de línia a través de \'Configuració\' → \'Gestió de fitxers de mapes\' per veure mapes, situar adreces, buscar els PDIs,  trobar transports públics i més."</string>
-    <string name="basemap_was_selected_to_download">El mapa base està seleccionat per baixar-se per les funcions de l\'aplicació.</string>
+    <string name="basemap_was_selected_to_download">El mapa mundial de fons necessari per les funcionalitats bàsiques està a la cua de baixades.</string>
     <string name="osmand_background_plugin_description">Mostra paràmetres per activar el seguiment i la navegació en procés de fons mitjançant l\'activació periòdica del dispositiu GPS (amb la pantalla apagada).</string>
     <string name="accessibility_preferences_descr">Preferències relatives a l\'accessibilitat.</string>
     <string name="trace_rendering_descr">Mostra el rendiment de la renderització.</string>
@@ -700,11 +701,11 @@
     <string name="opening_hours_not_supported">El format d\'horaris d\'obertura no es pot modificar</string>
     <string name="transport_to_go_after">prioritza distancia</string>
     <string name="hello">Aplicació de navegació OsmAnd</string>
-    <string name="osmand_rastermaps_plugin_description">"Access a diferents tipus de mapa (anomenats de tessel·les o de bits), des de les tessel·les predefinides d\'OSM (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc. 
+    <string name="osmand_rastermaps_plugin_description">Accediu a diferents tipus de mapa (anomenats de tessel·les o de bits), des de les tessel·les predefinides d\'OSM (com Mapnik) a imatges de satèl·lit i capes específiques com mapes meteorològics, climàtics, geològics, de relleu, etc.
 \n
-\nQualsevol d\'aquests mapes es pot utilitzar sigui per veure\'s com principal (base) o com una superposició o sots-posició d\'un altre mapa base (com els mapes  d\'OsmAnd habituals en local). Es pot amagar determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» per fer més visible el mapa de fons. 
+\nQualsevol d\'aquests mapes es pot utilitzar, sigui per veure\'s com principal (base) o com una superposició o sots-posició d\'un altre mapa base (com els mapes d\'OsmAnd habituals en local). Es pot amagar determinats elements dels mapes vectorials de l\'OsmAnd via el menú «Configuració del mapa» per fer més visible el mapa de fons.
 \n
-\nBaixeu mapes de tessel·les directament de proveïdors en línia, o  de preparats per un ús en local (copiats manualment al directori de l\'OsmAnd) així com una base de dades SQLite construïda per diferents eines de tercers de preparació de mapes."</string>
+\nBaixeu mapes de tessel·les directament de proveïdors en línia o ja preparats per un ús local (copiats manualment al directori de l\'OsmAnd) així com una base de dades SQLite construïda per diferents eines de preparació de mapes de tercers.</string>
     <string name="choose_audio_stream_descr">Escolliu la sortida d\'àudio pel guiat per veu.</string>
     <string name="renderers">Renderització vectorial</string>
     <string name="add_tag">Afegeix una etiqueta</string>
@@ -1115,7 +1116,7 @@
     <string name="off_router_service_no_gps_available">El servei de navegació en segon pla necessita tenir un sistema d\'ubicació activat.</string>
     <string name="background_service_provider_descr">Trieu el sistema d\'ubicació que utilitzarà el servei en segon pla.</string>
     <string name="select_gpx">Selecciona una traça GPX…</string>
-    <string name="route_descr_select_destination">Selecciona un destí</string>
+    <string name="route_descr_select_destination">Establiu un destí</string>
     <string name="shared_string_select_on_map">Selecciona al mapa</string>
     <string name="shared_string_favorite">Preferida</string>
     <string name="route_preferences">Preferències de ruta</string>
@@ -1234,14 +1235,14 @@
     <string name="gpx_selection_points">%1$s \nPunts</string>
     <string name="gpx_selection_track">%1$s \nTraça %2$s</string>
     <string name="save_as_favorites_points">Guarda com un grup de Preferits</string>
-    <string name="select_destination_and_intermediate_points">Seleccioneu destinacions</string>
+    <string name="select_destination_and_intermediate_points">Establiu destinacions</string>
     <string name="layer_amenity_label">Etiquetes superposades de PDIs</string>
     <string name="show_zoom_buttons_navigation_descr">Mostra els botons de zoom durant la navegació.</string>
     <string name="show_zoom_buttons_navigation">Mostra els botons de zoom</string>
     <string name="sort_by_distance">Ordena per distància</string>
     <string name="sort_by_name">Ordena per nom</string>
-    <string name="none_selected_gpx">Cap fitxer GPX seleccionat. Seleccioneu-ne un prement-lo contínuament.</string>
-    <string name="local_index_select_gpx_file">Selecciona per mostrar</string>
+    <string name="none_selected_gpx">Seleccioneu un fitxer GPX prement-lo prolongadament.</string>
+    <string name="local_index_select_gpx_file">Seleccioneu una traça</string>
     <string name="no_index_file_to_download">No s\'ha trobat cap baixada, verifiqueu la vostra connexió a Internet.</string>
     <string name="rendering_attr_hideBuildings_name">Edificis</string>
     <string name="rendering_attr_hideNonVehicleHighways_name">Vies sense circulació de vehicles</string>
@@ -1262,7 +1263,7 @@
     <string name="lang_he">Hebreu</string>
     <string name="forward">Endavant</string>
     <string name="home">Tauler</string>
-    <string name="live_monitoring_m_descr">Envia el registre de la traça a un servei web específic si s\'ha activat la gravació en un GPX.</string>
+    <string name="live_monitoring_m_descr">Envia les dades de la traça a un servei web específic si està activat l\'enregistrament de GPX.</string>
     <string name="live_monitoring_m">Registre de traça en línia (cal GPX)</string>
     <string name="live_monitoring_start">Inicia un registre de traça en línia</string>
     <string name="live_monitoring_stop">Atura el registre de traça en línia</string>
@@ -1331,9 +1332,9 @@
     <string name="local_index_description">Premeu qualsevol indicació existent per veure més detalls, premeu contínuament per desactivar o esborrar. Dades actuals al dispositiu (%1$s lliure):</string>
     <string name="text_size_descr">Definiu la mida del text en el mapa.</string>
     <string name="text_size">Mida del text</string>
-    <string name="fav_point_dublicate">Nom de punt preferit duplicat</string>
-    <string name="fav_point_dublicate_message">El nom indicat del Preferit ja es fa servir, s\'ha canviat a %1$s per evitar duplicitats.</string>
-    <string name="fav_point_emoticons_message">El nom del Preferit s\'ha canviat a %1$s per facilitar el desar bé la cadena amb emoticones en un fitxer.</string>
+    <string name="fav_point_dublicate">S\'ha indicat un nom de Preferit duplicat</string>
+    <string name="fav_point_dublicate_message">El nom del Preferit s\'ha canviat a %1$s per evitar duplicitats.</string>
+    <string name="fav_point_emoticons_message">El nom del Preferit s\'ha canviat a \'%1$s\' per desar el text que inclou emoticones en un fitxer.</string>
     <string name="print_route">Imprimeix la ruta</string>
     <string name="speed_limit_exceed">Tolerància sobre el límit de velocitat</string>
     <string name="speed_limit_exceed_message">Trieu el marge de tolerància al límit de velocitat per sobre del que rebreu un avís de veu.</string>
@@ -1428,8 +1429,8 @@
     <string name="plugin_install_needs_network">Per instal·lar aquest connector us cal una connexió a internet.</string>
     <string name="plugin_ski_name">Vista mapa d\'esquí</string>
     <string name="plugin_nautical_name">Vista cartes marines</string>
-    <string name="world_ski_missing">Per veure les pistes d\'esquí cal que baixeu un mapa específic</string>
-    <string name="nautical_maps_missing">Per accedir a cartes marines cal que baixeu un mapa específic</string>
+    <string name="world_ski_missing">Baixeu el mapa local específic per veure les instal·lacions d\'esquí.</string>
+    <string name="nautical_maps_missing">Baixeu un mapa local específic per veure les dades nàutiques.</string>
     <string name="shared_string_enable">Activa</string>
     <string name="shared_string_disable">Desactiva</string>
     <string name="rendering_attr_pisteGrooming_name">Pista condicionada</string>
@@ -1457,7 +1458,7 @@
 \nNo cal baixar un mapa específic, aquesta vista es crea amb els nostres mapes estàndards. 
 \n 
 \nAquesta vista es pot desfer tornant a fer la mateixa selecció, o en canviar l\'«Estil del mapa» de «Configuració del mapa» a la vista que es desitgi.</string>
-    <string name="local_osm_changes_upload_all_confirm">"Esteu segur que voleu pujar %1$d canvi(s)  a OSM\?"</string>
+    <string name="local_osm_changes_upload_all_confirm">Esteu segur que voleu pujar %1$d canvi(s) a OSM\?</string>
     <string name="confirmation_to_clear_history">Voleu esborrar l\'historial?</string>
     <string name="delay_to_start_navigation_descr">Indiqueu el temps màxim d\'espera en la pantalla de planificació de la ruta.</string>
     <string name="delay_to_start_navigation">Inicia el guiatge gir a gir després de…</string>
@@ -1813,8 +1814,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="route_distance">Distància:</string>
     <string name="route_duration">Durada:</string>
     <string name="missing_write_external_storage_permission">OsmAnd no té autorització per utilitzar la tarja de memòria</string>
-    <string name="no_location_permission">L\'aplicació no tenia autorització per utilitzar les dades d\'ubicació.</string>
-    <string name="no_camera_permission">L\'aplicació no tenia autorització per utilitzar la càmera.</string>
+    <string name="no_location_permission">Autorització per accedir a les dades d\'ubicació.</string>
+    <string name="no_camera_permission">Autorització per utilitzar la càmera.</string>
     <string name="no_microphone_permission">Autoritzeu accedir al micròfon.</string>
     <string name="impassable_road_desc">Indiqueu les vies que voleu evitar en la navegació.</string>
     <string name="shared_string_sound">So</string>
@@ -1881,8 +1882,11 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="osm_live_enter_user_name">Introduïu un nom públic</string>
     <string name="osm_live_subscription_settings">Configuració de la subscripció</string>
     <string name="upload_anonymously">Puja anònimament</string>
-    <string name="download_files_error_not_enough_space">No hi ha prou espai! Calen {3} MB temporalment i {1} MB de permanents. (Només es disposa de {2} MB).</string>
-    <string name="download_files_question_space_with_temp">Voleu baixar {0} fitxer(s)\? S\'utilitzen {3} MB temporalment i {1} MB permanentment. (De {2} MB).</string>
+    <string name="download_files_error_not_enough_space">No hi ha prou espai! 
+\nCalen {3} MB temporalment i {1} MB de permanents. 
+\n(Només es disposa de {2} MB).</string>
+    <string name="download_files_question_space_with_temp">Voleu baixar {0} fitxer(s)\? 
+\nS\'utilitzen {3} MB temporalment i {1} MB permanentment. (De {2} MB).</string>
     <string name="shared_string_move_up">Puja ↑</string>
     <string name="shared_string_move_down">Baixa ↓</string>
     <string name="avoid_road">Evita la via</string>
@@ -1896,10 +1900,10 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="rendering_value_bold_name">Negreta</string>
     <string name="finish_navigation">Atura la navegació</string>
     <string name="full_report">Informe complert</string>
-    <string name="open_street_map_login_and_pass">Nom d\'usuari i contrasenya d\'OpenStreetMap</string>
+    <string name="open_street_map_login_and_pass">Nom d\'usuari i contrasenya d\'OSM</string>
     <string name="osm_live_subscribe_btn">Subscriviu</string>
     <string name="osm_live_subscription">Subscripció a OsmAnd Live</string>
-    <string name="osm_live_email_desc">Cal proporcionar-vos informació respecte les aportacions.</string>
+    <string name="osm_live_email_desc">Cal per atribuir-vos les vostres aportacions.</string>
     <string name="osm_live_support_region">Zona de suport</string>
     <string name="osm_live_thanks">Us agraïm el vostre recolçament a OsmAnd
 \nPer activar totes les noves funcionalitats us caldrà reiniciar OsmAnd.</string>
@@ -1922,7 +1926,9 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="map_marker">Marcador de mapa</string>
     <string name="file_name_containes_illegal_char">El nom de fitxer inclou un caràcter il·legal</string>
     <string name="no_map_markers_found">Afegiu els marcadors de mapa amb el mapa</string>
-    <string name="osm_live_header">"Aquesta subscripció permet actualitzacions horàries de tots els mapes del món. Part dels ingressos es retornen a la comunitat OSM en retribuir cada contribució OSM. Si aprecieu OsmAnd  i OSM i els voleu recolzar mentre l\'utilitzeu, aquesta és la via perfecta per fer-ho."</string>
+    <string name="osm_live_header">"Aquesta subscripció permet actualitzacions horàries de tots els mapes del món.
+\nPart dels ingressos es retornen a la comunitat OSM en retribuir cada contribució OSM. 
+\nSi aprecieu OsmAnd  i OSM i els voleu recolzar mentre l\'utilitzeu, aquesta és la via perfecta per fer-ho."</string>
     <string name="upload_osm_note_description">Pugeu la vostra nota OSM anònimament o utilitzant el vostre perfil OpenStreetMap.org.</string>
     <string name="add_time_span">Afegeix un lapse de temps</string>
     <string name="rec_split">Divisió d\'enregistrament</string>
@@ -2301,13 +2307,13 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="download_depth_countours">Isòbates</string>
     <string name="nautical_maps">Cartes nàutiques</string>
     <string name="quick_action_auto_zoom">Escala automàtica del mapa activa/desactiva</string>
-    <string name="quick_action_auto_zoom_desc">Prement aquest botó d\'acció commuteu l\'escala automàtica del mapa segons la vostra velocitat.</string>
+    <string name="quick_action_auto_zoom_desc">Botó per commutar l\'activació del zoom automàtic segons la velocitat.</string>
     <string name="quick_action_auto_zoom_on">Activa l\'escala automàtica</string>
     <string name="quick_action_auto_zoom_off">Desactiva l\'escala automàtica</string>
     <string name="quick_action_add_destination">Establiu destinació</string>
     <string name="quick_action_replace_destination">Substitueix destinació</string>
     <string name="quick_action_add_first_intermediate">Afegeix primer intermedi</string>
-    <string name="quick_action_add_destination_desc">Un botó per establir el punt central de la pantalla com la nova destinació i qualsevol destinació anterior esdevé la darrera destinació intermèdia.</string>
+    <string name="quick_action_add_destination_desc">Un botó per establir el punt central de la pantalla com la nova destinació i que la destinació anterior esdevingui la darrera fita.</string>
     <string name="quick_action_replace_destination_desc">Un botó per fer del punt central de la pantalla la nova destinació, substituint la destinació anterior (si n\'hi hagués).</string>
     <string name="quick_action_add_first_intermediate_desc">Un botó per fer del punt central de la pantalla la primera fita.</string>
     <string name="depth_contour_descr">Isòbates i fondàries nàutiques puntuals.</string>
@@ -2384,15 +2390,15 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="display_zoom_level">Nivell d\'escala de visualització: %1$s</string>
     <string name="route_is_too_long_v2">En rutes llargues: Afegiu fites intermèdies si no es troba cap resultat en 10 minuts.</string>
     <string name="srtm_color_scheme">Combinació de colors</string>
-    <string name="show_from_zoom_level">Mostra segons el nivell d\'escala</string>
+    <string name="show_from_zoom_level">Mostra començant pel nivell d\'escala</string>
     <string name="routing_attr_allow_private_name">Permet l\'accés privat</string>
     <string name="routing_attr_allow_private_description">Permet l\'accés a zones privades.</string>
     <string name="hillshade_menu_download_descr">Baixeu el mapa \'Ombrejat de relleu\' per veure ombrejat segons alçada.</string>
-    <string name="hillshade_purchase_header">Per veure ombrejat de relleu en el mapa us cal comprar i Instal·lar el connector \'Corbes de nivell\'</string>
+    <string name="hillshade_purchase_header">Instal·leu el connector \'Corbes de nivell\' per veure àrees graduades verticalment.</string>
     <string name="shared_string_plugin">Connector</string>
     <string name="srtm_purchase_header">Compreu i instal·leu el connector \'Corbes de nivell\' per visualitzar una gradació vertical d\'àrees.</string>
     <string name="srtm_menu_download_descr">Baixeu el mapa \'Corbes de nivell\' per utilitzar-les en aquesta zona.</string>
-    <string name="hide_from_zoom_level">Amaga segons el nivell d\'escala</string>
+    <string name="hide_from_zoom_level">Amaga començant pel nivell d\'escala</string>
     <string name="quick_action_showhide_osmbugs_title">Mostra o amaga notes OSM</string>
     <string name="quick_action_osmbugs_show">Mostra notes OSM</string>
     <string name="quick_action_osmbugs_hide">Amaga notes OSM</string>
@@ -3407,7 +3413,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="choose_icon_color_name">Icona, color i nom</string>
     <string name="reorder_profiles">Edita la llista de perfils</string>
     <string name="selected_profile">Perfil seleccionat</string>
-    <string name="quick_action_directions_from_desc">Un botó per establir el punt central de la pantalla com el punt de sortida i calcular la ruta vers la destinació o obrir una petició per seleccionar-la si no hi ha un marcador de destinació al mapa.</string>
+    <string name="quick_action_directions_from_desc">Un botó per establir el punt central de la pantalla com el punt de sortida. Llavors, demanarà seleccionar-la destinació o iniciar el càlcul de la ruta.</string>
     <string name="logcat_buffer">Memòria intermèdia del Logcat</string>
     <string name="reset_confirmation_descr">Prement %1$s es perdran tots els vostres canvis.</string>
     <string name="reset_all_profile_settings_descr">Restableix tota la configuració del perfil als valors predeterminats de la instal·lació.</string>
@@ -3571,4 +3577,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Recomanació: no és fàcil preveure què s\'enregistrarà i què no; podria ser millor desactivar aquest filtre.</string>
     <string name="terrain_slider_description">Definiu els nivells de zoom mínim i màxim entre els quals es visualitzarà la capa.</string>
     <string name="shared_string_terrain">Terreny</string>
+    <string name="shared_string_octagon">Octàgon</string>
+    <string name="shared_string_min">Mín.</string>
+    <string name="sort_by_category">Ordena per categoria</string>
+    <string name="hillshade_description">Mapa d\'ombrejat de relleu que representa amb ombres els pendents, cims i planícies.</string>
+    <string name="slope_download_description">Calen mapes addicionals per veure les pistes en el mapa.</string>
+    <string name="slope_read_more">Teniu més informació sobre les pistes a %1$s.</string>
+    <string name="terrain_empty_state_text">Activeu la visió de l\'ombrejat de relleu o del mapa de pistes. Us podeu informar d\'aquests tipus de mapa a la nostra web</string>
+    <string name="app_mode_ski_touring">Esquí de ruta</string>
+    <string name="app_mode_ski_snowmobile">Moto de neu</string>
+    <string name="slope_description">Les pistes es mostren sobre el terreny i amb colors.</string>
+    <string name="download_slope_maps">Pistes</string>
+    <string name="custom_osmand_plugin">Connector d\'OsmAnd adaptat</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3547,4 +3547,43 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="shared_string_rhomb">Rhombe</string>
     <string name="shared_string_square">Firkant</string>
     <string name="shared_string_min">Min</string>
-</resources>
+    <string name="use_system_screen_timeout_promo">Deaktiveret som standard, hvis programmet kører i forgrunden, slukkes skærmen ikke.
+\n 
+\nAktivér for at bruge systemopsætning til at slukke for skærmen.</string>
+    <string name="shared_string_octagon">Oktagon</string>
+    <string name="multimedia_photo_play_sound">Kameraets lukkelyd</string>
+    <string name="live_monitoring_adress_descr">Angiv webadressen med parametersyntaks: lat={0}, lon={1}, tidspunkt={2}, hdop={3}, højde={4}, hastighed={5}, kurs={6}.</string>
+    <string name="monitoring_min_distance_descr_recommendation">Anbefaling: En indstilling på 5-meter kan fungere godt, hvis der ikke er behov for at opfange finere detaljer, og der ikke ønskes eksplicit at optage data mens i hvile.</string>
+    <string name="monitoring_min_distance_descr_side_effect">Bivirkninger: Perioder i hvile registreres slet ikke eller kun ved et punkt hver. Små (virkelige) bevægelser (f.eks. sidelæns for at markere en mulig afkørsel på turen) kan blive filtreret ud. Filen indeholder mindre information til efterbehandling og har dårligere statistik ved at frafiltrere åbenlyse overflødige punkter på optagelsestidspunktet, mens potentielt beholder artefakter forårsaget af dårlig modtagelse eller GPS-chipset-effekter.</string>
+    <string name="monitoring_min_distance_descr">Filteret forhindrer, at der registreres dobbeltpunkter, hvor der muligvis er for lidt faktisk bevægelse. Det giver et pænere rumligt udseende af spor, der ikke efterbehandles senere.</string>
+    <string name="monitoring_min_accuracy_descr_remark">Bemærk: Hvis GPS\'en har været slukket umiddelbart før en optagelse, kan det første målte punkt have en reduceret nøjagtighed, så i koden skal der måske ventes et sekund, inden der optages et punkt (eller det bedste af 3 på hinanden følgende punkter osv.). Men det er endnu ikke implementeret.</string>
+    <string name="monitoring_min_accuracy_descr_recommendation">Anbefaling: Det er svært at forudsige, hvad der vil blive optaget og hvad ikke, det kan derfor være bedst at slå filteret fra.</string>
+    <string name="monitoring_min_accuracy_descr_side_effect">Bivirkning: Som et resultat af filtrering efter nøjagtighed kan der muligvis helt mangle punkter f.eks. under broer, under træer, mellem høje bygninger eller under visse vejrforhold.</string>
+    <string name="monitoring_min_accuracy_descr">Kun punkter, der måles i henhold til minimum nøjagtighedsspecifikationerne (i meter/fod som leveret af Android, afhængigt af chipset), registreres. Nøjagtighed henviser til spredningen af gentagne målinger og er ikke direkte relateret til den nøjagtighed, der bestemmer, hvor tæt målinger og ægte position er til hinanden.</string>
+    <string name="monitoring_min_speed_descr_remark">Bemærk: Hastighed &gt; 0 kontrol: De fleste GPS-chipsæt giver kun en hastighedsværdi, hvis algoritmen bestemmer, at der er bevægelse, og ingen, hvis der ikke er bevægelse. Brug af indstillingen &gt; 0 i dette filter bruger derfor en vis grad bevægelsesdetektering fra GPS-chipset. Men selvom de ikke filtreres på optagelsestidspunktet, bruges denne funktion i GPX-analysen til at bestemme den korrigerede afstand, det vil sige, at værdien, der vises i feltet, er afstanden, der er registreret under bevægelsen.</string>
+    <string name="monitoring_min_speed_descr_recommendation">Anbefaling: Forsøg først at bruge bevægelsesdetektering via filteret til minimum afstandsmåling (B). Dette kan føre til bedre resultater, og der vil mistes færre data. Hvis sporene forbliver unøjagtige ved lave hastigheder, så prøv værdier, der ikke er nul her. Bemærk, at nogle målinger (nogle netværksbaserede metoder) muligvis ikke viser nogen hastighedsværdier overhovedet. I dette tilfælde registreres intet.</string>
+    <string name="monitoring_min_speed_descr_side_effect">Bivirkning: Spor vil mangle alle sektioner, hvor minimumshastighedskriteriet ikke var opfyldt (f.eks. hvor cyklen skubbes op ad en stejl bakke). Der vil heller ikke være nogen oplysninger om hvileperioder, som pauser. Har indvirkning på alle analyser eller efterbehandlinger, som når det forsøges at bestemme den samlede længde af rejsen, tid i bevægelse, eller den gennemsnitlige hastighed.</string>
+    <string name="import_profile_dialog_description">Den importerede profil indeholder yderligere data. Klik på Importer for kun at importere profildata, eller vælg yderligere data, der skal importeres.</string>
+    <string name="route_recalculation_dist_descr">Ruten vil blive genberegnet, hvis afstanden til ruten er længere end angivet parameter</string>
+    <string name="route_recalculation_dist_title">Mindste afstand for at genberegne ruten</string>
+    <string name="import_duplicates_description">OsmAnd allerede har elementer med de samme navne, som dem, der importeres.
+\n
+\nVælg en aktion.</string>
+    <string name="listed_exist">Det angivne %1$s findes allerede.</string>
+    <string name="recalc_angle_dialog_title">Mindste vinkel mellem min placering og rute</string>
+    <string name="recalc_angle_dialog_descr">Ekstra lige segment mellem min placering og den beregnede rute vises, indtil ruten genberegnes</string>
+    <string name="shared_string_terrain">Terræn</string>
+    <string name="hillshade_description">Reliefskyggekort viser hjælp af mørke nuancer skråninger, toppe og lavland.</string>
+    <string name="slope_description">Hældning er farvelagte visualiseringer på terræn.</string>
+    <string name="terrain_slider_description">Angiv de min. og max. zoomniveauer, som laget vil blive vist på.</string>
+    <string name="hillshade_download_description">Yderligere kort er nødvendige for at se reliefskygger på kortet.</string>
+    <string name="slope_download_description">Yderligere kort er nødvendige for at se hældninger på kortet.</string>
+    <string name="slope_read_more">Læs mere om hældninger på %1$s.</string>
+    <string name="shared_string_transparency">Gennemsigtighed</string>
+    <string name="shared_string_zoom_levels">Zoomniveauer</string>
+    <string name="shared_string_legend">Tegnforklaring</string>
+    <string name="terrain_empty_state_text">Gøre det muligt at få vist relief- eller hældningskort. Læs mere om kort-typerne på vores hjemmeside</string>
+    <string name="shared_string_hillshade">Reliefskygge</string>
+    <string name="import_complete_description">Alle data fra %1$s er importeret, brug knapperne nedenfor til at åbne den nødvendige del af programmet til at håndtere det.</string>
+    <string name="items_added">Poster tilføjet</string>
+</resources>

OsmAnd/res/values-de/phrases.xml

@@ -63,7 +63,7 @@
     <string name="poi_bedding">Bettwarengeschäft</string>
     <string name="poi_craft_beekeeper">Bienenzüchter</string>
     <string name="poi_beverages">Getränkegeschäft</string>
-    <string name="poi_bicycle_parking">Fahrradständer</string>
+    <string name="poi_bicycle_parking">Fahrradabstellplatz</string>
     <string name="poi_bicycle_rental">Fahrradvermietung</string>
     <string name="poi_bicycle">Fahrradgeschäft</string>
     <string name="poi_bicycle_track">Radweg </string>
@@ -1811,7 +1811,7 @@
     <string name="poi_diaper_no">Kein Wickeltisch</string>
     <string name="poi_diaper_room">Wickelraum</string>
     <string name="poi_maxstay">Höchstparkdauer</string>
-    <string name="poi_vending_parking_tickets">Parkschein</string>
+    <string name="poi_vending_parking_tickets">Parkscheine</string>
     <string name="poi_vending_cigarettes">Zigaretten</string>
     <string name="poi_vending_excrement_bags">Fäkalienbeutel</string>
     <string name="poi_vending_public_transport_tickets">Fahrscheine</string>
@@ -1830,7 +1830,7 @@
     <string name="poi_vending_elongated_coin">Souvenir-Münze</string>
     <string name="poi_vending_bread">Brot</string>
     <string name="poi_vending_chewing_gums">Kaugummis</string>
-    <string name="poi_vending_parking_tickets_public_transport_tickets">Parkschein; Fahrschein</string>
+    <string name="poi_vending_parking_tickets_public_transport_tickets">Parkscheine; Fahrscheine</string>
     <string name="poi_vending_coffee">Kaffee</string>
     <string name="poi_vending_toll">Mautverkauf</string>
     <string name="poi_vending_tickets">Fahrscheinverkauf</string>
@@ -2352,7 +2352,7 @@
     <string name="poi_water_heater_no">Wasserkocher: nein</string>
     <string name="poi_parking_surface">Oberfläche</string>
     <string name="poi_parking_garage_boxes">Garagen</string>
-    <string name="poi_parking_carports">Carport</string>
+    <string name="poi_parking_carports">Carports</string>
     <string name="poi_dojo">Dojo</string>
     <string name="poi_running">Laufen</string>
     <string name="poi_badminton">Federball</string>
@@ -3770,7 +3770,7 @@
     <string name="poi_community_gender_male">Geschlecht der Gemeinschaft: männlich</string>
     <string name="poi_community_gender_mixed">Geschlecht der Gemeinschaft: gemischt</string>
     <string name="poi_grave">Grab</string>
-    <string name="poi_parking_space">Parkplatz</string>
+    <string name="poi_parking_space">Parkbucht</string>
     <string name="poi_url">URL</string>
     <string name="poi_volcano_type">Vulkanart</string>
     <string name="poi_volcano_status">Vulkanstatus</string>

OsmAnd/res/values-de/strings.xml

@@ -3053,7 +3053,7 @@ Lon %2$s</string>
     <string name="choose_data_to_share">Wählen Sie, welche Art Daten Sie freigeben möchten:</string>
     <string name="downloaded_maps">Heruntergeladene Karten</string>
     <string name="visited_screens">Besuchte Bildschirme</string>
-    <string name="collected_data_descr">Bestimmen Sie, welche Daten Sie für OsmAnd freigeben.</string>
+    <string name="collected_data_descr">Festlegen, welche Daten OsmAnd weitergeben darf.</string>
     <string name="downloaded_maps_collect_descr">Helfen Sie uns, die Beliebtheit von Karten für Länder und Regionen herauszufinden.</string>
     <string name="visited_screens_collect_descr">Helfen Sie uns, die Beliebtheit von OsmAnd-Funktionen zu verstehen.</string>
     <string name="privacy_and_security_change_descr">Auf „Erlauben“ tippen, wenn Sie mit unserer %1$s einverstanden sind</string>
@@ -3399,7 +3399,7 @@ Lon %2$s</string>
     <string name="shared_string_turn_off">Ausschalten</string>
     <string name="new_plugin_added">Neues Plugin hinzugefügt</string>
     <string name="quick_action_directions_from_desc">Eine Schaltfläche, um die Bildschirmmitte zum Ausgangspunkt zu machen. Sie werden dann aufgefordert, ein Ziel festzulegen oder die Routenberechnung auszulösen.</string>
-    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Radroutennetzknoten anzeigen</string>
+    <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Knotenpunktsystem von Radrouten anzeigen</string>
     <string name="download_map_dialog">Dialog zum Herunterladen der Karte</string>
     <string name="dialogs_and_notifications_title">Dialoge und Benachrichtigungen</string>
     <string name="dialogs_and_notifications_descr">Steuern Sie Popups, Dialoge und Benachrichtigungen.</string>
@@ -3563,9 +3563,9 @@ Lon %2$s</string>
     <string name="replace_all">Alle ersetzen</string>
     <string name="keep_both">Beide behalten</string>
     <string name="keep_both_desc">Importierte Elemente werden mit Präfix hinzugefügt</string>
-    <string name="import_duplicates_description">OsmAnd verfügt bereits über Elemente mit denselben Namen wie die importierten.
+    <string name="import_duplicates_description">OsmAnd enthält bereits Elemente gleichen Namens wie die importierten.
 \n
-\nWählen Sie eine Aktion aus.</string>
+\nWählen Sie eine Maßnahme.</string>
     <string name="import_duplicates_title">Einige Elemente sind bereits vorhanden</string>
     <string name="select_data_to_import">Wählen Sie die zu importierenden Daten.</string>
     <string name="shared_string_rendering_style">Darstellungsstil</string>
@@ -3602,13 +3602,18 @@ Lon %2$s</string>
     <string name="shared_string_transparency">Transparenz</string>
     <string name="terrain_slider_description">Stellen Sie die minimale und maximale Zoomstufe ein, bei der die Ebene angezeigt wird.</string>
     <string name="shared_string_terrain">Gelände</string>
-    <string name="download_slope_maps">Hänge</string>
+    <string name="download_slope_maps">Pisten</string>
     <string name="terrain_empty_state_text">Aktivieren Sie diese Option, um die Schatten- oder Hangkarte anzuzeigen. Weitere Informationen zu diesen Kartentypen finden Sie auf unserer Website</string>
     <string name="shared_string_legend">Legende</string>
-    <string name="slope_read_more">Lesen Sie mehr über Hänge in %1$s.</string>
-    <string name="slope_download_description">Zusätzliche Karten sind erforderlich, um Hänge auf der Karte anzuzeigen.</string>
+    <string name="slope_read_more">Lesen Sie mehr über Pisten in %1$s.</string>
+    <string name="slope_download_description">Zusätzliche Karten sind erforderlich, um Pisten auf der Karte anzuzeigen.</string>
     <string name="hillshade_download_description">Für die Darstellung der Schummerung werden zusätzliche Karten benötigt.</string>
     <string name="shared_string_min">Min</string>
     <string name="hillshade_description">Schummerungs-Karte mit dunklen Schattierungen zur Darstellung von Hängen, Gipfeln und Niederungen.</string>
     <string name="n_items_of_z">%1$s von %2$s</string>
+    <string name="shared_string_octagon">Achteck</string>
+    <string name="app_mode_ski_touring">Skitouren</string>
+    <string name="app_mode_ski_snowmobile">Schneemobil</string>
+    <string name="custom_osmand_plugin">Benutzerdefiniertes OsmAnd-Plugin</string>
+    <string name="slope_description">Farbliche Kennzeichnung von Pisten im Gelände.</string>
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -3588,4 +3588,8 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="shared_string_rhomb">Rombo</string>
     <string name="shared_string_square">Kvadrato</string>
     <string name="shared_string_min">Min.</string>
+    <string name="shared_string_octagon">Okangulo</string>
+    <string name="app_mode_ski_touring">Ski‑ekskursado</string>
+    <string name="app_mode_ski_snowmobile">Motorsledo</string>
+    <string name="custom_osmand_plugin">Propra OsmAnd-kromprogramo</string>
 </resources>

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

@@ -3607,4 +3607,8 @@ Lon %2$s</string>
     <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desviación</string>
     <string name="select_distance_route_will_recalc">Elige la distancia después de la cual la ruta será recalculada.</string>
     <string name="recalculate_route_distance_promo">La ruta será recalculada si la distancia a la ubicación actual es mayor que el valor elegido.</string>
+    <string name="shared_string_octagon">Octágono</string>
+    <string name="app_mode_ski_touring">Esquí de travesía</string>
+    <string name="app_mode_ski_snowmobile">Motonieve</string>
+    <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
 </resources>

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

@@ -3578,4 +3578,36 @@ Lon %2$s</string>
     <string name="items_added">Elementos añadidos</string>
     <string name="shared_string_import_complete">Importación completa</string>
     <string name="import_complete_description">Todos los datos de %1$s son importados, puedes usar los botones de abajo para abrir la parte necesaria de la aplicación para manejarla.</string>
+    <string name="shared_string_terrain">Terreno</string>
+    <string name="hillshade_description">Mapa de sombreado usando sombras oscuras para mostrar las laderas, picos y tierras bajas.</string>
+    <string name="slope_description">La pendiente se visualiza en colores sobre el terreno.</string>
+    <string name="terrain_slider_description">Define los niveles de zoom mínimo y máximo en los que se mostrará la capa.</string>
+    <string name="hillshade_download_description">Se necesitan mapas adicionales para ver el sombreado en el mapa.</string>
+    <string name="slope_download_description">Se necesitan mapas adicionales para ver las pendientes en el mapa.</string>
+    <string name="slope_read_more">Puedes leer más sobre las pendientes en «%1$s».</string>
+    <string name="shared_string_transparency">Transparencia</string>
+    <string name="shared_string_zoom_levels">Niveles de zoom</string>
+    <string name="shared_string_legend">Leyenda</string>
+    <string name="terrain_empty_state_text">Permite ver el sombreado o el mapa de pendientes. Puedes leer más sobre estos tipos de mapas en nuestro sitio</string>
+    <string name="shared_string_hillshade">Sombreado</string>
+    <string name="recalculate_route_in_deviation">Recalcular ruta en caso de desviación</string>
+    <string name="select_distance_route_will_recalc">Elige la distancia después de la cual la ruta será recalculada.</string>
+    <string name="recalculate_route_distance_promo">La ruta será recalculada si la distancia a la ubicación actual es mayor que el valor elegido.</string>
+    <string name="n_items_of_z">%1$s de %2$s</string>
+    <string name="download_slope_maps">Pendientes</string>
+    <string name="quick_action_show_hide_terrain">Mostrar/ocultar terreno</string>
+    <string name="quick_action_terrain_hide">Ocultar terreno</string>
+    <string name="quick_action_terrain_show">Mostrar terreno</string>
+    <string name="quick_action_terrain_descr">Un botón que muestra u oculta la capa del terreno en el mapa.</string>
+    <string name="delete_description">Borrar descripción</string>
+    <string name="add_description">Añadir descripción</string>
+    <string name="select_group">Elegir grupo</string>
+    <string name="select_shape">Elegir forma</string>
+    <string name="shared_string_circle">Círculo</string>
+    <string name="shared_string_octagon">Octágono</string>
+    <string name="shared_string_square">Cuadrado</string>
+    <string name="shared_string_min">Min</string>
+    <string name="app_mode_ski_touring">Esquí de travesía</string>
+    <string name="app_mode_ski_snowmobile">Motonieve</string>
+    <string name="custom_osmand_plugin">Complemento personalizado de OsmAnd</string>
 </resources>

OsmAnd/res/values-eu/strings.xml

@@ -3615,4 +3615,5 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_terrain">Terrenoa</string>
     <string name="n_items_of_z">%1$s / %2$s</string>
     <string name="shared_string_min">Min</string>
+    <string name="shared_string_octagon">Oktagonoa</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -3635,4 +3635,8 @@
     <string name="add_description">افزودن توضیحات</string>
     <string name="select_group">انتخاب گروه</string>
     <string name="select_shape">انتخاب شکل</string>
+    <string name="shared_string_octagon">هشت‌ضلعی</string>
+    <string name="app_mode_ski_touring">تور اسکی</string>
+    <string name="app_mode_ski_snowmobile">برف‌رو</string>
+    <string name="custom_osmand_plugin">افزونهٔ سفارشی OsmAnd</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -3817,4 +3817,6 @@
     <string name="poi_drinking_water_refill_yes">Remplissage d\'eau potable : oui</string>
     <string name="poi_drinking_water_refill_no">Remplissage d\'eau potable : non</string>
     <string name="poi_drinking_water_refill_network">Réseau de remplissage d\'eau potable</string>
+    <string name="poi_traffic_signals_sound_locate">Uniquement si la marche est autorisée</string>
+    <string name="poi_internet_access_fee_customers">Signal pour trouver le pôle</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -526,10 +526,10 @@
     <string name="choose_available_region">Sélectionnez une région dans la liste</string>
     <string name="choose_intersected_street">Sélectionnez une intersection</string>
     <string name="Closest_Amenities">Équipements à proximité</string>
-    <string name="app_mode_default">Carte</string>
-    <string name="app_mode_car">Voiture</string>
-    <string name="app_mode_bicycle">Vélo</string>
-    <string name="app_mode_pedestrian">Piéton</string>
+    <string name="app_mode_default">Parcourir la carte</string>
+    <string name="app_mode_car">En voiture</string>
+    <string name="app_mode_bicycle">À vélo</string>
+    <string name="app_mode_pedestrian">À pied</string>
     <string name="position_on_map_center">Centre</string>
     <string name="position_on_map_bottom">Bas</string>
     <string name="navigate_point_top_text">Entrez la latitude et la longitude au format sélectionné (D - degrés, M - minutes, S - secondes)</string>
@@ -3024,7 +3024,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="app_mode_horse">À cheval</string>
     <string name="app_mode_helicopter">Hélicoptère</string>
     <string name="osmand_routing_promo">"Vous pouvez ajouter votre propre version du fichier routing.xml dans  ..osmand/routing"</string>
-    <string name="app_mode_skiing">Ski</string>
+    <string name="app_mode_skiing">À ski</string>
     <string name="settings_routing_mode_string">Mode : %s</string>
     <string name="routing_profile_ski">Ski</string>
     <string name="profile_type_descr_string">Type : %s</string>
@@ -3067,7 +3067,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="app_mode_scooter">Scooter</string>
     <string name="precision_hdop_and_vdop">Précision horizontale : %1$s, Précision verticale : %2$s</string>
     <string name="precision_hdop">Précision horizontale : %s</string>
-    <string name="app_mode_offroad">Hors route</string>
+    <string name="app_mode_offroad">Tout terrain</string>
     <string name="routing_attr_max_num_changes_name">Nombre de correspondances</string>
     <string name="turn_screen_on_sensor">Utiliser le capteur de proximité</string>
     <string name="sett_no_ext_input">Aucun</string>
@@ -3578,4 +3578,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="shared_string_rhomb">Losange</string>
     <string name="shared_string_square">Carré</string>
     <string name="shared_string_octagon">Octogone</string>
+    <string name="app_mode_ski_touring">Ski de randonnée</string>
+    <string name="app_mode_ski_snowmobile">Motoneige</string>
+    <string name="custom_osmand_plugin">Greffon OsmAnd personnalisé</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -180,7 +180,7 @@
 \nמפות אריחים ניתן להוריד ישירות ממקורות מקוונים או שניתן להכין אותן לשימוש בלתי מקוון (ולהעתיק אותן לתיקיית הנתונים של OsmAnd) כמסד נתונים מסוג SQLite אותו ניתן לייצר על ידי מגוון כלי צד־שלישי להכנת מפות.</string>
     <string name="osmand_background_plugin_description">הצגת הגדרות להפעלת מעקב וניווט במצב רקע על ידי השכמת התקן ה־GPS מדי פעם בפעם (בזמן שהמסך כבוי).</string>
     <string name="osmand_accessibility_description">תוסף זה הופך את תכונות הנגישות של ההתקן לזמינות ישירות ב־OsmAnd. התוסף מאפשר להגדיר את מהירות הדיבור של מנגנון הטקסט לדיבור, להגדיר ניווט בעזרת חצים על המסך, להשתמש בכדור מעקב לשליטה בתקריב או משוב של טקסט לדיבור, למשל לצורך הכרזה על המיקום שלך אוטומטית.</string>
-    <string name="osmand_development_plugin_description">תוסף זה מציג הגדרות פיתוח וניפוי שגיאות כגון בדיקה או הדמיה של ניתוב, ביצועי עיבוד התמונה או התרעות קוליות. הגדרות אלו מיועדות למפתחים ואינן נחוצות למשתמשים על פי רוב.</string>
+    <string name="osmand_development_plugin_description">הגדרות לתכונות פיתוח וניפוי שגיאות, הדמיית ניתוב, ביצועי עיבוד התמונה או התרעות קוליות. מיועד למפתחים ולא נחוץ לשימוש רגיל ביישומון.</string>
     <string name="plugins_screen">מנהל התוספים</string>
     <string name="prefs_plugins_descr">התוספים מאפשרים הגדרות במצב מומחה ומספקים תכונות נוספות.</string>
     <string name="prefs_plugins">מנהל התוספים</string>
@@ -897,7 +897,7 @@
     <string name="download_srtm_maps">מפות SRTM</string>
     <string name="audionotes_location_not_defined">יש לגעת ב‚שימוש במיקום…’ כדי להוסיף הערה למיקום.</string>
     <string name="map_widget_audionotes">הערות קוליות</string>
-    <string name="audionotes_plugin_description">תוסף ההערות הקוליות/בווידאו מספק תכונה להקליט שמע או לצלם תמונות/סרטונים במהלך טיול, או באמצעות כפתור על המפה או ישירות מתפריט ההקשר של כל מיקום במפה.</string>
+    <string name="audionotes_plugin_description">יצירת הערות קוליות/תמונה/וידאו במהלך טיול, או באמצעות כפתור על המפה או ישירות מתפריט ההקשר של המיקום.</string>
     <string name="audionotes_plugin_name">תוסף הערות קוליות</string>
     <string name="osmand_srtm_short_description_80_chars">תוסף ל־OsmAnd לקווי מתאר בלתי מקוונים</string>
     <string name="map_widget_distancemeasurement">מדידת מרחק</string>
@@ -998,7 +998,7 @@
     <string name="plugin_distance_point">נקודה</string>
     <string name="gpx_file_name">קובץ שם ה־GPX</string>
     <string name="gpx_saved_sucessfully">קובץ ה־GPX נשמר אל {0}</string>
-    <string name="osmand_distance_planning_plugin_description">תוסף זה מספק וידג׳ט על המפה שמאפשר ליצור נתיבים על ידי לחיצה על המפה או להשתמש או לשנות קובץ GPX קיים, לטובת תכנון טיול ומדידת מרחק בין נקודות. ניתן לשמור את התוצאות בקובץ GPX, בו ניתן להשתמש לאחר מכן להנחיה.</string>
+    <string name="osmand_distance_planning_plugin_description">ניתן ליצור נתיבים על ידי לחיצה על המפה או על ידי עריכת קובץ GPX קיים, לטובת תכנון טיול ומדידת מרחק בין נקודות. ניתן לשמור את התוצאות בקובץ GPX, בו ניתן להשתמש לאחר מכן להנחיה.</string>
     <string name="osmand_distance_planning_plugin_name">מחשבון מרחק וכלי תכנון</string>
     <string name="shared_string_do_not_show_again">לא להציג שוב</string>
     <string name="distance_measurement_start_editing">להתחיל בעריכה</string>
@@ -1835,7 +1835,7 @@
     <string name="make_active">הגדרה כפעיל</string>
     <string name="today">היום</string>
     <string name="yesterday">אתמול</string>
-    <string name="quick_action_auto_zoom_desc">בורר לכיבוי/הפעלה של התקריב האוטומטי במפה בהתאם למהירות שלך.</string>
+    <string name="quick_action_auto_zoom_desc">כפתור להפעלה ולכיבוי של תקריב אוטומטי תלוי מהירות.</string>
     <string name="quick_action_add_destination_desc">כפתור למירכוז המפה סביב יעד המסלול, יעד שנבחר קודם לכן יהפוך להיות נקודת הביניים האחרונה.</string>
     <string name="quick_action_replace_destination_desc">כפתור להפיכת מרכז המסך ליעד המסלול החדש תוך החלפת כל יעד קודם (אם היה כזה).</string>
     <string name="quick_action_add_first_intermediate_desc">כפתור זה מכוון את מרכז המסך ליעד הביניים הראשון.</string>
@@ -3133,7 +3133,7 @@
     <string name="base_profile_descr_car">מכונית, משאית, אופנוע</string>
     <string name="base_profile_descr_bicycle">אופני הרים, טוסטוס, סוס</string>
     <string name="base_profile_descr_pedestrian">הליכה, טיול הרים, ריצה</string>
-    <string name="base_profile_descr_public_transport">כל סוגי התחב״צ</string>
+    <string name="base_profile_descr_public_transport">סוגי תחב״צ</string>
     <string name="base_profile_descr_boat">ספינה, חתירה, שיט</string>
     <string name="base_profile_descr_aircraft">טיסה, דאייה</string>
     <string name="shared_string_default">בררת מחדל</string>
@@ -3276,8 +3276,8 @@
     <string name="paste_Osmand_data_folder_path">נא להדביק את הנתיב לתיקייה עם הנתונים של OsmAnd</string>
     <string name="change_osmand_data_folder_question">להחליף את תיקיית הנתונים של OsmAnd\?</string>
     <string name="move_maps_to_new_destination">העברה ליעד החדש</string>
-    <string name="internal_app_storage_description">אחסון פנימי, נסתר מהמשתמש ומיישומונים אחרים, נגיש ל־OsmAnd בלבד</string>
-    <string name="change_data_storage_folder">החלפת תיקיית אחסון הנתונים</string>
+    <string name="internal_app_storage_description">אחסון פנימי עבור OsmAnd (נסתר מהמשתמשים ומיישומונים אחרים).</string>
+    <string name="change_data_storage_folder">החלפת תיקיית אחסון</string>
     <string name="rendering_attr_piste_type_snow_park_name">פארק גלישה על שלג</string>
     <string name="rendering_attr_piste_type_sleigh_name">מזחלת נגררת</string>
     <string name="rendering_attr_piste_type_sled_name">מזחלת עצמאית</string>
@@ -3316,7 +3316,7 @@
     <string name="shared_string_memory_used_mb_desc">%1$s מ״ב בשימוש</string>
     <string name="shared_string_memory_used_kb_desc">%1$s ק״ב בשימוש</string>
     <string name="contour_lines_and_hillshade">קווי מתאר והצללות תוואי שטח</string>
-    <string name="routing_attr_prefer_unpaved_name">להעדיף דרכים בלתי סלולות</string>
+    <string name="routing_attr_prefer_unpaved_name">להעדיף דרכים לא סלולות</string>
     <string name="routing_attr_prefer_unpaved_description">להעדיף דרכים בלתי סלולות.</string>
     <string name="update_all_maps">עדכון כל המפות</string>
     <string name="update_all_maps_q">לעדכן את כל (%1$d) המפות\?</string>
@@ -3330,7 +3330,7 @@
 \n 
 \n • חלונית הורדת מפה חדשה שמציעה להוריד מפה בזמן עיון 
 \n 
-\n • תיקונים לערכת העיצוב הלילית 
+\n • תיקונים לערכת העיצוב הכהה 
 \n 
 \n • תוקנו בעיות ניווט ברחבי העולם 
 \n 
@@ -3343,16 +3343,16 @@
 \n • תיקוני תקלות נוספים
 \n
 \n</string>
-    <string name="apply_preference_to_all_profiles">ניתן להחיל את השינוי הזה לכל הפרופילים או רק לזה שנבחר.</string>
+    <string name="apply_preference_to_all_profiles">ניתן להחיל את השינוי הזה לכל הפרופילים או רק לנבחר.</string>
     <string name="shared_preference">משותף</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">להעדיף דרכים לא סלולות</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_description">להעדיף דרכים לא סלולות.</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_description">להעדיף דרכים לא סלולות על פני סלולות בבחירת מסלול.</string>
     <string name="layer_osm_edits">עריכות OSM</string>
-    <string name="quick_action_contour_lines_descr">בורר להצגה או להסתרה של קווי מתאר במפה.</string>
+    <string name="quick_action_contour_lines_descr">כפתור להצגה או להסתרה של קווי מתאר במפה.</string>
     <string name="quick_action_contour_lines_show">הצגת קווי מתאר</string>
     <string name="quick_action_contour_lines_hide">הסתרת קווי מתאר</string>
     <string name="quick_action_show_hide_contour_lines">הצגה/הסתרה של קווי מתאר</string>
-    <string name="quick_action_hillshade_descr">בורר להצגה או הסתרה של הצללה במפה.</string>
+    <string name="quick_action_hillshade_descr">כפתור להצגה או הסתרה של הצללות במפה.</string>
     <string name="quick_action_hillshade_show">הצגת הצללה</string>
     <string name="quick_action_hillshade_hide">הסתרת הצללה</string>
     <string name="quick_action_show_hide_hillshade">הצגה/הסתרה של הצללה</string>
@@ -3360,12 +3360,12 @@
     <string name="simulate_your_location_gpx_descr">הדמיית המיקום שלך באמצעות מסלול GPX שהוקלט מראש.</string>
     <string name="export_profile">ייצוא פרופיל</string>
     <string name="exported_osmand_profile">פרופיל OsmAnd:‏ %1$s</string>
-    <string name="overwrite_profile_q">פרופיל בשם ‚%1$s’ כבר קיים. לדרוס\?</string>
+    <string name="overwrite_profile_q">‚%1$s’ כבר קיים. לדרוס\?</string>
     <string name="export_profile_failed">לא ניתן לייצא פרופיל.</string>
     <string name="profile_import">ייבוא פרופיל</string>
-    <string name="profile_import_descr">כדי לייבא פרופיל, יש לבחור את הקובץ שלו ולפתוח אותו עם OsmAnd.</string>
+    <string name="profile_import_descr">ניתן להוסיף פרופיל על ידי פתיחת הקובץ שלו עם OsmAnd.</string>
     <string name="file_import_error">שגיאת ייבוא %1$s:‏ %2$s</string>
-    <string name="file_imported_successfully">הייבוא של %1$s הצליח.</string>
+    <string name="file_imported_successfully">הייבוא של %1$s הושלם.</string>
     <string name="rendering_value_white_name">לבן</string>
     <string name="swap_two_places">החלפה בין %1$s לבין %2$s</string>
     <string name="route_start_point">נקודת התחלה</string>
@@ -3382,12 +3382,12 @@
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">הצגת מסלולי אופניים של רשת מפרקים</string>
     <string name="download_map_dialog">דו־שיח הורדת מפה</string>
     <string name="dialogs_and_notifications_title">תיבות דו־שיח והתראות</string>
-    <string name="dialogs_and_notifications_descr">שליטה בחלוניות הקופצות, בתיבות הדו־שיח ובהתראות שמוצגות במהלך השימוש ב־OsmAnd.</string>
+    <string name="dialogs_and_notifications_descr">שליטה בחלוניות הקופצות, בתיבות הדו־שיח ובהתראות.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">רשתות מפרקים</string>
     <string name="suggested_maps">מפות מוצעות</string>
-    <string name="suggested_maps_descr">המפות האלו נחוצות לטובת שימוש עם תוסף</string>
+    <string name="suggested_maps_descr">המפות האלו נחוצות לתוסף.</string>
     <string name="added_profiles">הוספת פרופילים</string>
-    <string name="added_profiles_descr">התוסף מוסיף פרופיל חדש ל־OsmAnd</string>
+    <string name="added_profiles_descr">פרופילים שנוספו על ידי תוסף</string>
     <string name="shared_string_turn_off">כיבוי</string>
     <string name="new_plugin_added">נוסף תוסף חדש</string>
     <string name="join_segments">חיבור מקטעים</string>
@@ -3408,11 +3408,11 @@
     <string name="delete_profiles_descr">נגיעה ב־‚החלה’ תמחק את הפרופילים שהוסרו לצמיתות.</string>
     <string name="master_profile">פרופיל ראשי</string>
     <string name="select_color">בחירת צבע</string>
-    <string name="edit_profiles_descr">לא ניתן למחוק את פרופילי בררת המחדל של OsmAnd, אך ניתן להשבית אותם במסך הקודם או להעביר אותם לתחתית.</string>
+    <string name="edit_profiles_descr">לא ניתן למחוק את פרופילי בררת המחדל של OsmAnd, אך ניתן להשבית אותם (במסך הקודם) או להוריד אותם לתחתית.</string>
     <string name="edit_profiles">עריכת פרופילים</string>
-    <string name="select_nav_profile_dialog_message">סוג הניווט משפיע על כללי חישוב המסלול.</string>
+    <string name="select_nav_profile_dialog_message">‚סוג הניווט’ מגבש את אופן חישוב המסלול.</string>
     <string name="profile_appearance">הופעת פרופיל</string>
-    <string name="choose_icon_color_name">נא לבחור סמל, צבע ושם</string>
+    <string name="choose_icon_color_name">סמל, צבע ושם</string>
     <string name="reorder_profiles">עריכת רשימת הפרופילים</string>
     <string name="selected_profile">פרופיל נבחר</string>
     <string name="reset_confirmation_descr">נגיעה ב־%1$s תוביל לאבדן כל השינויים שערכת.</string>
@@ -3581,4 +3581,15 @@
     <string name="shared_string_octagon">מתומן</string>
     <string name="multimedia_notes_view_descr">הערות ה־OSM שלך הן תחת %1$s.</string>
     <string name="tracks_view_descr">המסלולים המוקלטים שלך נמצאים תחת %1$s, או בתיקייה של OsmAnd.</string>
+    <string name="app_mode_ski_snowmobile">אופנוע שלג</string>
+    <string name="custom_osmand_plugin">תוסף OsmAnd מותאם אישית</string>
+    <string name="live_monitoring_adress">כתובת</string>
+    <string name="live_monitoring_time_buffer">מאגר זמן</string>
+    <string name="monitoring_notification">התראה</string>
+    <string name="live_monitoring_adress_descr">נא לציין את הכתובת עם תחביר משתנים: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
+    <string name="monitoring_min_speed">מהירות מזערית</string>
+    <string name="monitoring_min_accuracy">דיוק מזערי</string>
+    <string name="monitoring_min_distance">תזוזה מזערית</string>
+    <string name="multimedia_rec_split_title">פיצול מקליט</string>
+    <string name="reset_plugin_to_default">איפוס הגדרות התוסף לבררת המחדל</string>
 </resources>

OsmAnd/res/values-hu/strings.xml

@@ -614,7 +614,7 @@
     <string name="context_menu_item_create_poi">POI készítés</string>
     <string name="shared_string_yes">Igen</string>
     <string name="shared_string_cancel">Mégse</string>
-    <string name="shared_string_apply">Alkalmazás</string>
+    <string name="shared_string_apply">Alkalmaz</string>
     <string name="shared_string_add">Hozzáadás</string>
     <string name="shared_string_no">Nem</string>
     <string name="add_favorite_dialog_top_text">Add meg a Kedvenc nevét</string>
@@ -3171,7 +3171,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="contour_lines_and_hillshade">Szintvonalak és domborzatárnyékolás</string>
     <string name="routing_attr_prefer_unpaved_name">Burkolatlan utak előnyben részesítése</string>
     <string name="routing_attr_prefer_unpaved_description">Burkolatlan utak előnyben részesítése.</string>
-    <string name="apply_preference_to_all_profiles">Ezt a módosítást alkalmazhatod az összes profilra vagy csak a jelenleg kiválasztottra.</string>
+    <string name="apply_preference_to_all_profiles">Ezt a módosítást alkalmazhatod az összes profilra vagy csak a kiválasztottra.</string>
     <string name="shared_preference">Megosztott</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Burkolatlan utak előnyben részesítése</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Útvonaltervezésnél a burkolatlan utak előnyben részesítése a burkoltakkal szemben.</string>
@@ -3324,7 +3324,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="save_heading_descr">Rögzítéskor menti az egyes útpontok irányát is.</string>
     <string name="select_navigation_icon">Navigációs ikon</string>
     <string name="select_map_icon">Térképikon</string>
-    <string name="delete_profiles_descr">Az Alkalmazás-ra koppintva a törölt profilok végérvényesen elvesznek.</string>
+    <string name="delete_profiles_descr">Az Alkalmaz-ra koppintva a törölt profilok végérvényesen elvesznek.</string>
     <string name="master_profile">Főprofil</string>
     <string name="select_color">Szín kijelölése</string>
     <string name="edit_profiles_descr">Az alapértelmezett OsmAnd-profilok nem törölhetők, viszont letilthatók az előző képernyőn vagy letolhatók a lista aljára.</string>
@@ -3441,7 +3441,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="route_recalculation">Útvonal újraszámítása</string>
     <string name="accessibility_announce">Bejelentés</string>
     <string name="login_and_pass">Felhasználónév és jelszó</string>
-    <string name="plugin_global_prefs_info">Ezek a bővítménybeállítások globálisak, és minden profilra vonatkoznak.</string>
+    <string name="plugin_global_prefs_info">Ezek a beállítások minden profilra vonatkoznak.</string>
     <string name="osm_editing">OpenStreetMap-szerkesztés</string>
     <string name="osm_edits_view_descr">Az összes még fel nem töltött szerkesztés vagy OSM-hiba megtalálható a %1$s helyen. A már feltöltött pontok nem láthatók az OsmAndban.</string>
     <string name="app_mode_osm">OSM</string>
@@ -3478,4 +3478,58 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="clear_recorded_data_warning">Biztosan törölni szeretné a rögzített adatokat\?</string>
     <string name="importing_from">Adatok importálása innen: %1$s</string>
     <string name="shared_string_importing">Importálás</string>
+    <string name="slope_read_more">A lejtőkről többet olvashat itt: %1$s.</string>
+    <string name="shared_string_rendering_style">Megjelenítés stílusa</string>
+    <string name="shared_string_routing">Útvonaltervezés</string>
+    <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
+    <string name="use_system_screen_timeout_promo">Alapértelmezésben le van tiltva, így amennyiben az OsmAnd az előtérben fut, a kijelző nem kapcsol ki. 
+\n 
+\nAmennyiben engedélyezve van, az OsmAnd az időtúllépésre vonatkozó rendszerbeállítást használja.</string>
+    <string name="use_system_screen_timeout">Kijelző időtűllépés rendszerbeállítás használata</string>
+    <string name="copy_coordinates">Koordináták másolása</string>
+    <string name="route_recalculation_dist_descr">Az útvonal újraszámításra kerül, amennyiben az útvonaltól való távolság több, mint a megadott paraméter</string>
+    <string name="route_recalculation_dist_title">Legkisebb távolság, amely felett újraszámítja az útvonalat</string>
+    <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
+    <string name="shared_string_menu">Menü</string>
+    <string name="plugin_disabled">Bővítmény letiltva</string>
+    <string name="open_settings">Beállítások megnyitása</string>
+    <string name="no_recalculation_setting">Újraszámítás letiltása</string>
+    <string name="please_provide_profile_name_message">Kérem, adjon nevet a profilnak</string>
+    <string name="select_data_to_import">Válassza ki az importálandó adatot.</string>
+    <string name="keep_both">Mindkettő megtartása</string>
+    <string name="replace_all">Összes lecserélése</string>
+    <string name="shared_string_terrain">Domborzat</string>
+    <string name="hillshade_description">A domborzatárnyékolás réteg sötét árnyalattal emeli ki a lejtőket, csúcsokat és az alföldeket.</string>
+    <string name="slope_description">A lejtő réteg a terep színezett vizualizációja.</string>
+    <string name="terrain_slider_description">Állítsa be a legkisebb és legnagyobb nagyítási szintet, amelyen a réteg megjelenjen.</string>
+    <string name="hillshade_download_description">További térképek szükségesek a domborzatárnyékolás térképen való megjelenítéséhez.</string>
+    <string name="slope_download_description">További térképek szükségesek a lejtők térképen való megjelenítéséhez.</string>
+    <string name="shared_string_transparency">Áttetszőség</string>
+    <string name="shared_string_zoom_levels">Nagyítási szintek</string>
+    <string name="shared_string_legend">Jelmagyarázat</string>
+    <string name="shared_string_hillshade">Domborzatárnyékolás</string>
+    <string name="shared_string_import_complete">Importálás kész</string>
+    <string name="items_added">Tételek hozzáadva</string>
+    <string name="recalculate_route_in_deviation">Útvonal újraszámítása letérés esetén</string>
+    <string name="select_distance_route_will_recalc">Jelöld ki a távolságot, amely fölött az útvonal újraszámításra kerül.</string>
+    <string name="recalculate_route_distance_promo">Az útvonal újraszámításra kerül, amennyiben az útvonal és a jelenlegi helyzet közötti távolság nagyobb, mint a kiválasztott érték.</string>
+    <string name="n_items_of_z">%1$s ennyiből: %2$s</string>
+    <string name="download_slope_maps">Lejtők</string>
+    <string name="quick_action_show_hide_terrain">Domborzat megjelenítése/elrejtése</string>
+    <string name="quick_action_terrain_hide">Domborzat elrejtése</string>
+    <string name="quick_action_terrain_show">Domborzat megjelenítése</string>
+    <string name="quick_action_terrain_descr">Váltógomb, amely a térképen megjeleníti vagy elrejti a domborzati réteget.</string>
+    <string name="delete_description">Leírás törlése</string>
+    <string name="add_description">Leírás hozzáadása</string>
+    <string name="select_group">Csoport kijelölése</string>
+    <string name="select_shape">Alak kijelölése</string>
+    <string name="shared_string_circle">Kör</string>
+    <string name="shared_string_octagon">Nyolcszög</string>
+    <string name="shared_string_square">Négyzet</string>
+    <string name="shared_string_min">Min</string>
+    <string name="clear_recorded_data">Rögzített adatok törlése</string>
+    <string name="terrain_empty_state_text">Engedélyezésével domborzatárnyékolás vagy lejtőtérkép jeleníthető meg. Ezekről a térképfajtákról többet olvashat a honlapunkon:</string>
+    <string name="app_mode_ski_touring">Túrasízés</string>
+    <string name="app_mode_ski_snowmobile">Motoros hószán</string>
+    <string name="custom_osmand_plugin">Egyéni OsmAnd bővítmény</string>
 </resources>

OsmAnd/res/values-it/phrases.xml

@@ -953,7 +953,7 @@
     <string name="poi_access_no">Nessun accesso</string>
     <string name="poi_access_permissive">Accesso permissivo</string>
     <string name="poi_access_customers">Accesso cliente</string>
-    <string name="poi_access_delivery">Accesso di consegna</string>
+    <string name="poi_access_delivery">Accesso alla consegna</string>
     <string name="poi_access_agricultural">Accesso agricolo</string>
     <string name="poi_content_silage">Contenuto: insilato</string>
     <string name="poi_content_water">Contenuto: acqua</string>
@@ -1190,8 +1190,8 @@
     <string name="poi_payment_paypal_no">Non si accetta PayPal</string>
     <string name="poi_payment_gift_card_yes">Carte regalo</string>
     <string name="poi_description_payment">Descrizione del pagamento</string>
-    <string name="poi_internet_access_fee_yes">Accesso a Internet - a pagamento</string>
-    <string name="poi_internet_access_fee_no">Accesso a Internet - senza pagamento</string>
+    <string name="poi_internet_access_fee_yes">Accesso a Internet: a pagamento</string>
+    <string name="poi_internet_access_fee_no">Accesso a Internet: senza pagamento</string>
     <string name="poi_diet_vegetarian_yes">Vegetariana</string>
     <string name="poi_diet_vegan_only">Solo Vegana</string>
     <string name="poi_diet_vegan_yes">Vegana</string>
@@ -2001,7 +2001,7 @@
     <string name="poi_ramp_wheelchair_no">Rampa per carrozzina: No</string>
     <string name="poi_feeding_place">Mangiatoia</string>
     <string name="poi_social_facility_for">Gruppo destinatario</string>
-    <string name="poi_emergency_infrastructure">Infrastruttura emergenza</string>
+    <string name="poi_emergency_infrastructure">Infrastruttura d\'emergenza</string>
     <string name="poi_beds">Letti</string>
     <string name="poi_recreation_center">Centro ricreativo</string>
     <string name="poi_crossing_activation_automatic">Attivazione del attraversamento: automatica</string>
@@ -2285,7 +2285,7 @@
     <string name="poi_payment_union_card_no">Union Card non accettata</string>
     <string name="poi_payment_mtsmoney_yes">MTS-Money</string>
     <string name="poi_payment_mtsmoney_no">MTS-Money non accettato</string>
-    <string name="poi_brewery_additional">Birre</string>
+    <string name="poi_brewery_additional">Nome della birreria</string>
     <string name="poi_fire_hydrant_style_water_source_main">Principale</string>
     <string name="poi_fire_hydrant_style_water_source_pond">Stagno</string>
     <string name="poi_fire_hydrant_style_water_source_stream">Ruscello</string>
@@ -2400,7 +2400,7 @@
     <string name="poi_climbing_crag">si</string>
     <string name="poi_distance_mark">Segno di distanza</string>
     <string name="poi_piste_skitour">Pista Skitour</string>
-    <string name="poi_denomination_united_reformed">Riformata unita</string>
+    <string name="poi_denomination_united_reformed">Riformata Unita</string>
     <string name="poi_denomination_iglesia_ni_cristo">Iglesia ni cristo</string>
     <string name="poi_denomination_unitarian">Unitaria</string>
     <string name="poi_government_archive">Archivio</string>
@@ -2519,7 +2519,7 @@
     <string name="poi_group_only_yes">Solo gruppi: sì</string>
     <string name="poi_group_only_no">Solo gruppi: no</string>
     <string name="poi_shower_indoor">Doccia: interno</string>
-    <string name="poi_social_facility_group_home">Casa famiglia</string>
+    <string name="poi_social_facility_group_home">Casa di gruppo</string>
     <string name="poi_social_facility_food_bank">Banco alimentare</string>
     <string name="poi_social_facility_shelter">Riparo</string>
     <string name="poi_social_facility_for_drug_addicted">Tossicodipendenti</string>
@@ -2553,7 +2553,7 @@
     <string name="poi_health_specialty_osteopathy_yes">Osteopatia</string>
     <string name="poi_health_specialty_anaesthetics_yes">Anestesiologia</string>
     <string name="poi_health_specialty_pulmonology_yes">Pneumologia</string>
-    <string name="poi_bicycle_repair_station">Stazione fai-da-te riparazione bici</string>
+    <string name="poi_bicycle_repair_station">Stazione di riparazione biciclette;Stazione fai-da-te riparazione bici</string>
     <string name="poi_counselling_type_family_yes">Consultorio (familiare): si</string>
     <string name="poi_counselling_type_family_no">Consultorio (familiare): no</string>
     <string name="poi_pump_status_broken">Stato della pompa: rotta</string>
@@ -2565,7 +2565,7 @@
     <string name="poi_water_purification_chlorine">Cloro</string>
     <string name="poi_water_purification_reverse_osmosis">Osmosi inversa</string>
     <string name="poi_water_purification_aquatabs">Aquatabs</string>
-    <string name="poi_water_supply_pipeline">Acquedotto</string>
+    <string name="poi_water_supply_pipeline">Conduttura</string>
     <string name="poi_water_supply_running_water">Acqua corrente</string>
     <string name="poi_water_supply_borehole">Pozzo</string>
     <string name="poi_water_supply_bottled_water">Acqua imbottigliata</string>
@@ -2782,4 +2782,40 @@
     <string name="poi_historic_tank">Carro armato storico</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_video_telephone">Video</string>
+    <string name="poi_community_gender_mixed">Genere comunitario: misto</string>
+    <string name="poi_community_gender_male">Sesso comunitario: maschio</string>
+    <string name="poi_community_gender_female">Genere comunitario: femmina</string>
+    <string name="poi_bath_type_thermal">Termale</string>
+    <string name="poi_bath_type_hammam">Hammam</string>
+    <string name="poi_glacier_type_outlet">Outlet</string>
+    <string name="poi_glacier_type_plateau">Altopiano</string>
+    <string name="poi_service_vehicle_car_parts_yes">Ricambi auto</string>
+    <string name="poi_socket_type2_combo_output_medium">Medio</string>
+    <string name="poi_socket_type2_combo_output_high">Alto</string>
+    <string name="poi_socket_type2_output_low">Basso</string>
+    <string name="poi_socket_type2_output_high">Alto</string>
+    <string name="poi_socket_chademo_output_medium">Medio</string>
+    <string name="poi_socket_chademo_output_high">Alto</string>
+    <string name="poi_socket_as3112_yes">AS/NZS 3112</string>
+    <string name="poi_socket_bs1363_yes">BS 1363</string>
+    <string name="poi_socket_nema_14_50_yes">NEMA 14-50</string>
+    <string name="poi_socket_nema_14_30_yes">NEMA 14-30</string>
+    <string name="poi_socket_nema_5_20_yes">NEMA 5-20</string>
+    <string name="poi_socket_nema_5_15_yes">NEMA 5-15R</string>
+    <string name="poi_socket_type2_combo_yes">Tipo 2 combinato</string>
+    <string name="poi_socket_type2_yes">Tipo 2</string>
+    <string name="poi_socket_type1_combo_yes">Tipo 1 combinato</string>
+    <string name="poi_socket_type1_yes">Tipo 1</string>
+    <string name="poi_socket_cee_red_125a_yes">CEE rosso 125A</string>
+    <string name="poi_socket_cee_red_64a_yes">CEE rosso 64A</string>
+    <string name="poi_cuisine_barbecue">Barbecue</string>
+    <string name="poi_support_tower">Supporto: torre</string>
+    <string name="poi_support_roof">Supporto: tetto</string>
+    <string name="poi_support_tree">Supporto: albero</string>
+    <string name="poi_support_wall_mounted">Supporto: muro</string>
+    <string name="poi_generator_output_electricity_no">Uscita (elettricità): no</string>
+    <string name="poi_greenhouse_horticulture">Orticoltura in serra</string>
+    <string name="poi_branch">Filiale</string>
+    <string name="poi_resource_aggregate">Aggregato</string>
+    <string name="poi_resource_beryl">Berillio</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -1341,7 +1341,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="rendering_value_americanRoadAtlas_name">Atlante strade americane</string>
     <string name="routing_attr_no_new_routing_name">Ignora le regole di calcolo del percorso v1.9</string>
     <string name="routing_attr_no_new_routing_description">Non usare le regole di calcolo del percorso introdotte nella v1.9.</string>
-    <string name="traffic_warning_railways">Passaggio a livello</string>
+    <string name="traffic_warning_railways">Attraversamento ferroviario</string>
     <string name="traffic_warning_pedestrian">Attraversamento pedonale</string>
     <string name="show_railway_warnings">Passaggi a livello</string>
     <string name="show_pedestrian_warnings">Attraversamenti pedonali</string>

OsmAnd/res/values-ja/phrases.xml

@@ -3791,4 +3791,13 @@
     <string name="poi_water_place_durability_durable">水場の耐久性: 永続使用可</string>
     <string name="poi_water_place_durability_emergency">水場の耐久性: 緊急時用</string>
     <string name="poi_video_telephone">ビデオ通話</string>
+    <string name="poi_tactile_paving_incorrect">正しく設置されていない点字ブロック</string>
+    <string name="poi_tactile_paving_primitive">非点字ブロックだが凹凸で判断可</string>
+    <string name="poi_tactile_paving_contrasted">一般的な点字ブロック</string>
+    <string name="poi_seamark_water_level_floods">水位:湿っている</string>
+    <string name="poi_seamark_water_level_dry">水位:常時乾燥</string>
+    <string name="poi_seamark_water_level_submerged">水位:常時水没</string>
+    <string name="poi_seamark_water_level_awash">水位:干潮時などは冠水</string>
+    <string name="poi_seamark_water_level_covers">水位:覆われること有り</string>
+    <string name="poi_seamark_water_level_part_submerged">水位:部分的に水没</string>
 </resources>

OsmAnd/res/values-pl/strings.xml

@@ -3608,4 +3608,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
 \n
 \nTo może zająć chwilę.</string>
     <string name="shared_string_min">Min</string>
+    <string name="shared_string_octagon">Ośmiokąt</string>
+    <string name="app_mode_ski_touring">Turystyka narciarska</string>
+    <string name="app_mode_ski_snowmobile">Skuter śnieżny</string>
 </resources>

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

@@ -349,7 +349,7 @@
     <string name="edit_tilesource_successfully">A fonte da quadrícula %1$s foi salva</string>
     <string name="speak_traffic_warnings">Moderadores de tráfego</string>
     <string name="context_menu_item_directions_from">Rota a partir daqui</string>
-    <string name="app_mode_default">Explorar mapa</string>
+    <string name="app_mode_default">Navegar no mapa</string>
     <string name="local_indexes_cat_av">Dados de Áudio/Vídeo</string>
     <string name="stop_routing_confirm">Confirma que quer parar a navegação?</string>
     <string name="int_hour">h</string>
@@ -3568,4 +3568,33 @@ Pôr do Sol: %2$s</string>
     <string name="recalculate_route_distance_promo">A rota será recalculada se a distância da rota até o local atual for maior que o valor selecionado.</string>
     <string name="select_distance_route_will_recalc">Selecione a distância após a qual o percurso será recalculado.</string>
     <string name="recalculate_route_in_deviation">Recalcular rota em caso de desvio</string>
+    <string name="shared_string_terrain">Terreno</string>
+    <string name="hillshade_description">Mapa de sombras de relevo usando tons escuros para mostrar encostas, picos e planícies.</string>
+    <string name="slope_description">A inclinação é visualizações coloridas no terreno.</string>
+    <string name="terrain_slider_description">Defina os níveis mínimo e máximo de zoom nos quais a camada será exibida.</string>
+    <string name="hillshade_download_description">Mapas adicionais são necessários para visualizar sombras de relevo no mapa.</string>
+    <string name="slope_download_description">Mapas adicionais são necessários para visualizar as Inclinações no mapa.</string>
+    <string name="slope_read_more">Você pode ler mais sobre pistas em %1$s.</string>
+    <string name="shared_string_transparency">Transparência</string>
+    <string name="shared_string_zoom_levels">Níveis de zoom</string>
+    <string name="shared_string_legend">Legenda</string>
+    <string name="terrain_empty_state_text">Ative para visualizar mapa de colinas ou declives. Você pode ler mais sobre esses tipos de mapa em nosso site</string>
+    <string name="shared_string_hillshade">Sombras de relevo</string>
+    <string name="n_items_of_z">%1$s de %2$s</string>
+    <string name="download_slope_maps">Encostas</string>
+    <string name="quick_action_show_hide_terrain">Mostrar/ocultar terreno</string>
+    <string name="quick_action_terrain_hide">Ocultar terreno</string>
+    <string name="quick_action_terrain_show">Mostrar terreno</string>
+    <string name="quick_action_terrain_descr">Um botão para mostrar ou ocultar a camada do terreno no mapa.</string>
+    <string name="delete_description">Excluir descrição</string>
+    <string name="add_description">Adicionar descrição</string>
+    <string name="select_group">Selecionar grupo</string>
+    <string name="select_shape">Selecionar forma</string>
+    <string name="shared_string_circle">Círculo</string>
+    <string name="shared_string_octagon">Octógono</string>
+    <string name="shared_string_square">Quadrado</string>
+    <string name="shared_string_min">Min</string>
+    <string name="app_mode_ski_touring">Passeio de esqui</string>
+    <string name="app_mode_ski_snowmobile">Moto de neve</string>
+    <string name="custom_osmand_plugin">Plug-in OsmAnd personalizado</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -2237,7 +2237,7 @@
     <string name="storage_free_space">Свободное место</string>
     <string name="search_location">Определение местоположения…</string>
     <string name="no_inet_connection_desc_map">Требуется загрузить карты</string>
-    <string name="no_inet_connection">Соединение с Интернетом отсутствует</string>
+    <string name="no_inet_connection">Соединение с интернетом отсутствует</string>
     <string name="location_not_found">Не удалось определить местоположение</string>
     <string name="first_usage_wizard_desc">OsmAnd определит ваше местоположение и предложит загрузить карты для этой области.</string>
     <string name="search_map">Поиск карт…</string>
@@ -3565,4 +3565,29 @@
     <string name="import_complete_description">Все данные из %1$s импортированы, вы можете использовать кнопки ниже, чтобы открыть соответствующий раздел приложения для управления ими.</string>
     <string name="recalculate_route_distance_promo">Маршрут будет пересчитан, если расстояние от маршрута до текущего местоположения больше выбранного значения.</string>
     <string name="select_distance_route_will_recalc">Выберите расстояние, после которого маршрут будет пересчитан.</string>
+    <string name="shared_string_legend">Легенда</string>
+    <string name="search_offline_geo_error">Невозможно разобрать геоссылку \"%s\".</string>
+    <string name="hillshade_download_description"></string>
+    <string name="shared_string_min">Мин.</string>
+    <string name="terrain_empty_state_text"></string>
+    <string name="shared_string_transparency">Прозрачность</string>
+    <string name="shared_string_zoom_levels">Уровни масштаба</string>
+    <string name="recalculate_route_in_deviation">Пересчитывать маршрут в случае отклонения</string>
+    <string name="n_items_of_z">%1$s из %2$s</string>
+    <string name="terrain_slider_description">Настройка минимального и максимального уровней масштабирования, при которых слой будет отображаться.</string>
+    <string name="quick_action_show_hide_terrain">Показать/скрыть рельеф</string>
+    <string name="quick_action_terrain_descr">Кнопка для отображения или скрытия слоя рельефа местности на карте.</string>
+    <string name="quick_action_terrain_show">Показать рельеф</string>
+    <string name="quick_action_terrain_hide">Скрыть рельеф</string>
+    <string name="shared_string_terrain">Рельеф</string>
+    <string name="app_mode_ski_touring">Лыжный туризм</string>
+    <string name="app_mode_ski_snowmobile">Снегоход</string>
+    <string name="custom_osmand_plugin">Пользовательский плагин</string>
+    <string name="delete_description">Удалить описание</string>
+    <string name="add_description">Добавить описание</string>
+    <string name="select_group">Выберите группу</string>
+    <string name="shared_string_square">Квадрат</string>
+    <string name="select_shape">Выберите фигуру</string>
+    <string name="shared_string_circle">Круг</string>
+    <string name="shared_string_octagon">Восьмиугольник</string>
 </resources>

OsmAnd/res/values-sk/phrases.xml

@@ -345,8 +345,8 @@
     <string name="poi_internet_access_service">Internetové pripojenie: služba</string>
     <string name="poi_monastery">Kláštor</string>
     <string name="poi_historic_monastery">Historický kláštor</string>
-    <string name="poi_wayside_cross">Božie muky</string>
-    <string name="poi_wayside_shrine">Malá kaplnka pri ceste</string>
+    <string name="poi_wayside_cross">Božie muky/Náboženský prícestný kríž</string>
+    <string name="poi_wayside_shrine">Náboženská prícestná schránka</string>
     <string name="poi_information">Informácie</string>
     <string name="poi_clock">Hodiny</string>
     <string name="poi_travel_agent">Cestovná kancelária</string>

OsmAnd/res/values-sk/strings.xml

@@ -650,7 +650,7 @@
     <string name="choose_available_region">Vybrať oblasť zo zoznamu</string>
     <string name="choose_intersected_street">Vybrať pretínajúcu ulicu</string>
     <string name="Closest_Amenities">Najbližšie body záujmu</string>
-    <string name="app_mode_default">Štandardný</string>
+    <string name="app_mode_default">Prehliadať mapu</string>
     <string name="app_mode_car">Riadenie vozidla</string>
     <string name="app_mode_bicycle">Jazda na bicykli</string>
     <string name="app_mode_pedestrian">Chôdza</string>
@@ -3595,4 +3595,8 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="shared_string_rhomb">Kosoštvorec</string>
     <string name="shared_string_square">Štvorec</string>
     <string name="shared_string_min">Min</string>
+    <string name="shared_string_octagon">Osemholník</string>
+    <string name="app_mode_ski_touring">Lyžiarske okruhy</string>
+    <string name="app_mode_ski_snowmobile">Snežný skúter</string>
+    <string name="custom_osmand_plugin">Vlastný modul pre OsmAnd</string>
 </resources>

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

@@ -317,8 +317,8 @@
     <string name="search_button">搜索</string>
     <string name="search_activity">搜索</string>
     <string name="app_mode_default">浏览地图</string>
-    <string name="app_mode_car">开车</string>
-    <string name="app_mode_bicycle">坐自行车</string>
+    <string name="app_mode_car">驾驶</string>
+    <string name="app_mode_bicycle">自行车出行</string>
     <string name="app_mode_pedestrian">走路</string>
     <string name="position_on_map_center">中心</string>
     <string name="position_on_map_bottom">底部</string>
@@ -1199,7 +1199,7 @@
     <string name="quick_action_map_source_action">添加地图来源</string>
     <string name="map_mode">地图模式</string>
     <string name="map_magnifier">地图缩放</string>
-    <string name="rendering_attr_showSurfaceGrade_name"/>
+    <string name="rendering_attr_showSurfaceGrade_name">显示道路质量</string>
     <string name="rendering_attr_showSurfaces_name"/>
     <string name="map_widget_left">左边栏</string>
     <string name="map_widget_right">右边栏</string>
@@ -2719,7 +2719,7 @@
     <string name="rendering_value_black_name">黑色</string>
     <string name="rendering_attr_surface_wood_name">木</string>
     <string name="app_mode_subway">地铁</string>
-    <string name="app_mode_horse">马</string>
+    <string name="app_mode_horse">骑马</string>
     <string name="shared_string_color_magenta">品红色</string>
     <string name="go_to_next_field">下个栏位</string>
     <string name="shared_string_dont">别</string>
@@ -2827,4 +2827,6 @@
     <string name="shared_string_angle">角度</string>
     <string name="select_data_to_import">选择要导入的数据。</string>
     <string name="import_rendering_file">导入渲染文件</string>
+    <string name="app_mode_shuttle_bus">班车</string>
+    <string name="app_mode_pickup_truck">皮卡</string>
 </resources>

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

@@ -3598,4 +3598,7 @@
     <string name="shared_string_rhomb">菱形</string>
     <string name="shared_string_square">方形</string>
     <string name="shared_string_octagon">八邊形</string>
+    <string name="app_mode_ski_touring">滑雪旅遊</string>
+    <string name="app_mode_ski_snowmobile">雪地摩托車</string>
+    <string name="custom_osmand_plugin">自訂 OsmAnd 外掛程式</string>
 </resources>

OsmAnd/res/values/colors.xml

@@ -178,7 +178,7 @@
 	<color name="row_selection_color">#CC33BBE0</color>
 
 	<!-- GPX analysis colors -->
-	<color name="gpx_color_point">#d00d0d</color>
+	<color name="gpx_color_point">#b4d00d0d</color>
 	<color name="gpx_speed">#c79c00</color>
 	<color name="gpx_altitude_desc">#32CD32</color>
 	<color name="gpx_altitude_asc">#EE3232</color>

OsmAnd/res/values/strings.xml

@@ -14,9 +14,11 @@
     <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="custom_osmand_plugin">Custom OsmAnd plugin</string>
     <string name="app_mode_ski_snowmobile">Snowmobile</string>
     <string name="app_mode_ski_touring">Ski touring</string>
+    <string name="replace_point_descr">Replace another point with this</string>
     <string name="shared_string_min">Min</string>
     <string name="shared_string_square">Square</string>
     <string name="shared_string_octagon">Octagon</string>

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/EditCategoryDialogFragment.java

@@ -15,6 +15,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.FavouritesDbHelper;
 import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.OsmandApplication;
@@ -75,7 +76,8 @@ public class EditCategoryDialogFragment extends DialogFragment {
 
 		nameEdit = (EditText)v.findViewById(R.id.edit_name);
 		nameEdit.setText(name);
-
+		nameEdit.requestFocus();
+		AndroidUtils.softKeyboardDelayed(nameEdit);
 		colorSpinner = (Spinner)v.findViewById(R.id.edit_color);
 		final TIntArrayList colors = new TIntArrayList();
 		final int intColor = color;
@@ -151,7 +153,19 @@ public class EditCategoryDialogFragment extends DialogFragment {
 	}
 
 	@Override
-	public void onSaveInstanceState(Bundle outState) {
+	public void onStop() {
+		Dialog dialog = getDialog();
+		if (dialog != null) {
+			MapActivity mapActivity = (MapActivity) getDialog().getOwnerActivity();
+			if (mapActivity != null) {
+				AndroidUtils.hideSoftKeyboard(mapActivity, mapActivity.getCurrentFocus());
+			}
+		}
+		super.onStop();
+	}
+
+	@Override
+	public void onSaveInstanceState(@NonNull Bundle outState) {
 		saveState(outState);
 		super.onSaveInstanceState(outState);
 	}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragmentNew.java

@@ -171,6 +171,16 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		}
 	}
 
+	@Override
+	protected String getLastUsedGroup() {
+		OsmandApplication app = requireMyApplication();
+		String lastCategory = app.getSettings().LAST_FAV_CATEGORY_ENTERED.get();
+		if (!Algorithms.isEmpty(lastCategory) && !app.getFavorites().groupExists(lastCategory)) {
+			lastCategory = "";
+		}
+		return lastCategory;
+	}
+
 	@Override
 	public void setColor(int color) {
 		this.color = color;
@@ -290,10 +300,7 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 			if (editor.isNew()) {
 				doAddFavorite(name, category, description, color, backgroundType, iconId);
 			} else {
-				favorite.setColor(color);
-				favorite.setBackgroundType(backgroundType);
-				favorite.setIconId(iconId);
-				helper.editFavouriteName(favorite, name, category, description);
+				doEditFavorite(favorite, name, category, description, color, backgroundType, iconId, helper);
 			}
 		}
 		MapActivity mapActivity = getMapActivity();
@@ -312,6 +319,16 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 		}
 	}
 
+	private void doEditFavorite(FavouritePoint favorite, String name, String category, String description,
+	                            @ColorInt int color, BackgroundType backgroundType, @DrawableRes int iconId,
+	                            FavouritesDbHelper helper) {
+		requireMyApplication().getSettings().LAST_FAV_CATEGORY_ENTERED.set(category);
+		favorite.setColor(color);
+		favorite.setBackgroundType(backgroundType);
+		favorite.setIconId(iconId);
+		helper.editFavouriteName(favorite, name, category, description);
+	}
+
 	private void doAddFavorite(String name, String category, String description, @ColorInt int color,
 	                           BackgroundType backgroundType, @DrawableRes int iconId) {
 		OsmandApplication app = getMyApplication();
@@ -433,9 +450,22 @@ public class FavoritePointEditorFragmentNew extends PointEditorFragmentNew {
 	public Set<String> getCategories() {
 		Set<String> categories = new LinkedHashSet<>();
 		FavouritesDbHelper helper = getHelper();
-		if (helper != null) {
-			for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) {
-				categories.add(fg.getDisplayName(getMyApplication()));
+		if (helper != null && editor != null) {
+			OsmandApplication app = getMyApplication();
+			if (editor.isNew()) {
+				FavoriteGroup lastUsedGroup = helper.getGroup(getLastUsedGroup());
+				if (lastUsedGroup != null) {
+					categories.add(lastUsedGroup.getDisplayName(app));
+				}
+				for (FavouritesDbHelper.FavoriteGroup fg : getHelper().getFavoriteGroups()) {
+					if (lastUsedGroup != null && !fg.equals(lastUsedGroup)) {
+						categories.add(fg.getDisplayName(app));
+					}
+				}
+			} else {
+				for (FavoriteGroup fg : helper.getFavoriteGroups()) {
+					categories.add(fg.getDisplayName(app));
+				}
 			}
 		}
 		return categories;

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java

@@ -84,6 +84,8 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 	private String selectedIconCategory;
 	private LinkedHashMap<String, JSONArray> iconCategories;
 	private OsmandApplication app;
+	private View descriptionCaption;
+	private EditText descriptionEdit;
 
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -102,7 +104,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		editor.updateLandscapePortrait(requireActivity());
 		editor.updateNightMode();
 
-		selectedColor = 0xb4FFFFFF & getPointColor();
+		selectedColor = getPointColor();
 		selectedShape = getBackgroundType();
 		selectedIcon = getIconId();
 
@@ -128,10 +130,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 			public void onScrollChanged() {
 				if (scrollViewY != scrollView.getScrollY()) {
 					scrollViewY = scrollView.getScrollY();
-					Activity activity = getActivity();
-					if (activity != null) {
-						AndroidUtils.hideSoftKeyboard(activity, view);
-					}
+					hideKeyboard();
 				}
 			}
 		});
@@ -140,12 +139,12 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		ImageView toolbarAction = (ImageView) view.findViewById(R.id.toolbar_action);
 		view.findViewById(R.id.background_layout).setBackgroundResource(nightMode
 				? R.color.app_bar_color_dark : R.color.list_background_color_light);
-		ImageView groupListIcon = (ImageView) view.findViewById(R.id.group_list_button_icon);
-		groupListIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_group_select_all, activeColorResId));
 		ImageView replaceIcon = (ImageView) view.findViewById(R.id.replace_action_icon);
 		replaceIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_replace, activeColorResId));
 		ImageView deleteIcon = (ImageView) view.findViewById(R.id.delete_action_icon);
 		deleteIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeColorResId));
+		ImageView groupListIcon = (ImageView) view.findViewById(R.id.group_list_button_icon);
+		groupListIcon.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_group_select_all, activeColorResId));
 		View groupList = view.findViewById(R.id.group_list_button);
 		groupList.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -189,14 +188,14 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 			categoryEdit.setText(getCategoryInitValue());
 		}
 
-		final EditText descriptionEdit = (EditText) view.findViewById(R.id.description_edit);
+		descriptionEdit = (EditText) view.findViewById(R.id.description_edit);
 		AndroidUtils.setTextPrimaryColor(view.getContext(), descriptionEdit, nightMode);
 		AndroidUtils.setHintTextSecondaryColor(view.getContext(), descriptionEdit, nightMode);
 		if (getDescriptionInitValue() != null) {
 			descriptionEdit.setText(getDescriptionInitValue());
 		}
 
-		final View descriptionCaption = view.findViewById(R.id.description);
+		descriptionCaption = view.findViewById(R.id.description);
 		addDelDescription = (TextView) view.findViewById(R.id.description_button);
 		addDelDescription.setTextColor(getResources().getColor(activeColorResId));
 		addDelDescription.setOnClickListener(new View.OnClickListener() {
@@ -212,6 +211,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 					descriptionCaption.setVisibility(View.GONE);
 					addDelDescription.setText(view.getResources().getString(R.string.add_description));
 					AndroidUtils.hideSoftKeyboard(requireActivity(), descriptionEdit);
+					descriptionEdit.clearFocus();
 				}
 			}
 		});
@@ -236,17 +236,13 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 			deleteButton.setVisibility(View.GONE);
 			descriptionCaption.setVisibility(View.GONE);
 			deleteIcon.setVisibility(View.GONE);
+			nameEdit.selectAll();
+			nameEdit.requestFocus();
+			AndroidUtils.softKeyboardDelayed(nameEdit);
 		} else {
 			toolbarAction.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeColorResId));
 			deleteButton.setVisibility(View.VISIBLE);
 			deleteIcon.setVisibility(View.VISIBLE);
-			if (!descriptionEdit.getText().toString().isEmpty() || descriptionCaption.getVisibility() != View.VISIBLE) {
-				descriptionCaption.setVisibility(View.VISIBLE);
-				addDelDescription.setText(app.getString(R.string.delete_description));
-			} else {
-				descriptionCaption.setVisibility(View.GONE);
-				addDelDescription.setText(app.getString(R.string.add_description));
-			}
 		}
 
 		toolbarAction.setOnClickListener(new View.OnClickListener() {
@@ -267,6 +263,19 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		return view;
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		if (!descriptionEdit.getText().toString().isEmpty() || descriptionCaption.getVisibility() != View.VISIBLE
+				|| descriptionEdit.hasFocus()) {
+			descriptionCaption.setVisibility(View.VISIBLE);
+			addDelDescription.setText(app.getString(R.string.delete_description));
+		} else {
+			descriptionCaption.setVisibility(View.GONE);
+			addDelDescription.setText(app.getString(R.string.add_description));
+		}
+	}
+
 	private void createGroupSelector() {
 		groupListAdapter = new GroupAdapter();
 		groupRecyclerView = view.findViewById(R.id.group_recycler_view);
@@ -533,36 +542,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		}
 	}
 
-	@Override
-	public void onStart() {
-		super.onStart();
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.getContextMenu().setBaseFragmentVisibility(false);
-		}
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		PointEditor editor = getEditor();
-		if (editor != null && editor.isNew()) {
-			nameEdit.selectAll();
-			nameEdit.requestFocus();
-			AndroidUtils.softKeyboardDelayed(nameEdit);
-		}
-	}
-
-	@Override
-	public void onStop() {
-		super.onStop();
-		hideKeyboard();
-		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.getContextMenu().setBaseFragmentVisibility(true);
-		}
-	}
-
 	@Override
 	public void onDestroyView() {
 		PointEditor editor = getEditor();
@@ -618,14 +597,9 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		groupListAdapter.fillGroups();
 		groupListAdapter.setSelectedItemName(name);
 		groupListAdapter.notifyDataSetChanged();
-		int position;
-		if (getEditor().isNew()) {
-			String lastCategory = app.getSettings().LAST_FAV_CATEGORY_ENTERED.get();
-			if (!Algorithms.isEmpty(lastCategory) && !app.getFavorites().groupExists(lastCategory)) {
-				lastCategory = "";
-			}
-			position = groupListAdapter.getItemPosition(lastCategory);
-		} else {
+		int position = 0;
+		PointEditor editor = getEditor();
+		if (editor != null) {
 			position = groupListAdapter.items.size() == groupListAdapter.getItemPosition(name) + 1
 					? groupListAdapter.getItemPosition(name) + 1
 					: groupListAdapter.getItemPosition(name);
@@ -633,6 +607,10 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		groupRecyclerView.scrollToPosition(position);
 	}
 
+	protected String getLastUsedGroup() {
+		return "";
+	}
+
 	protected String getDefaultCategoryName() {
 		return getString(R.string.shared_string_none);
 	}
@@ -642,15 +620,6 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 		return (MapActivity) getActivity();
 	}
 
-	@Nullable
-	@Override
-	protected OsmandApplication getMyApplication() {
-		if (getActivity() == null) {
-			return null;
-		}
-		return (OsmandApplication) getActivity().getApplication();
-	}
-
 	public void dismiss() {
 		dismiss(false);
 	}

OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/WptPtEditorFragmentNew.java

@@ -359,7 +359,7 @@ public class WptPtEditorFragmentNew extends PointEditorFragmentNew {
 
 	@Override
 	public void setBackgroundType(BackgroundType backgroundType) {
-		this.backgroundTypeName = backgroundType.name();
+		this.backgroundTypeName = backgroundType.getTypeName();
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/monitoring/MonitoringSettingsFragment.java

@@ -306,7 +306,7 @@ public class MonitoringSettingsFragment extends BaseSettingsFragment
 				return false;
 			}
 		}
-		return true;
+		return super.onPreferenceChange(preference, newValue);
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/settings/BaseSettingsFragment.java

@@ -4,10 +4,13 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,6 +47,7 @@ import androidx.preference.TwoStatePreference;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.snackbar.Snackbar;
 
 import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
@@ -51,6 +55,7 @@ import net.osmand.access.AccessibilitySettingsFragment;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.CommonPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
@@ -63,6 +68,7 @@ import net.osmand.plus.osmedit.OsmEditingFragment;
 import net.osmand.plus.profiles.SelectAppModesBottomSheetDialogFragment;
 import net.osmand.plus.profiles.SelectAppModesBottomSheetDialogFragment.AppModeChangedListener;
 import net.osmand.plus.settings.bottomsheets.BooleanPreferenceBottomSheet;
+import net.osmand.plus.settings.bottomsheets.ChangeGeneralProfilesPrefBottomSheet;
 import net.osmand.plus.settings.bottomsheets.EditTextPreferenceBottomSheet;
 import net.osmand.plus.settings.bottomsheets.MultiSelectPreferencesBottomSheet;
 import net.osmand.plus.settings.bottomsheets.SingleSelectPreferenceBottomSheet;
@@ -72,6 +78,8 @@ import net.osmand.plus.settings.preferences.SwitchPreferenceEx;
 
 import org.apache.commons.logging.Log;
 
+import java.io.Serializable;
+
 import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SETTINGS_ID;
 
 public abstract class BaseSettingsFragment extends PreferenceFragmentCompat implements OnPreferenceChangeListener,
@@ -101,42 +109,48 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 
 	public enum SettingsScreenType {
 
-		MAIN_SETTINGS(MainSettingsFragment.TAG, false, R.xml.settings_main_screen, R.layout.global_preference_toolbar),
-		GLOBAL_SETTINGS(GlobalSettingsFragment.class.getName(), false, R.xml.global_settings, R.layout.global_preference_toolbar),
-		CONFIGURE_PROFILE(ConfigureProfileFragment.class.getName(), true, R.xml.configure_profile, R.layout.profile_preference_toolbar_with_switch),
-		PROXY_SETTINGS(ProxySettingsFragment.class.getName(), false, R.xml.proxy_preferences, R.layout.global_preferences_toolbar_with_switch),
-		GENERAL_PROFILE(GeneralProfileSettingsFragment.class.getName(), true, R.xml.general_profile_settings, R.layout.profile_preference_toolbar),
-		NAVIGATION(NavigationFragment.class.getName(), true, R.xml.navigation_settings_new, R.layout.profile_preference_toolbar),
-		COORDINATES_FORMAT(CoordinatesFormatFragment.class.getName(), true, R.xml.coordinates_format, R.layout.profile_preference_toolbar),
-		ROUTE_PARAMETERS(RouteParametersFragment.class.getName(), true, R.xml.route_parameters, R.layout.profile_preference_toolbar),
-		SCREEN_ALERTS(ScreenAlertsFragment.class.getName(), true, R.xml.screen_alerts, R.layout.profile_preference_toolbar_with_switch),
-		VOICE_ANNOUNCES(VoiceAnnouncesFragment.class.getName(), true, R.xml.voice_announces, R.layout.profile_preference_toolbar_with_switch),
-		VEHICLE_PARAMETERS(VehicleParametersFragment.class.getName(), true, R.xml.vehicle_parameters, R.layout.profile_preference_toolbar),
-		MAP_DURING_NAVIGATION(MapDuringNavigationFragment.class.getName(), true, R.xml.map_during_navigation, R.layout.profile_preference_toolbar),
-		TURN_SCREEN_ON(TurnScreenOnFragment.class.getName(), true, R.xml.turn_screen_on, R.layout.profile_preference_toolbar_with_switch),
-		DATA_STORAGE(DataStorageFragment.class.getName(), false, R.xml.data_storage, R.layout.global_preference_toolbar),
-		DIALOGS_AND_NOTIFICATIONS_SETTINGS(DialogsAndNotificationsSettingsFragment.class.getName(), false, R.xml.dialogs_and_notifications_preferences, R.layout.global_preferences_toolbar_with_switch),
-		PROFILE_APPEARANCE(ProfileAppearanceFragment.TAG, true, R.xml.profile_appearance, R.layout.profile_preference_toolbar),
-		OPEN_STREET_MAP_EDITING(OsmEditingFragment.class.getName(), false, R.xml.osm_editing, R.layout.global_preference_toolbar),
-		MULTIMEDIA_NOTES(MultimediaNotesFragment.class.getName(), true, R.xml.multimedia_notes, R.layout.profile_preference_toolbar),
-		MONITORING_SETTINGS(MonitoringSettingsFragment.class.getName(), true, R.xml.monitoring_settings, R.layout.profile_preference_toolbar),
-		LIVE_MONITORING(LiveMonitoringFragment.class.getName(), false, R.xml.live_monitoring, R.layout.global_preferences_toolbar_with_switch),
-		ACCESSIBILITY_SETTINGS(AccessibilitySettingsFragment.class.getName(), true, R.xml.accessibility_settings, R.layout.profile_preference_toolbar),
-		DEVELOPMENT_SETTINGS(DevelopmentSettingsFragment.class.getName(), false, R.xml.development_settings, R.layout.global_preference_toolbar);
+		MAIN_SETTINGS(MainSettingsFragment.TAG, false, null, R.xml.settings_main_screen, R.layout.global_preference_toolbar),
+		GLOBAL_SETTINGS(GlobalSettingsFragment.class.getName(), false, null, R.xml.global_settings, R.layout.global_preference_toolbar),
+		CONFIGURE_PROFILE(ConfigureProfileFragment.class.getName(), true, null, R.xml.configure_profile, R.layout.profile_preference_toolbar_with_switch),
+		PROXY_SETTINGS(ProxySettingsFragment.class.getName(), false, null, R.xml.proxy_preferences, R.layout.global_preferences_toolbar_with_switch),
+		GENERAL_PROFILE(GeneralProfileSettingsFragment.class.getName(), true, MessageType.BOTTOM_SHEET, R.xml.general_profile_settings, R.layout.profile_preference_toolbar),
+		NAVIGATION(NavigationFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.navigation_settings_new, R.layout.profile_preference_toolbar),
+		COORDINATES_FORMAT(CoordinatesFormatFragment.class.getName(), true, MessageType.BOTTOM_SHEET, R.xml.coordinates_format, R.layout.profile_preference_toolbar),
+		ROUTE_PARAMETERS(RouteParametersFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.route_parameters, R.layout.profile_preference_toolbar),
+		SCREEN_ALERTS(ScreenAlertsFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.screen_alerts, R.layout.profile_preference_toolbar_with_switch),
+		VOICE_ANNOUNCES(VoiceAnnouncesFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.voice_announces, R.layout.profile_preference_toolbar_with_switch),
+		VEHICLE_PARAMETERS(VehicleParametersFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.vehicle_parameters, R.layout.profile_preference_toolbar),
+		MAP_DURING_NAVIGATION(MapDuringNavigationFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.map_during_navigation, R.layout.profile_preference_toolbar),
+		TURN_SCREEN_ON(TurnScreenOnFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.turn_screen_on, R.layout.profile_preference_toolbar_with_switch),
+		DATA_STORAGE(DataStorageFragment.class.getName(), false, null, R.xml.data_storage, R.layout.global_preference_toolbar),
+		DIALOGS_AND_NOTIFICATIONS_SETTINGS(DialogsAndNotificationsSettingsFragment.class.getName(), false, null, R.xml.dialogs_and_notifications_preferences, R.layout.global_preferences_toolbar_with_switch),
+		PROFILE_APPEARANCE(ProfileAppearanceFragment.TAG, true, null, R.xml.profile_appearance, R.layout.profile_preference_toolbar),
+		OPEN_STREET_MAP_EDITING(OsmEditingFragment.class.getName(), false, null, R.xml.osm_editing, R.layout.global_preference_toolbar),
+		MULTIMEDIA_NOTES(MultimediaNotesFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.multimedia_notes, R.layout.profile_preference_toolbar),
+		MONITORING_SETTINGS(MonitoringSettingsFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.monitoring_settings, R.layout.profile_preference_toolbar),
+		LIVE_MONITORING(LiveMonitoringFragment.class.getName(), false, null, R.xml.live_monitoring, R.layout.global_preferences_toolbar_with_switch),
+		ACCESSIBILITY_SETTINGS(AccessibilitySettingsFragment.class.getName(), true, MessageType.SNACK_BAR, R.xml.accessibility_settings, R.layout.profile_preference_toolbar),
+		DEVELOPMENT_SETTINGS(DevelopmentSettingsFragment.class.getName(), false, null, R.xml.development_settings, R.layout.global_preference_toolbar);
 
 		public final String fragmentName;
 		public final boolean profileDependent;
+		public final MessageType onChangeMessageType;
 		public final int preferencesResId;
 		public final int toolbarResId;
 
-		SettingsScreenType(String fragmentName, boolean profileDependent, int preferencesResId, int toolbarResId) {
+		SettingsScreenType(String fragmentName, boolean profileDependent, MessageType onChangeMessageType, int preferencesResId, int toolbarResId) {
 			this.fragmentName = fragmentName;
 			this.profileDependent = profileDependent;
+			this.onChangeMessageType = onChangeMessageType;
 			this.preferencesResId = preferencesResId;
 			this.toolbarResId = toolbarResId;
 		}
 	}
 
+	private enum MessageType {
+		SNACK_BAR, BOTTOM_SHEET
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		app = requireMyApplication();
@@ -304,6 +318,23 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 
 	@Override
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
+		MessageType messageType = getMessageType();
+		if (messageType != null) {
+			String prefId = preference.getKey();
+			OsmandSettings.OsmandPreference pref = settings.getPreference(prefId);
+			if (pref instanceof CommonPreference && !((CommonPreference) pref).hasDefaultValueForMode(getSelectedAppMode())) {
+				FragmentManager fragmentManager = getFragmentManager();
+				if (newValue instanceof Serializable) {
+					if (messageType == MessageType.SNACK_BAR) {
+						applyChangeAndSuggestApplyToAllProfiles(prefId, (Serializable) newValue);
+					} else if (messageType == MessageType.BOTTOM_SHEET && fragmentManager != null) {
+						ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, prefId,
+								(Serializable) newValue, this, false, getSelectedAppMode());
+					}
+				}
+				return false;
+			}
+		}
 		return true;
 	}
 
@@ -316,6 +347,10 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 		return currentScreenType != null && currentScreenType.profileDependent;
 	}
 
+	public MessageType getMessageType() {
+		return currentScreenType != null ? currentScreenType.onChangeMessageType : null;
+	}
+
 	@Override
 	public void onDisplayPreferenceDialog(Preference preference) {
 		FragmentManager fragmentManager = getFragmentManager();
@@ -859,4 +894,25 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 			mapActivity.getMapRouteInfoMenu().updateMenu();
 		}
 	}
+
+	protected void applyChangeAndSuggestApplyToAllProfiles(final String prefId, final Serializable newValue) {
+		app.getSettings().setPreference(prefId, newValue, getSelectedAppMode());
+		onSettingApplied(prefId, false);
+		updateSetting(prefId);
+		View containerView = getView();
+		if (containerView != null) {
+			String modeName = appMode.toHumanString();
+			String text = app.getString(R.string.changes_applied_to_profile, modeName);
+			SpannableString message = UiUtilities.createSpannableString(text, modeName, new StyleSpan(Typeface.BOLD));
+			Snackbar snackbar = Snackbar.make(containerView, message, Snackbar.LENGTH_LONG)
+					.setAction(R.string.apply_to_all_profiles, new View.OnClickListener() {
+						@Override
+						public void onClick(View view) {
+							app.getSettings().setPreferenceForAllModes(prefId, newValue);
+							onSettingApplied(prefId, true);
+						}
+					});
+			snackbar.show();
+		}
+	}
 }

OsmAnd/src/net/osmand/plus/settings/GeneralProfileSettingsFragment.java

@@ -354,18 +354,11 @@ public class GeneralProfileSettingsFragment extends BaseSettingsFragment impleme
 	@Override
 	public boolean onPreferenceChange(Preference preference, Object newValue) {
 		String prefId = preference.getKey();
-
-		OsmandSettings.OsmandPreference pref = settings.getPreference(prefId);
-		if (pref instanceof CommonPreference && !((CommonPreference) pref).hasDefaultValueForMode(getSelectedAppMode())) {
-			FragmentManager fragmentManager = getFragmentManager();
-			if (fragmentManager != null && newValue instanceof Serializable) {
-				ChangeGeneralProfilesPrefBottomSheet.showInstance(fragmentManager, prefId,
-						(Serializable) newValue, this, false, getSelectedAppMode());
-			}
+		if (prefId.equals(settings.ROTATE_MAP.getId()) && newValue instanceof Serializable) {
+			applyChangeAndSuggestApplyToAllProfiles(prefId, (Serializable) newValue);
 			return false;
 		}
-
-		return true;
+		return super.onPreferenceChange(preference, newValue);
 	}
 
 	@Override

OsmAnd/src/net/osmand/plus/settings/NavigationFragment.java

@@ -21,6 +21,7 @@ import net.osmand.router.GeneralRouter;
 import net.osmand.router.RoutingConfiguration;
 import net.osmand.util.Algorithms;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;

OsmAnd/src/net/osmand/plus/settings/ScreenAlertsFragment.java

@@ -56,6 +56,7 @@ public class ScreenAlertsFragment extends BaseSettingsFragment {
 				ApplicationMode selectedMode = getSelectedAppMode();
 				boolean checked = !settings.SHOW_ROUTING_ALARMS.getModeValue(selectedMode);
 				settings.SHOW_ROUTING_ALARMS.setModeValue(selectedMode, checked);
+				applyChangeAndSuggestApplyToAllProfiles(settings.SHOW_ROUTING_ALARMS.getId(), checked);
 				updateToolbarSwitch();
 				enableDisablePreferences(checked);
 			}

OsmAnd/src/net/osmand/plus/settings/TurnScreenOnFragment.java

@@ -44,6 +44,7 @@ public class TurnScreenOnFragment extends BaseSettingsFragment {
 				ApplicationMode selectedMode = getSelectedAppMode();
 				boolean checked = !settings.TURN_SCREEN_ON_ENABLED.getModeValue(selectedMode);
 				settings.TURN_SCREEN_ON_ENABLED.setModeValue(selectedMode, checked);
+				applyChangeAndSuggestApplyToAllProfiles(settings.TURN_SCREEN_ON_ENABLED.getId(), checked);
 				updateToolbarSwitch();
 				enableDisablePreferences(checked);
 			}

OsmAnd/src/net/osmand/plus/settings/VoiceAnnouncesFragment.java

@@ -51,6 +51,7 @@ public class VoiceAnnouncesFragment extends BaseSettingsFragment {
 				ApplicationMode selectedMode = getSelectedAppMode();
 				boolean checked = !settings.VOICE_MUTE.getModeValue(selectedMode);
 				settings.VOICE_MUTE.setModeValue(selectedMode, checked);
+				applyChangeAndSuggestApplyToAllProfiles(settings.VOICE_MUTE.getId(), checked);
 				updateToolbarSwitch();
 				enableDisablePreferences(!checked);
 				updateMenu();