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

2020-04-09 15:44:33 +03:00 · 2020-04-09 15:44:33 +03:00 · ff43a62daa
commit ff43a62daa
parent 28df8d4f77 d7638d26c0
27 changed files with 244 additions and 84 deletions
--- a/OsmAnd/res/layout/bottom_sheet_item_title.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_title.xml
@ -5,13 +5,15 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:id="@+id/title"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/bottom_sheet_title_height"
+	android:layout_height="wrap_content"
 	android:ellipsize="end"
 	android:gravity="center_vertical"
-	android:maxLines="1"
+	android:maxLines="5"
 	android:minHeight="@dimen/bottom_sheet_title_height"
 	android:paddingLeft="@dimen/content_padding"
 	android:paddingRight="@dimen/content_padding"
+	android:paddingTop="@dimen/content_padding_small"
+	android:paddingBottom="@dimen/content_padding_small"
 	android:textAppearance="@style/TextAppearance.ListItemTitle"
 	osmand:typeface="@string/font_roboto_medium"
 	tools:text="Some Title"
--- a/OsmAnd/res/layout/fragment_import.xml
+++ b/OsmAnd/res/layout/fragment_import.xml
@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="?attr/activity_background_basic">
+	android:background="?attr/activity_background_color">

 	<ExpandableListView
 		android:id="@+id/list"
@ -103,7 +103,7 @@
 			android:id="@+id/toolbar_layout"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/toolbar_height_expanded"
-			android:background="?attr/colorPrimary"
+			android:background="?attr/actionModeBackground"
 			osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
 			osmand:expandedTitleMarginEnd="@dimen/content_padding"
 			osmand:expandedTitleMarginStart="@dimen/content_padding"
--- a/OsmAnd/res/layout/fragment_import_complete.xml
+++ b/OsmAnd/res/layout/fragment_import_complete.xml
@ -4,7 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:background="?attr/activity_background_basic">
+	android:background="?attr/activity_background_color">

 	<androidx.core.widget.NestedScrollView
 		android:id="@+id/nested_scroll"
@ -101,7 +101,7 @@
 			android:id="@+id/toolbar_layout"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/toolbar_height_expanded"
-			android:background="?attr/colorPrimary"
+			android:background="?attr/actionModeBackground"
 			osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
 			osmand:expandedTitleMarginEnd="@dimen/content_padding"
 			osmand:expandedTitleMarginStart="@dimen/content_padding"
--- a/OsmAnd/res/layout/fragment_import_duplicates.xml
+++ b/OsmAnd/res/layout/fragment_import_duplicates.xml
@ -4,7 +4,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:background="?attr/activity_background_basic">
+	android:background="?attr/activity_background_color">

 	<androidx.core.widget.NestedScrollView
 		android:id="@+id/nested_scroll"
@ -112,7 +112,7 @@
 			android:id="@+id/toolbar_layout"
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/toolbar_height_expanded"
-			android:background="?attr/colorPrimary"
+			android:background="?attr/actionModeBackground"
 			osmand:expandedTitleMarginBottom="@dimen/content_padding_small"
 			osmand:expandedTitleMarginEnd="@dimen/content_padding"
 			osmand:expandedTitleMarginStart="@dimen/content_padding"
--- a/OsmAnd/res/layout/list_item_import.xml
+++ b/OsmAnd/res/layout/list_item_import.xml
@ -23,7 +23,12 @@
 				android:id="@+id/icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/content_padding"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginTop="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/list_content_padding_large"
+				android:layout_marginRight="@dimen/list_content_padding_large"
+				android:layout_marginBottom="@dimen/content_padding"
 				tools:src="@drawable/ic_action_offroad" />

 			<LinearLayout
--- a/OsmAnd/res/layout/profile_data_list_item_child.xml
+++ b/OsmAnd/res/layout/profile_data_list_item_child.xml
@ -22,7 +22,12 @@
 				android:id="@+id/icon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/content_padding"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginTop="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/list_content_padding_large"
+				android:layout_marginRight="@dimen/list_content_padding_large"
+				android:layout_marginBottom="@dimen/content_padding"
 				tools:src="@drawable/ic_action_info_dark" />

 			<LinearLayout
--- a/OsmAnd/res/layout/profile_data_list_item_group.xml
+++ b/OsmAnd/res/layout/profile_data_list_item_group.xml
@ -28,7 +28,12 @@
 				android:id="@+id/explist_indicator"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_margin="@dimen/content_padding"
+				android:layout_marginStart="@dimen/content_padding"
+				android:layout_marginLeft="@dimen/content_padding"
+				android:layout_marginTop="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/list_content_padding_large"
+				android:layout_marginRight="@dimen/list_content_padding_large"
+				android:layout_marginBottom="@dimen/content_padding"
 				android:src="@drawable/ic_action_arrow_down" />

 			<LinearLayout
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@ -829,7 +829,7 @@
    <string name="map_widget_monitoring_services">Serveis d\'enregistrament</string>
    <string name="av_def_action_video">Enregistra un vídeo</string>
    <string name="av_def_action_audio">Enregistra un so</string>
-    <string name="av_video_format_descr">Seleccioneu el format de sortida de vídeo.</string>
+    <string name="av_video_format_descr">Format de sortida de vídeo:</string>
    <string name="av_settings_descr">Configureu les preferències de so i vídeo.</string>
    <string name="av_settings">Configuració d\'àudio/vídeo </string>
    <string name="recording_error">L\'enregistrament ha fallat</string>
@ -838,8 +838,8 @@
    <string name="recording_context_menu_play">Reprodueix</string>
    <string name="map_widget_av_notes">Notes d\'àudio</string>
    <string name="dropbox_plugin_name">Connector del Dropbox</string>
-    <string name="dropbox_plugin_description">El connector de Dropbox us permet sincronitzar traces i notes d\'àudio i vídeo amb el vostre compte de Dropbox.</string>
-    <string name="av_widget_action_descr">Seleccioneu l\'acció per defecte del giny.</string>
+    <string name="dropbox_plugin_description">Sincronitzeu traces i notes d\'àudio i vídeo amb el vostre compte de Dropbox.</string>
+    <string name="av_widget_action_descr">Acció per defecte del giny:</string>
    <string name="av_widget_action">Acció per defecte del giny</string>
    <string name="recording_open_external_player">Obre un reproductor extern</string>
    <string name="recording_context_menu_arecord">Enregistra una nota d\'àudio</string>
@ -862,7 +862,7 @@
    <string name="recording_default_name">Enregistrament</string>
    <string name="recording_description">Enregistrament %1$s %3$s %2$s</string>
    <string name="layer_recordings">Capa d\'enregistraments</string>
-    <string name="recording_can_not_be_played">No es pot reproduir l\'enregistrament</string>
+    <string name="recording_can_not_be_played">No s\'ha pogut reproduir l\'enregistrament.</string>
    <string name="shared_string_control_stop">Atura</string>
    <string name="srtm_paid_version_msg">Considereu comprar el connector de corbes de nivell per recolzar el seu desenvolupament futur.</string>
    <string name="srtm_paid_version_title">Connector de corbes de nivell</string>
@ -938,7 +938,7 @@
    <string name="direction_style_sidewise">Lateral (8 sectors)</string>
    <string name="direction_style_clockwise">Sentit horari (12 sectors)</string>
    <string name="sd_dir_not_accessible">No es pot accedir a la carpeta d\'emmagatzematge de la targeta de memòria!</string>
-    <string name="please_select_address">Seleccioneu primer un municipi o carrer</string>
+    <string name="please_select_address">Estableix primer un municipi o carrer</string>
    <string name="search_street_in_neighborhood_cities">Cerca un carrer en els municipis propers</string>
    <string name="intermediate_items_sort_by_distance">Ordenació porta a porta</string>
    <string name="delete_point">Suprimeix el punt</string>
@ -972,10 +972,10 @@
    <string name="street_name">Nom de carrer</string>
    <string name="hno">Número</string>
    <string name="monitoring_settings">Enregistrament del trajecte</string>
-    <string name="choose_osmand_theme_descr">Seleccioneu l\'aspecte de l\'aplicació.</string>
+    <string name="choose_osmand_theme_descr">Personalitzeu l\'aspecte de l\'aplicació.</string>
    <string name="choose_osmand_theme">Aspecte gràfic</string>
    <string name="accessibility_options">Opcions d\'accessibilitat</string>
-    <string name="select_address_activity">Seleccioneu l\'adreça</string>
+    <string name="select_address_activity">Indiqueu l\'adreça</string>
    <string name="favourites_list_activity">Seleccioneu el Preferit</string>
    <string name="local_openstreetmap_act_title">Modificacions de l\'OSM</string>
    <string name="shared_string_more_actions">Altres accions</string>
@ -1007,7 +1007,7 @@
 \n * Premeu contínuament al mapa per suprimir el punt anterior. 
 \n * Premeu contínuament un punt per veure\'n i afegir-hi una descripció. 
 \n * Premeu el giny de mesura per veure més accions.</string>
-    <string name="av_def_action_choose">Selecciona sota demanda</string>
+    <string name="av_def_action_choose">Sota demanda\?</string>
    <string name="background_service_provider">Proveïdor de la ubicació</string>
    <string name="converting_names">S\'estan convertint els noms nadius/anglesos …</string>
    <string name="save_track_interval_descr">Indiqueu l\'interval d\'enregistrament de traces a desar durant la navegació</string>
@ -1018,7 +1018,7 @@
    <string name="poi_error_poi_not_found">No s\'ha trobat el node, o la instal·lació consta de diferents nodes, i això encara no s\'admet.</string>
    <string name="poi_error_io_error_template">S\'ha produït un error d\'E/S durant l\'acció {0}.</string>
    <string name="speak_title">Anuncia…</string>
-    <string name="speak_descr">Configureu la notificació dels noms de carrer, incidències de trànsit (cues, bandes sonores), avisos de radar, límits de velocitat.</string>
+    <string name="speak_descr">Configureu la notificació dels noms de carrer, incidències de trànsit (cues, bandes sonores), avisos de radar i límits de velocitat.</string>
    <string name="speak_street_names">Noms de carrers (TTS)</string>
    <string name="speak_speed_limit">Límit de velocitat</string>
    <string name="speak_cameras">Radars</string>
@ -1034,7 +1034,7 @@
    <string name="route_via">Via:</string>
    <string name="route_from">Des de:</string>
    <string name="destination_point">Destinació %1$s</string>
-    <string name="local_osm_changes_backup_failed">No s\'han pogut desar els canvis d\'OSM</string>
+    <string name="local_osm_changes_backup_failed">No s\'han pogut desar els canvis d\'OSM.</string>
    <string name="local_osm_changes_backup">Desa com un canvi OSM</string>
    <string name="index_name_openmaps">OpenMaps.eu</string>
    <string name="av_photo_play_sound">Reprodueix el so en fer una foto</string>
@ -1043,14 +1043,14 @@
    <string name="osb_comment_dialog_error">No s\'ha pogut afegir el comentari.</string>
    <string name="osb_author_dialog_password">Contrasenya de l\'OSM (opcional)</string>
    <string name="amenity_type_seamark">Balisa marina</string>
-    <string name="app_modes_choose_descr">Seleccioneu els perfils per donar visibilitat en l\'aplicació.</string>
+    <string name="app_modes_choose_descr">Seleccioneu els perfils a mostrar.</string>
    <string name="app_modes_choose">Perfils de l\'aplicació</string>
    <string name="map_widget_map_rendering">Renderitzat del mapa</string>
    <string name="app_mode_hiking">Senderisme</string>
    <string name="app_mode_motorcycle">Moto</string>
    <string name="app_mode_boat">Vaixell</string>
    <string name="app_mode_aircraft">Avió</string>
-    <string name="local_osm_changes_delete_all_confirm">Ara suprimireu %1$d canvis de l\'OSM. N\'esteu segur?</string>
+    <string name="local_osm_changes_delete_all_confirm">Esteu segurs que voleu esborrar %1$d canvis de l\'OSM\?</string>
    <string name="shared_string_delete_all">Suprimeix-ho tot</string>
    <string name="animate_routing_route_not_calculated">Calculeu primer la ruta</string>
    <string name="animate_routing_route">Simulació amb la ruta calculada </string>
@ -1094,7 +1094,7 @@
    <string name="disable_complex_routing_descr">Desactiva el càlcul de ruta en dues fases per navegació amb cotxe.</string>
    <string name="disable_complex_routing">Desactiva el càlcul complex de la ruta</string>
    <string name="edit_tilesource_successfully">El proveïdor de tessel·les %1$s estava desat</string>
-    <string name="edit_tilesource_choose_existing">Tria existent…</string>
+    <string name="edit_tilesource_choose_existing">Selecciona existent…</string>
    <string name="map_widget_fps_info">Info depuració FPS</string>
    <string name="intermediate_items_sort_return">Ordre optimitzat de les fites de la ruta fins a la destinació.</string>
    <string name="osmand_distance_planning_plugin_description">Creació d\'itineraris prement el mapa o utilitzant o modificant fitxers GPX existents, per planificar un trajecte i mesurar la distància entre punts. El resultat es pot desar com un fitxer GPX que podreu usar més endavant com una referència.</string>
@ -2480,7 +2480,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="live_monitoring_max_interval_to_send_desrc">Especifiqueu una memòria intermèdia temporal per desar les ubicacions a enviar mentre no hi ha connexió</string>
    <string name="measurement_tool_action_bar">Consulteu el mapa i afegiu punts</string>
    <string name="measurement_tool">Mesurament de distàncies</string>
-    <string name="mappilary_no_internet_desc">Necessiteu estar connectat a internet per veure les fotografies de Mapillary.</string>
+    <string name="mappilary_no_internet_desc">Les fotografies de Mapillary només són disponibles en línia.</string>
    <string name="retry">Torneu a provar</string>
    <string name="none_point_error">Afegiu un punt si més no.</string>
    <string name="enter_gpx_name">Nom del fitxer GPX:</string>
@ -2663,7 +2663,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="winter_and_ski_renderer">Hivern i esquí</string>
    <string name="touring_view_renderer">Vista turística</string>
    <string name="nautical_renderer">Nàutica</string>
-    <string name="copy_location_name">Còpia Punt/PDI nom</string>
+    <string name="copy_location_name">Copia nom d\'ubicació/PDI</string>
    <string name="toast_empty_name_error">Ubicació sense nom</string>
    <string name="show_closed_notes">Mostra notes amagades</string>
    <string name="switch_osm_notes_visibility_desc">Mostra/amaga notes OSM en el mapa.</string>
@ -2784,8 +2784,8 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="download_all">Baixa-ho tot</string>
    <string name="hide_full_description">Amaga la descripció completa</string>
    <string name="show_full_description">Mostra la descripció completa</string>
-    <string name="nautical_render_descr">Estil nàutic. Principals característiques: boies, fars, rutes fluvials, rutes i referències marítimes, ports, serveis de navegació assistida, isòbates.</string>
-    <string name="ski_map_render_descr">Estil per l\'esquí. Principals característiques: representació de pistes, remuntadors i altres característiques d\'esquí de forma adient. Menys objectes secundaris del mapa que distreguin.</string>
+    <string name="nautical_render_descr">"Per a navegació nàutica.  Compta amb boies, fars, rutes fluvials, rutes i referències marítimes, ports, serveis de navegació assistida i isòbates."</string>
+    <string name="ski_map_render_descr">Per a esquiar. Compta amb pistes, remuntadors, rutes d\'esquí de fons, etc. Atenúa objectes de mapes secundaris.</string>
    <string name="light_rs_render_descr">"Estil senzill i contrastat per navegació amb el cotxe. En mode nocturn té cura de la vista.  Principals característiques: corbes de nivell, vies contrastades d\'estil ataronjat, menys objectes secundaris al mapa que puguin distreure."</string>
    <string name="wiki_article_search_text">Buscant el corresponent article a la wiki</string>
    <string name="shared_string_bookmark">Adreça d\'interès</string>
@ -3135,7 +3135,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="routing_profile_geocoding">Geocodificació</string>
    <string name="zoom_by_wunderlinq_descr">Canvieu el zoom del mapa girant la roda amunt i avall. La tecla Esc us retornarà a l\'aplicació WunderLINQ.</string>
    <string name="zoom_by_wunderlinq">Utilitzeu WunderLINQ per al control</string>
-    <string name="quick_action_need_to_add_item_to_list">Heu d\'afegir com a mínim un element a la llista a la configuració de l\'acció ràpida</string>
+    <string name="quick_action_need_to_add_item_to_list">Afegir com a mínim un element a la llista a la configuració de l\'acció ràpida</string>
    <string name="routing_attr_piste_type_downhill_description">Pistes per esquí alpí o eslàlom i accés als remuntadors.</string>
    <string name="routing_attr_piste_type_sled_name">Trineu</string>
    <string name="routing_attr_piste_type_sled_description">Pistes per utilitzar trineu.</string>
@ -3199,7 +3199,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="external_input_device">Dispositius d\'entrada externs</string>
    <string name="external_input_device_descr">Seleccioneu un aparell com a teclat genèric o WunderLINQ per a controls externs.</string>
    <string name="sett_no_ext_input">Cap</string>
-    <string name="sett_generic_ext_input">Teclat genèric</string>
+    <string name="sett_generic_ext_input">Teclat</string>
    <string name="sett_wunderlinq_ext_input">WunderLINQ</string>
    <string name="sett_parrot_ext_input">Parrot</string>
    <string name="routing_attr_piste_type_skitour_name">Esquí de ruta</string>
@ -3268,16 +3268,16 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="change_osmand_data_folder_question">Voleu canviar la carpeta de dades de OsmAnd\?</string>
    <string name="move_maps_to_new_destination">Desplaça a la nova destinació</string>
    <string name="avoid_in_routing_descr_">Evita determinades rutes i tipus de carretera</string>
-    <string name="internal_app_storage_description">Emmagatzematge intern, amagat a l\'usuari i a les altres aplicacions i que només OsmAnd hi pot accedir</string>
+    <string name="internal_app_storage_description">Emmagatzematge intern per a OsmAnd, (amagat a l\'usuari i a les altres aplicacions).</string>
    <string name="change_data_storage_folder">Canvia la carpeta d\'emmagatzematge</string>
    <string name="rendering_attr_piste_type_snow_park_name">Pista de terra</string>
    <string name="rendering_attr_piste_type_sleigh_name">Trineu</string>
    <string name="app_mode_utv">Costat a costat</string>
-    <string name="release_3_5">• S\'ha actualitzat la configuració de l\'aplicació i dels perfils: La configuració s\'agrupa per tipus. Cada perfil es pot ajustar independentment.
+    <string name="release_3_5">• S\'ha actualitzat la configuració de l\'aplicació i dels perfils: La configuració s\'agrupa per tipus. Cada perfil es pot ajustar independentment. 
 \n 
 \n • Diàleg nou de baixades de mapa que suggereix un mapa per baixar-lo mentre es navega 
 \n 
-\n • Correccions al tema nocturn 
+\n • Correccions al tema fosc 
 \n 
 \n • Corregits problemes de ruta a tot el món 
 \n 
@ -3325,20 +3325,20 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="shared_string_memory_used_mb_desc">%1$s MB utilitzats</string>
    <string name="shared_string_memory_used_kb_desc">%1$s kB utilitzats</string>
    <string name="contour_lines_and_hillshade">Corbes de nivell i ombrejat de relleu</string>
-    <string name="routing_attr_prefer_unpaved_name">Millor les carreteres sense asfaltar</string>
-    <string name="routing_attr_prefer_unpaved_description">Millor les carreteres sense asfaltar.</string>
+    <string name="routing_attr_prefer_unpaved_name">Prefereix carreteres sense asfaltar</string>
+    <string name="routing_attr_prefer_unpaved_description">Prefereix carreteres sense asfaltar.</string>
    <string name="update_all_maps">Actualitza tots els mapes</string>
    <string name="update_all_maps_q">Esteu segur que voleu actualitzar tots els mapes (%1$d)\?</string>
-    <string name="apply_preference_to_all_profiles">Podeu aplicar aquest canvi a tots els perfils o només al que ara tingueu seleccionat.</string>
+    <string name="apply_preference_to_all_profiles">Podeu aplicar aquest canvi a tots els perfils o només al que tingueu seleccionat.</string>
    <string name="shared_preference">Compartit</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_name">Millor les carreteres sense asfaltar</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_description">Millor les carreteres sense asfaltar.</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_name">Prefereix carreteres sense asfaltar</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_description">Prefereix carreteres sense asfaltar a les asfaltades al generar rutes.</string>
    <string name="layer_osm_edits">Edicions a OSM</string>
-    <string name="quick_action_contour_lines_descr">Un botó per a mostrar o amagar les corbes de nivell en el mapa.</string>
+    <string name="quick_action_contour_lines_descr">Botó per a mostrar o amagar les corbes de nivell en el mapa.</string>
    <string name="quick_action_contour_lines_show">Mostra les corbes de nivell</string>
    <string name="quick_action_contour_lines_hide">Amaga les corbes de nivell</string>
    <string name="quick_action_show_hide_contour_lines">Mostra/amaga les corbes de nivell</string>
-    <string name="quick_action_hillshade_descr">Un botó per a mostrar o amagar l\'ombrejat de relleu al mapa.</string>
+    <string name="quick_action_hillshade_descr">Botó per a mostrar o amagar l\'ombrejat de relleu al mapa.</string>
    <string name="quick_action_hillshade_show">Mostra l\'ombrejat de relleu</string>
    <string name="quick_action_hillshade_hide">Amaga l\'ombrejat de relleu</string>
    <string name="quick_action_show_hide_hillshade">Mostra/amaga l\'ombrejat de relleu</string>
@ -3423,13 +3423,13 @@ Abasta l\'àrea: %1$s x %2$s</string>
    <string name="simulate_your_location_gpx_descr">Simula la vostra posició fent servir una traça GPX enregistrada.</string>
    <string name="rendering_value_thick_name">Gruix</string>
    <string name="select_navigation_icon">Icona de posició en moviment</string>
-    <string name="select_map_icon">Seleccioneu la icona del mapa</string>
-    <string name="delete_profiles_descr">Si toqueu Aplica, els perfils suprimits es perdran definitivament.</string>
+    <string name="select_map_icon">Icona de posició en repòs</string>
+    <string name="delete_profiles_descr">Al prémer \'Aplica\', s\'esborraran definitivament els perfils suprimits.</string>
    <string name="master_profile">Perfil principal</string>
    <string name="select_color">Seleccioneu el color</string>
-    <string name="edit_profiles_descr">No podeu suprimir els perfils predeterminats de l\'OsmAnd, però podeu desactivar-los en la pantalla anterior, o moure\'ls a la part inferior.</string>
+    <string name="edit_profiles_descr">Els perfils predeterminats de l\'OsmAnd no no poden ser esborrats, però podeu desactivar-los (a la pantalla anterior), o ordenar-los cap a la part inferior.</string>
    <string name="edit_profiles">Edita els perfils</string>
-    <string name="select_nav_profile_dialog_message">El tipus de navegació determina les regles de càlcul de les rutes.</string>
+    <string name="select_nav_profile_dialog_message">El \'tipus de navegació\' determina com es calculen les rutes.</string>
    <string name="profile_appearance">Aparença del perfil</string>
    <string name="choose_icon_color_name">Icona, color i nom</string>
    <string name="reorder_profiles">Edita la llista de perfils</string>
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@ -3594,4 +3594,9 @@ Repræsenterer område: %1$s x %2$s</string>
    <string name="settings_item_write_error">Kunne ikke skrive til %1$s.</string>
    <string name="settings_item_import_error">Kunne ikke importere %1$s.</string>
    <string name="replace_point_descr">Erstat et andet punkt med dette</string>
+    <string name="select_track_file">Vælg sporfil</string>
+    <string name="shared_string_languages">Sprog</string>
+    <string name="shared_string_language">Sprog</string>
+    <string name="shared_string_all_languages">Alle sprog</string>
+    <string name="wiki_menu_download_descr">Yderligere kort er nødvendige for at se Wikipedia Interessepunkter på kortet.</string>
 </resources>
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@ -1101,11 +1101,11 @@
    <string name="poi_memorial_war">Kriegsdenkmal</string>
    <string name="poi_memorial_statue">Statue</string>
    <string name="poi_memorial_stone">Stein</string>
-    <string name="poi_resource_aggregate">Generator</string>
+    <string name="poi_resource_aggregate">Mineral-Aggregat</string>
    <string name="poi_resource_dolomite">Dolomit</string>
    <string name="poi_resource_gas">Gas</string>
    <string name="poi_resource_gold">Gold</string>
-    <string name="poi_resource_graphite">Grafit</string>
+    <string name="poi_resource_graphite">Graphit</string>
    <string name="poi_resource_mineral_oil">Mineralöl</string>
    <string name="poi_resource_oil">Erdöl</string>
    <string name="poi_resource_salt">Salz</string>
@ -1167,7 +1167,7 @@
    <string name="poi_clothes_costumes">Kostüme</string>
    <string name="poi_clothes_traditional">Traditionell</string>
    <string name="poi_clothes_suits">Anzüge</string>
-    <string name="poi_clothes_oversize">Übergröße</string>
+    <string name="poi_clothes_oversize">Übergrößen</string>
    <string name="poi_clothes_schoolwear">Schule</string>
    <string name="poi_clothes_swimwear">Bademode</string>
    <string name="poi_clothes_socks">Socken</string>
@ -1346,7 +1346,7 @@
    <string name="poi_logging">Holzfällen</string>
    <string name="poi_sand">Sand</string>
    <string name="poi_windfall">Fallobst</string>
-    <string name="poi_dead_wood">Todwald</string>
+    <string name="poi_dead_wood">Totholz</string>
    <string name="poi_level">In Etage</string>
    <string name="poi_rtsa_scale">RTSA-Skala</string>
    <string name="poi_piste_difficulty_easy">Einfach</string>
@ -1611,7 +1611,7 @@
    <string name="poi_information_trail_blaze">Wegmarkierung</string>
    <string name="poi_information_terminal">Auskunft</string>
    <string name="poi_information_tactile_model">Tastbares Modell</string>
-    <string name="poi_information_tactile_map">Tastbare Karte</string>
+    <string name="poi_information_tactile_map">Blindengrafik</string>
    <string name="poi_retail">Einzelhandel</string>
    <string name="poi_smoking_isolated">In einem abgetrennten Raum</string>
    <string name="poi_smoking_dedicated">Nur für Raucher</string>
@ -2038,7 +2038,7 @@
    <string name="poi_industrial_timber">Art: Bauholz</string>
    <string name="poi_industrial_refinery">Art: Raffinerie</string>
    <string name="poi_industrial_warehouse">Art: Warenhaus</string>
-    <string name="poi_industrial_auto_wrecker">Art: KFZ Schrotthändler</string>
+    <string name="poi_industrial_auto_wrecker">Art: KFZ-Verschrottung</string>
    <string name="poi_industrial_agriculture">Art: Landwirtschaft</string>
    <string name="poi_industrial_brewery">Art: Brauerei</string>
    <string name="poi_industrial_brickyard">Art: Ziegelei</string>
@ -2087,7 +2087,7 @@
    <string name="poi_crop_strawberry">Anbauprodukt: Erdbeere</string>
    <string name="poi_crop_vegetables_flowers">Anbauprodukt: Gemüse, Blumen</string>
    <string name="poi_crop_cassava">Anbauprodukt: Maniok</string>
-    <string name="poi_crop_cranberry">Anbauprodukt: Preiselbeere</string>
+    <string name="poi_crop_cranberry">Anbauprodukt: Moosbeere</string>
    <string name="poi_crop_asparagus">Anbauprodukt: Spargel</string>
    <string name="poi_crop_flowers">Anbauprodukt: Blumen</string>
    <string name="poi_surveillance_indoor">Überwachung: innen</string>
@ -2237,7 +2237,7 @@
    <string name="poi_stone_type_conciliation_cross">Art: Steinkreuz</string>
    <string name="poi_site_type_hut_circle">Hüttenkreis</string>
    <string name="poi_site_type_petroglyph">Felsbild</string>
-    <string name="poi_megalith_type_nuraghe">Grabtyp: prähistorische Turmbauten</string>
+    <string name="poi_megalith_type_nuraghe">Grabtyp: Nuraghe</string>
    <string name="poi_megalith_type_stone_circle">Grabtyp: Steinkreis</string>
    <string name="poi_megalith_type_passage_grave">Grabtyp: Ganggrab</string>
    <string name="poi_summit_cross">Gipfelkreuz: ja</string>
@ -2918,7 +2918,7 @@
    <string name="poi_cuisine_bubble_tea">Bubble Tea</string>
    <string name="poi_cuisine_meat">Fleisch</string>
    <string name="poi_cuisine_wings">Flügel</string>
-    <string name="poi_cuisine_waffle">Waffel</string>
+    <string name="poi_cuisine_waffle">Waffeln</string>
    <string name="poi_cuisine_chocolate">Schokolade</string>
    <string name="poi_cuisine_wine">Wein</string>
    <string name="poi_health_specialty">Medizinisches Fachgebiet</string>
@ -3819,6 +3819,6 @@
    <string name="poi_seamark_obstruction">Behinderung</string>
    <string name="poi_drinking_water_refill_yes">Trinkwassernachfüllung: ja</string>
    <string name="poi_drinking_water_refill_no">Trinkwassernachfüllung: nein</string>
-    <string name="poi_drinking_water_refill_network">Trinkwasser-Nachfüllnetzwerk</string>
+    <string name="poi_drinking_water_refill_network">Trinkwasser-Nachfüllnetz</string>
    <string name="poi_internet_access_fee_customers">Internetzugangsgebühr für Kunden</string>
 </resources>
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@ -3621,4 +3621,11 @@ Lon %2$s</string>
    <string name="settings_item_read_error">Konnte %1$s nicht lesen.</string>
    <string name="settings_item_write_error">Konnte %1$s nicht schreiben.</string>
    <string name="settings_item_import_error">Konnte %1$s nicht importieren.</string>
+    <string name="select_track_file">Wählen Sie eine Pfad-Datei</string>
+    <string name="shared_string_languages">Sprachen</string>
+    <string name="shared_string_language">Sprache</string>
+    <string name="shared_string_all_languages">Alle Sprachen</string>
+    <string name="wikipedia_poi_languages_promo">Einige Wikipedia-Artikel könnten nicht in Ihrer Sprache verfügbar. Wählen Sie die Sprachen aus, in der Wikipedia-Artikel auf der Karte erscheinen sollen.
+\nSie können beim Lesen des Artikels zwischen allen verfügbaren Sprachen wechseln.</string>
+    <string name="wiki_menu_download_descr">Zusätzliche Karten werden benötigt um Wikipedia-POIs auf der Karte anzuzeigen.</string>
 </resources>
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@ -2509,7 +2509,7 @@
    <string name="index_name_netherlands">Ευρώπη - Κάτω Χώρες</string>
    <string name="shared_string_others">Άλλα</string>
    <string name="shared_string_release">Εκδόθηκε</string>
-    <string name="create_poi_link_to_osm_doc"> string name=\"lat_lon_pattern\"&gt;Γ. Πλ:%1$.5f Γ. Μηκ: %2$.5f&lt;/string </string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u>κατηγοριοποίηση χάρτη με εικόνες.</string>
    <string name="share_fav_subject">Αγαπημένα που μοιράστηκαν μέσω του OsmAnd</string>
    <string name="favourites_context_menu_add">Προσθήκη αγαπημένου</string>
    <string name="poi_action_delete">διαγραφή</string>
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@ -3172,7 +3172,7 @@ représentant la zone : %1$s x %2$s</string>
    <string name="select_base_profile_dialog_message">Basez votre profil personnel sur l\'un des profils par défaut pour définir les unités de vitesse, de distance ou la visibilité des widgets. Voici les profils par défaut de l\'application ainsi que des exemples de profils personnalisés :</string>
    <string name="temporary_conditional_routing">Prendre en compte les limitations temporaires</string>
    <string name="shared_string_default">Par défaut</string>
-    <string name="gpx_join_gaps">Relier les trous</string>
+    <string name="gpx_join_gaps">Fusionner pour éviter les interruptions</string>
    <string name="app_mode_camper">Campeur</string>
    <string name="app_mode_campervan">Camping-car</string>
    <string name="rendering_attr_showLez_description">Afficher les zones à faible émission sur la carte (n\'influe pas sur le calcul d\'itinéraire).</string>
@ -3348,7 +3348,7 @@ représentant la zone : %1$s x %2$s</string>
    <string name="export_profile_failed">Impossible d\'exporter le profil.</string>
    <string name="profile_import">Importer le profil</string>
    <string name="profile_import_descr">Ajouter un profil en ouvrant son fichier avec OsmAnd.</string>
-    <string name="file_import_error">%1$s Erreur d\'importation : %2$s</string>
+    <string name="file_import_error">Erreur d\'import %1$s : %2$s</string>
    <string name="file_imported_successfully">%1$s importé avec succès.</string>
    <string name="rendering_value_white_name">Blanc</string>
    <string name="swap_two_places">Inverser %1$s et %2$s</string>
@ -3586,4 +3586,11 @@ représentant la zone : %1$s x %2$s</string>
    <string name="settings_item_read_error">Impossible de lire %1$s.</string>
    <string name="settings_item_write_error">Impossible d\'écrire %1$s.</string>
    <string name="settings_item_import_error">Impossible d\'importer %1$s.</string>
+    <string name="wikipedia_poi_languages_promo">Sélectionnez les langues dans lesquelles les articles Wikipédia apparaîtront sur la carte. Certains articles Wikipédia peuvent ne pas être disponibles dans certaines langues.
+\nVous pourrez basculer entre toutes les langues disponibles pendant la lecture de l’article.</string>
+    <string name="select_track_file">Sélectionnez le fichier de trace</string>
+    <string name="shared_string_languages">Langues</string>
+    <string name="shared_string_language">Langue</string>
+    <string name="shared_string_all_languages">Toutes les langues</string>
+    <string name="wiki_menu_download_descr">D’autres cartes sont nécessaires pour afficher les POI Wikipédia sur la carte.</string>
 </resources>
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@ -3602,4 +3602,9 @@
    <string name="monitoring_min_speed_descr">זה מסנן שחותך מהירויות נמוכות כדי לא להקליט נקודות מתחת למהירות מסוימת. הפעלת המסנן תגרום לכך שהמסלולים ייראו חלקים יותר כשמסתכלים על המפה.</string>
    <string name="app_mode_ski_touring">טיולי סקי</string>
    <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
+    <string name="select_track_file">בחירת קובץ מסלול</string>
+    <string name="shared_string_languages">שפות</string>
+    <string name="shared_string_language">שפה</string>
+    <string name="shared_string_all_languages">כל השפות</string>
+    <string name="wiki_menu_download_descr">נדרשות מפות נוספות כדי להציג נקודות עניין של ויקיפדיה על המפה.</string>
 </resources>
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@ -1305,7 +1305,7 @@ POIの更新は利用できません</string>
    <string name="arrival_distance_factor_late">遅め</string>
    <string name="arrival_distance_factor_at_last">最後の数メートル</string>
    <string name="keep_informing_never">手動のみ(矢印をタップ)</string>
-    <string name="create_poi_link_to_osm_doc">" string name=\"lat_lon_pattern\"&gt;\"緯度:%1$.5f  経度:%2$.5f\"&lt;/string "</string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u>マップを画像で分類します。</string>
    <string name="import_file_favourites">経由地点をGPXファイルとして保存、またはお気に入りにインポートしますか？</string>
    <string name="shared_string_share">共有</string>
    <string name="share_fav_subject">OsmAndを介してお気に入りを共有</string>
@ -2839,7 +2839,7 @@ POIの更新は利用できません</string>
    <string name="open_in_browser_wiki">記事をオンラインで開く</string>
    <string name="open_in_browser_wiki_description">ウェブブラウザで記事を閲覧します。</string>
    <string name="download_wiki_region_placeholder">当該地域</string>
-    <string name="markers_remove_dialog_msg">マップマーカー「%s」を削除しますか？</string>
+    <string name="markers_remove_dialog_msg">マップマーカー\'%s\'を削除しますか？</string>
    <string name="edit_map_marker">マップマーカーの編集</string>
    <string name="third_party_application">サードパーティーアプリ</string>
    <string name="search_street">道路検索エリア</string>
@ -2971,7 +2971,7 @@ POIの更新は利用できません</string>
    <string name="avoid_pt_types_descr">ナビゲーション時に使用したくない公共交通機関を指定します:</string>
    <string name="quick_action_day_night_mode">%sモード</string>
    <string name="avoid_pt_types">避けたい移動手段の種類…</string>
-    <string name="save_poi_value_exceed_length">『%s』タグの長さは255文字未満にしてください。</string>
+    <string name="save_poi_value_exceed_length">\"%s\"タグの長さは255文字未満にしてください。</string>
    <string name="save_poi_value_exceed_length_title">\"%s\"値の長さ</string>
    <string name="public_transport_warning_descr_blog">OsmAndのルーティング詳細については、公式ブログをご参照ください。</string>
    <string name="public_transport_warning_title">公共交通機関のナビゲーションは現在ベータテスト中で、エラーや不正確さを含む恐れがあります。</string>
@ -3066,7 +3066,7 @@ POIの更新は利用できません</string>
    <string name="rendering_attr_tracktype_grade4_name">やや軟らか</string>
    <string name="rendering_attr_tracktype_grade5_name">軟らかい</string>
    <string name="routeInfo_tracktype_name">表面硬度</string>
-    <string name="shared_string_file_is_saved">%s は保存されました</string>
+    <string name="shared_string_file_is_saved">%sを保存しました</string>
    <string name="app_mode_camper">キャンパー</string>
    <string name="app_mode_campervan">キャンピングカー</string>
    <string name="rendering_attr_showLez_description">マップ上に低排出ゾーン(CO2排出量の多い車両に課税するエリア)を表示します。ルーティングには影響しません。</string>
@ -3126,7 +3126,7 @@ POIの更新は利用できません</string>
    <string name="profile_alert_need_save_title">変更の保存</string>
    <string name="profile_alert_need_save_msg">一旦プロファイルへ変更を保存する必要があります</string>
    <string name="profile_alert_delete_title">プロファイルの削除</string>
-    <string name="profile_alert_delete_msg">プロファイル 『%s』 を削除してよろしいですか？</string>
+    <string name="profile_alert_delete_msg">プロファイル \"%s\"を削除してよろしいですか？</string>
    <string name="select_base_profile_dialog_title">開始時に表示するプロファイルの選択</string>
    <string name="select_base_profile_dialog_message">カスタムプロファイルは標準のアプリケーションプロファイルを元に作成します。ウィジェットなどの表示設定や速度と距離の単位などの標準設定をプロファイルごとに定義可能です。これらは標準のアプリプロファイルを基本としており、今後それらと共に拡張される可能性があります:</string>
    <string name="select_nav_profile_dialog_title">ナビゲーションタイプの選択</string>
@ -3182,7 +3182,7 @@ POIの更新は利用できません</string>
    <string name="rendering_attr_highway_class_track_grade4_name">グレード4</string>
    <string name="rendering_attr_highway_class_track_grade5_name">グレード5</string>
    <string name="shared_string_open_track">経路を開く</string>
-    <string name="shared_string_track_is_saved">経路%sは保存されました</string>
+    <string name="shared_string_track_is_saved">経路%sを保存しました</string>
    <string name="temporary_conditional_routing">一時的な制限の検討</string>
    <string name="quick_action_need_to_add_item_to_list">『クイックアクション』のリストに最低ひとつは項目を設定する必要があります</string>
    <string name="routing_attr_piste_type_downhill_name">アルペン/ダウンヒルスキー</string>
@ -3405,7 +3405,7 @@ POIの更新は利用できません</string>
    <string name="save_heading">見出しを含める</string>
    <string name="save_heading_descr">記録中の各トラックポイントに見出しも保存します。</string>
    <string name="personal_category_name">パーソナル</string>
-    <string name="shared_string_downloading_formatted">をダウンロード中</string>
+    <string name="shared_string_downloading_formatted">%sをダウンロード中</string>
    <string name="rendering_value_thick_name">濃い</string>
    <string name="desert_render_descr">砂漠などの過疎地に向いたマップスタイルです。各情報の詳細も表示されます。</string>
    <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@ -2474,7 +2474,7 @@
    <string name="enable_plugin_monitoring_services">Aktiver tillegget \"Turopptak\" for å bruke posisjonloggingstjenester (GPX-logging, nettbasert sporing)</string>
    <string name="non_optimal_route_calculation">Beregn mulig ikke-optimal rute over lange avstander</string>
    <string name="vector_data_missing">Last ned (\'nettfrakoblede\') data for å kunne bruke kart nettfrakoblet.</string>
-    <string name="create_poi_link_to_osm_doc"> string name=\"lat_lon_pattern\"&gt;Br: %1$.5f Le: %2$.5f&lt;/string </string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> – kartklassifisering med bilder.</string>
    <string name="quick_action_duplicates">Hurtighandlingsnavn endret til %1$s for å unngå duplisering.</string>
    <string name="quick_action_duplicate">Navneduplisering for hurtighandling</string>
    <string name="osm_recipients_label">OSM-mottakere</string>
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@ -248,7 +248,7 @@
    <string name="install_more">Installeer meer…</string>
    <string name="level_to_switch_vector_raster_descr">Minimum zoomniveau om vectorkaarten in plaats van (raster)kaartsegmenten te gebruiken.</string>
    <string name="level_to_switch_vector_raster">Min. vector zoomniveau</string>
-    <string name="create_poi_link_to_osm_doc"> string name=\"lat_lon_pattern\"&gt;Lat: %1$.5f Lon: %2$.5f&lt;/string </string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> kaart classificatie met afbeeldingen.</string>
    <string name="error_doing_search">Fout bij offline zoeken.</string>
    <string name="search_osm_offline">Zoek adres in de offline kaarten</string>
    <string name="system_locale">Systeem</string>
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@ -3602,4 +3602,11 @@ Pôr do Sol: %2$s</string>
    <string name="settings_item_read_error">Não foi possível ler %1$s.</string>
    <string name="settings_item_write_error">Não foi possível escrever %1$s.</string>
    <string name="settings_item_import_error">Não foi possível importar %1$s.</string>
+    <string name="select_track_file">Selecionar arquivo de faixa</string>
+    <string name="shared_string_languages">Idiomas</string>
+    <string name="shared_string_language">Idioma</string>
+    <string name="shared_string_all_languages">Todos os idiomas</string>
+    <string name="wikipedia_poi_languages_promo">Alguns artigos da Wikipédia podem não estar disponíveis em seu nome. Selecione os idiomas nos quais os artigos da Wikipédia aparecerão no mapa.
+\nVocê poderá alternar entre todos os idiomas disponíveis enquanto lê o artigo.</string>
+    <string name="wiki_menu_download_descr">Mapas adicionais são necessários para visualizar os POIs da Wikipédia no mapa.</string>
 </resources>
--- a/OsmAnd/res/values-ru/phrases.xml
+++ b/OsmAnd/res/values-ru/phrases.xml
@ -653,8 +653,8 @@
    <string name="poi_landmark">Ориентир</string>
    <string name="poi_seamark_light">Маяк (навигационный ориентир)</string>
    <string name="poi_mooring">Причал</string>
-    <string name="poi_notice">Уведомление</string>
-    <string name="poi_radio_station">Радиостанция</string>
+    <string name="poi_notice">Уведомление (навигационный ориентир)</string>
+    <string name="poi_radio_station">Радиостанция (навигационный ориентир)</string>
    <string name="poi_signal_station_traffic">Сигнальная станция</string>
    <string name="poi_signal_station_warning">Сигнал опасности</string>
    <string name="poi_small_craft_facility">Лодочная станция</string>
@ -2815,8 +2815,8 @@
    <string name="poi_fuel_e10">Е10</string>
    <string name="poi_fuel_e20">Е20</string>
    <string name="poi_fuel_e85">E85</string>
-    <string name="poi_seamark_light_float">Бакен с маяком</string>
-    <string name="poi_seamark_light_vessel">Плавучий маяк</string>
+    <string name="poi_seamark_light_float">Бакен с маяком (навигационный ориентир)</string>
+    <string name="poi_seamark_light_vessel">Плавучий маяк (навигационный ориентир)</string>
    <string name="poi_spices">Специи</string>
    <string name="poi_shop_craft">Товары для рукоделия</string>
    <string name="poi_service_bicycle_charging_yes">Зарядка: есть</string>
@ -3267,8 +3267,8 @@
    <string name="poi_denomination_uniting">Объединяющая Церковь в Австралии</string>
    <string name="poi_denomination_reform">Реформистский иудаизм</string>
    <string name="poi_seamark_dyke">Водяной знак: насыпь</string>
-    <string name="poi_radar_transponder">Радиолокационный транспондер (навигационный знак)</string>
-    <string name="poi_topmark">Топовая фигура (навигационный знак)</string>
+    <string name="poi_radar_transponder">Радиолокационный транспондер (навигационный ориентир)</string>
+    <string name="poi_topmark">Топовая фигура (навигационный ориентир)</string>
    <string name="poi_seamark_clearance_height">Габаритная высота</string>
    <string name="poi_seamark_clearance_width">Габаритная ширина</string>
    <string name="poi_youtube">YouTube</string>
@ -3511,7 +3511,7 @@
    <string name="poi_nuclear_explosion_salvo_first_detonation">Взрывной залп: первая детонация залпового теста</string>
    <string name="poi_route_subway_ref">Метро</string>
    <string name="poi_cannabis">Магазин каннабиса</string>
-    <string name="poi_socket_type1_yes">Type 1</string>
+    <string name="poi_socket_type1_yes">Тип 1</string>
    <string name="poi_socket_chademo_yes">CHAdeMO</string>
    <string name="poi_socket_tesla_supercharger_yes">Tesla Supercharger</string>
    <string name="poi_socket_tesla_roadster_yes">Tesla Roadster</string>
@ -3677,7 +3677,7 @@
    <string name="poi_tourist_bus_yes">Доступ для туристического автобуса: да</string>
    <string name="poi_bus_no">Доступ для автобуса: нет</string>
    <string name="poi_caravan_no">Доступ для каравана: нет</string>
-    <string name="poi_motorhome_no">Доступ для дома на колесах: нет</string>
+    <string name="poi_motorhome_no">Доступ для автодома: нет</string>
    <string name="poi_trailer_no">Доступ для трейлера: нет</string>
    <string name="poi_glacier_type_icefall">Ледопад</string>
    <string name="poi_climbing_adventure">Скалолазание</string>
@ -3687,8 +3687,53 @@
    <string name="poi_vhf">УКВ-канал</string>
    <string name="poi_cuisine_shawarma">Шаурма</string>
    <string name="poi_fire_hydrant_type_dry_barrel">Сухой баррель</string>
-    <string name="poi_seamark_clearance_height_open">Высота просвета (открытая)</string>
-    <string name="poi_seamark_clearance_height_closed">Высота просвета (закрытая)</string>
+    <string name="poi_seamark_clearance_height_open">Габаритная высота (открытая)</string>
+    <string name="poi_seamark_clearance_height_closed">Габаритная высота (закрытая)</string>
    <string name="poi_video_telephone">Видео</string>
    <string name="poi_sms">SMS</string>
+    <string name="poi_cuisine_pastel">Пастель</string>
+    <string name="poi_disabled_designated">Выделенный</string>
+    <string name="poi_disabled_yes">Да</string>
+    <string name="poi_goods_designated">Выделенный</string>
+    <string name="poi_goods_yes">Да</string>
+    <string name="poi_hgv_delivery">Доставка</string>
+    <string name="poi_hgv_designated">Выделенный</string>
+    <string name="poi_hgv_destination">Выделенный</string>
+    <string name="poi_hgv_yes">Да</string>
+    <string name="poi_mofa_designated">Выделенный</string>
+    <string name="poi_mofa_yes">Да</string>
+    <string name="poi_moped_designated">Выделенный</string>
+    <string name="poi_motorcycle_designated">Выделенный</string>
+    <string name="poi_motorcycle_destination">Выделенный</string>
+    <string name="poi_motorcycle_yes">Да</string>
+    <string name="poi_trailer_designated">Выделенный</string>
+    <string name="poi_motorhome_designated">Выделенный</string>
+    <string name="poi_motorhome_yes">Да</string>
+    <string name="poi_caravan_designated">Выделенный</string>
+    <string name="poi_bus_designated">Выделенный</string>
+    <string name="poi_disabled_no">Доступ для инвалидов: нет</string>
+    <string name="poi_agricultural_no">Доступ для сельскохозяйственных машин: нет</string>
+    <string name="poi_agricultural_yes">Доступ для сельскохозяйственных машин: да</string>
+    <string name="poi_paintball">Пейнтбол</string>
+    <string name="poi_glacier_type_tidewater">Ледник, спускающийся в море</string>
+    <string name="poi_glacier_type_outlet">Выводной ледник</string>
+    <string name="poi_location_kiosk">Местонахождение: в киоске</string>
+    <string name="poi_drink_wine_retail">Вино: розничная торговля</string>
+    <string name="poi_dive_centre">Центр подводного плавания</string>
+    <string name="poi_resort_hunting">Охотничья база</string>
+    <string name="poi_piste_ref">Номер ссылки на трассу</string>
+    <string name="poi_bowling_alley">Боулинг-центр</string>
+    <string name="poi_video_no">Нет</string>
+    <string name="poi_video_yes">Да</string>
+    <string name="poi_sms_no">Нет</string>
+    <string name="poi_sms_yes">Да</string>
+    <string name="poi_traffic_signals_sound_locate">Только если разрешена ходьба</string>
+    <string name="poi_drinking_water_refill_network">Сеть заправки питьевой водой</string>
+    <string name="poi_drinking_water_refill_no">Заправка питьевой водой: нет</string>
+    <string name="poi_drinking_water_refill_yes">Заправка питьевой водой: да</string>
+    <string name="poi_socket_type3_yes">Тип 3</string>
+    <string name="poi_socket_type2_combo_yes">Тип 2 комбинированный</string>
+    <string name="poi_socket_type2_yes">Тип 2</string>
+    <string name="poi_socket_type1_combo_yes">Тип 1 комбинированный</string>
+    <string name="poi_access_motorhome">Доступ для автодомов</string>
 </resources>
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@ -1582,7 +1582,7 @@
    <string name="record_plugin_description">Плагин активирует функции для записи и сохранения ваших треков вручную нажатием на виджет записи GPX на карте, или также автоматически записывает все ваши маршруты навигации в файл GPX.
 \n 
 \nЗаписанными треками можно поделиться с вашими друзьями или использовать их для вклада в OSM. Спортсмены могут использовать записанные треки для контроля за тренировками. Некоторый базовый анализ треков может быть выполнен непосредственно в OsmAnd, например, время прохождения круга, средняя скорость и т.д., треки, конечно, позднее также могут быть проанализированы в специальных инструментах анализа сторонних производителей.</string>
-    <string name="create_poi_link_to_osm_doc"> string name=\"lat_lon_pattern\"&gt;Широта: %1$.5f Долгота: %2$.5f&lt;/string </string>
+    <string name="create_poi_link_to_osm_doc"><u>Онлайн OSM</u> классификация карт с изображениями.</string>
    <string name="confirm_every_run">Всегда спрашивать</string>
    <string name="save_global_track_interval_descr">Укажите интервал регистрации во время записи трека (включается через виджет записи GPX на карте).</string>
    <string name="save_global_track_interval">Общий интервал записи трека</string>
@ -3607,4 +3607,11 @@
    <string name="settings_item_read_error">Невозможно прочитать %1$s.</string>
    <string name="settings_item_write_error">Невозможно записать %1$s.</string>
    <string name="settings_item_import_error">Невозможно импортировать %1$s.</string>
+    <string name="select_track_file">Выберите файл трека</string>
+    <string name="wikipedia_poi_languages_promo">Некоторые статьи Википедии могут быть недоступны на вашем родном языке, выберите языки, на которых такие статьи будут отображаться на карте.
+\nВы сможете переключаться между всеми доступными языками во время чтения статьи.</string>
+    <string name="shared_string_languages">Языки</string>
+    <string name="shared_string_language">Язык</string>
+    <string name="shared_string_all_languages">Все языки</string>
+    <string name="wiki_menu_download_descr">Для просмотра POI Википедии на карте необходимы дополнительные карты.</string>
 </resources>
--- a/OsmAnd/res/values-tr/phrases.xml
+++ b/OsmAnd/res/values-tr/phrases.xml
@ -2311,4 +2311,13 @@
    <string name="poi_historic_civilization_minoan">Uygarlık: minos</string>
    <string name="poi_historic_civilization_tiahuanacota">Uygarlık: tiahuanaco</string>
    <string name="poi_language_school">Dil okulu</string>
+    <string name="poi_animal_no">Hayvanlara izin verilmez</string>
+    <string name="poi_animal_yes">Hayvanlara izin verilir</string>
+    <string name="poi_animal_training_horse">At</string>
+    <string name="poi_animal_training_dog">Köpek</string>
+    <string name="poi_animal_training">Hayvan eğitimi</string>
+    <string name="poi_video_telephone">Video</string>
+    <string name="poi_sms">SMS</string>
+    <string name="poi_volcano_status">Durum</string>
+    <string name="poi_volcano_type">Tür</string>
 </resources>
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@ -1106,7 +1106,7 @@
    <string name="shared_string_my_places">Yerlerim</string>
    <string name="shared_string_my_favorites">Sık Kullanılanlar</string>
    <string name="shared_string_audio">Ses</string>
-    <string name="shared_string_video">Vidyo</string>
+    <string name="shared_string_video">Video</string>
    <string name="shared_string_photo">Fotoğraf</string>
    <string name="days_behind">gün geride</string>
    <string name="back_to_map">Haritaya dön</string>
@ -3570,4 +3570,11 @@
    <string name="settings_item_read_error">%1$s okunamadı.</string>
    <string name="settings_item_write_error">%1$s yazılamadı.</string>
    <string name="settings_item_import_error">%1$s içe aktarılamadı.</string>
+    <string name="select_track_file">İzlenen yol dosyasını seç</string>
+    <string name="shared_string_languages">Diller</string>
+    <string name="shared_string_language">Dil</string>
+    <string name="shared_string_all_languages">Tüm diller</string>
+    <string name="wikipedia_poi_languages_promo">Bazı Wikipedia makaleleri adınızda bulunmayabilir, Wikipedia makalelerinin haritada görüneceği dilleri seçin.
+\nMakaleyi okurken mevcut tüm diller arasında geçiş yapabileceksiniz.</string>
+    <string name="wiki_menu_download_descr">Wikipedia POI\'lerini haritada görüntülemek için ek haritalara ihtiyaç vardır.</string>
 </resources>
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@ -1280,7 +1280,7 @@
    <string name="keep_informing_never">Тільки вручну (натискати на стрілку)</string>
    <string name="keep_informing_descr">Повторювати навігаційні вказівки через регулярні проміжки часу.</string>
    <string name="keep_informing">Повторювати навігаційні вказівки</string>
-    <string name="create_poi_link_to_osm_doc"> string name=\"lat_lon_pattern\"&gt;Шир: %1$.5f Дов: %2$.5f&lt;/string </string>
+    <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> класифікація карт із зображенням.</string>
    <string name="import_file_favourites">Зберегти дані як GPX-файл чи імпортувати маршрутні точки в \'Закладки\'?</string>
    <string name="shared_string_share">Поділитися</string>
    <string name="share_fav_subject">Закладки, якими поділились через OsmAnd</string>
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@ -3606,4 +3606,11 @@
    <string name="settings_item_read_error">無法讀取 %1$s。</string>
    <string name="settings_item_write_error">無法寫入 %1$s。</string>
    <string name="settings_item_import_error">無法匯入 %1$s。</string>
+    <string name="select_track_file">選取軌跡檔案</string>
+    <string name="shared_string_languages">語言</string>
+    <string name="shared_string_language">語言</string>
+    <string name="shared_string_all_languages">所有語言</string>
+    <string name="wikipedia_poi_languages_promo">某些維基百科的文章可能無法以您的名義提供，選取維基百科的文章要以什麼語言出現在地圖上。
+\n您將可以在閱讀文章時在所有可用的語言間切換。</string>
+    <string name="wiki_menu_download_descr">需要其他地圖才能在地圖上檢視維基百科的 POI。</string>
 </resources>
--- a/OsmAnd/src/net/osmand/plus/SettingsHelper.java
+++ b/OsmAnd/src/net/osmand/plus/SettingsHelper.java
@ -147,6 +147,7 @@ public class SettingsHelper {

 		SettingsItem(OsmandApplication app) {
 			this.app = app;
+			warnings = new ArrayList<>();
 			init();
 		}

--- a/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/DuplicatesSettingsAdapter.java
@ -56,7 +56,7 @@ public class DuplicatesSettingsAdapter extends RecyclerView.Adapter<RecyclerView
 	@NonNull
 	@Override
 	public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-		LayoutInflater inflater = LayoutInflater.from(app);
+		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 		if (viewType == HEADER_TYPE) {
 			View view = inflater.inflate(R.layout.list_item_header_import, parent, false);
 			return new HeaderViewHolder(view);
--- a/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/ProfileAppearanceFragment.java
@ -33,6 +33,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;

 import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
@ -261,6 +262,15 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 					}
 				}
 			});
+			getListView().addOnScrollListener(new RecyclerView.OnScrollListener() {
+				@Override
+				public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+					super.onScrollStateChanged(recyclerView, newState);
+					if (newState != RecyclerView.SCROLL_STATE_IDLE) {
+						hideKeyboard();
+					}
+				}
+			});
 		}
 		return view;
 	}
@ -402,7 +412,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 				View iconItem = createIconItemView(iconRes, iconItems);
 				iconItems.addView(iconItem, new FlowLayout.LayoutParams(0, 0));
 			}
-			setIconNewColor(changedProfile.iconRes);
+			setIconColor(changedProfile.iconRes);
 		} else if (LOCATION_ICON_ITEMS.equals(preference.getKey())) {
 			locationIconItems = (FlowLayout) holder.findViewById(R.id.color_items);
 			locationIconItems.removeAllViews();
@ -452,9 +462,11 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			public void onClick(View v) {
 				if (colorRes != changedProfile.color) {
 					updateColorSelector(colorRes);
+					setVerticalScrollBarEnabled(false);
 					updatePreference(findPreference(MASTER_PROFILE));
 					updatePreference(findPreference(LOCATION_ICON_ITEMS));
 					updatePreference(findPreference(NAV_ICON_ITEMS));
+					setVerticalScrollBarEnabled(true);
 				}
 			}
 		});
@ -482,7 +494,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		colorItem.findViewById(R.id.checkMark).setVisibility(View.VISIBLE);
 		changedProfile.color = color;
 		if (iconItems != null) {
-			setIconNewColor(changedProfile.iconRes);
+			updateIconColor(changedProfile.iconRes);
 		}
 		updateProfileNameAppearance();
 		updateProfileButton();
@ -521,7 +533,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 	}

 	private void updateIconSelector(int iconRes) {
-		setIconNewColor(iconRes);
+		updateIconColor(iconRes);
 		View iconItem = iconItems.findViewWithTag(changedProfile.iconRes);
 		iconItem.findViewById(R.id.outline).setVisibility(View.GONE);
 		ImageView checkMark = iconItem.findViewById(R.id.checkMark);
@ -552,7 +564,9 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			@Override
 			public void onClick(View v) {
 				if (locationIcon != changedProfile.locationIcon) {
+					setVerticalScrollBarEnabled(false);
 					updateLocationIconSelector(locationIcon);
+					setVerticalScrollBarEnabled(true);
 				}
 			}
 		});
@ -596,7 +610,9 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 			@Override
 			public void onClick(View v) {
 				if (navigationIcon != changedProfile.navigationIcon) {
+					setVerticalScrollBarEnabled(false);
 					updateNavigationIconSelector(navigationIcon);
+					setVerticalScrollBarEnabled(true);
 				}
 			}
 		});
@ -621,7 +637,13 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		changedProfile.navigationIcon = navigationIcon;
 	}

-	private void setIconNewColor(int iconRes) {
+	private void updateIconColor(int iconRes) {
+		setVerticalScrollBarEnabled(false);
+		setIconColor(iconRes);
+		setVerticalScrollBarEnabled(true);
+	}
+
+	private void setIconColor(int iconRes) {
 		int changedProfileColor = ContextCompat.getColor(app, changedProfile.color.getColor(
 				app.getDaynightHelper().isNightModeForMapControls()));
 		View iconItem = iconItems.findViewWithTag(iconRes);
@ -641,6 +663,20 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 		}
 	}

+	private void setVerticalScrollBarEnabled(boolean enabled) {
+		final RecyclerView preferenceListView = getListView();
+		if (enabled) {
+			preferenceListView.post(new Runnable() {
+				@Override
+				public void run() {
+					preferenceListView.setVerticalScrollBarEnabled(true);
+				}
+			});
+		} else {
+			preferenceListView.setVerticalScrollBarEnabled(false);
+		}
+	}
+
 	private void hideKeyboard() {
 		Activity activity = getActivity();
 		if (activity != null) {