Merge master

OsmAnd/res/values-ar/strings.xml

@@ -2848,7 +2848,7 @@
     <string name="shared_string_deleted">حُذف</string>
     <string name="shared_string_edited">تم تعديله</string>
     <string name="shared_string_added">تمت إضافة</string>
-    <string name="modify_the_search_query">تغيير طلب البحث.</string>
+    <string name="modify_the_search_query">تغيير البحث.</string>
     <string name="marker_activated">%s علامة مفعلة.</string>
     <string name="one_tap_active_descr">اضغط علامة على الخريطة لتحريكها الى أعلى العلامات المفعلة دون فتح قائمة السياق.</string>
     <string name="empty_state_av_notes">تدوين ملاحظات!</string>

OsmAnd/res/values-be-rBY/strings.xml

@@ -961,7 +961,7 @@ Miesca parkoŭkі і čas vіdać na paneli kіravańnia OsmAnd і na vіdžecie
 	<string name="shared_string_on">Uklučyć</string>
 	<string name="shared_string_off">Vyklučyć</string>
 	<string name="accessibility_default">Pavodle hlabalnych naładaŭ systemy</string>
-	<string name="backToMenu">Nazad da meniu</string>
+	<string name="backToMenu">Nazad da mieniu</string>
 	<string name="zoomOut">Addalić</string>
 	<string name="zoomIn">Nablizіć</string>
 	<string name="zoomIs">Maštab</string>
@@ -2888,7 +2888,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="import_as_gpx">Impartavać jak GPX-fajł</string>
     <string name="import_as_favorites">Impartavać jak Ulubionyja</string>
     <string name="import_file">Impartavać fajł</string>
-	<string name="tap_on_map_to_hide_interface_descr">Dotyk na mapie chavaje knopki kiravańnia i vidžety.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Dotyk na mapie pierakliučaje knopki kiravańnia i vidžety.</string>
     <string name="tap_on_map_to_hide_interface">Poŭnyekranny režym</string>
     <string name="show_on_top_bar">Pakazać na vierchniaj paneli</string>
     <string name="mark_passed">Adznačyć prajdzienyja</string>
@@ -2943,4 +2943,24 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
 \n • Čas chadźby ŭ zaliežnasci ad miascovasci (padjomu) (pravila Niejsmita)
 \n
 \n</string>
-    </resources>
+    <string name="what_is_here">Što tut:</string>
+    <string name="parked_at">praparkavany na</string>
+    <string name="pick_up_till">Uziać da</string>
+    <string name="without_time_limit">Biez abmiežavannia času</string>
+    <string name="context_menu_read_full_article">Čytać uvieś artykul</string>
+    <string name="context_menu_read_article">Čytać artykul</string>
+    <string name="context_menu_points_of_group">Usie kropki hrupy</string>
+    <string name="opened_from">Adčyniena ad</string>
+    <string name="opened_till">Adčyniena da</string>
+    <string name="will_be_closed_at">Budzie začyniena a</string>
+    <string name="will_be_opened_at">Budzie adčyniena a</string>
+    <string name="will_be_opened_on">Budzie adčyniena</string>
+    <string name="additional_actions">Dadatkovyja dziejanni</string>
+    <string name="av_locations_selected_desc">GPX-fajl z kaardynatami i danymi vybranych natatak.</string>
+    <string name="av_locations_all_desc">GPX-fajl z kaardynatami i danymi ŭsich natatak.</string>
+    <string name="shared_string_actions">Dziejanni</string>
+    <string name="shared_string_marker">Markier</string>
+    <string name="osm_recipient_stat">Zmien %1$s, suma %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM-atrymaĺniki</string>
+    <string name="total_donations">Usiaho achviaravanniaŭ</string>
+</resources>

OsmAnd/res/values-be/phrases.xml

@@ -3698,4 +3698,6 @@
 	<string name="poi_payment_centre">Плацёжны цэнтр</string>
 	<string name="poi_money_transfer">Грашовы перавод</string>
 
-</resources>
+<string name="poi_route_subway_ref">Метро</string>
+
+	</resources>

OsmAnd/res/values-be/strings.xml

@@ -488,7 +488,7 @@
 	<string name="accessibility_mode">Рэжым даступнасьці</string>
 	<string name="accessibility_mode_descr">Уключыць уласцівасьці даступнасці.</string>
 	<string name="accessibility_default">Паводле глябальных наладаў сыстэмы</string>
-	<string name="backToMenu">Назад да мэню</string>
+	<string name="backToMenu">Назад да меню</string>
 	<string name="zoomOut">Аддаліць</string>
 	<string name="zoomIn">Наблізіць</string>
 	<string name="zoomIs">Маштаб</string>
@@ -2937,7 +2937,7 @@
     <string name="import_as_gpx">Імпартаваць як GPX-файл</string>
     <string name="import_as_favorites">Імпартаваць як Улюбёныя</string>
     <string name="import_file">Імпартаваць файл</string>
-	<string name="tap_on_map_to_hide_interface_descr">Дотык на мапе хавае кнопкі кіраваньня і віджэты.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Дотык на мапе пераключае кнопкі кіраваньня і віджэты.</string>
     <string name="tap_on_map_to_hide_interface">Поўныэкранны рэжым</string>
     <string name="show_on_top_bar">Паказаць на верхняй панэлі</string>
     <string name="mark_passed">Адзначыць прайдзеныя</string>
@@ -2992,4 +2992,24 @@
 \n • Час хадзьбы ў залежнасці ад мясцовасці (пад\'ёму) (правіла Нейсміта)
 \n
 \n</string>
-    </resources>
+    <string name="what_is_here">Што тут:</string>
+    <string name="parked_at">прапаркаваны на</string>
+    <string name="pick_up_till">Узяць да</string>
+    <string name="without_time_limit">Без абмежавання часу</string>
+    <string name="context_menu_read_full_article">Чытаць увесь артыкул</string>
+    <string name="context_menu_read_article">Чытаць артыкул</string>
+    <string name="context_menu_points_of_group">Усе кропкі групы</string>
+    <string name="opened_from">Адчынена ад</string>
+    <string name="opened_till">Адчынена да</string>
+    <string name="will_be_closed_at">Будзе зачынена а</string>
+    <string name="will_be_opened_at">Будзе адчынена а</string>
+    <string name="will_be_opened_on">Будзе адчынена</string>
+    <string name="additional_actions">Дадатковыя дзеянні</string>
+    <string name="av_locations_selected_desc">GPX-файл з каардынатамі і данымі выбраных нататак.</string>
+    <string name="av_locations_all_desc">GPX-файл з каардынатамі і данымі ўсіх нататак.</string>
+    <string name="shared_string_actions">Дзеянні</string>
+    <string name="shared_string_marker">Маркер</string>
+    <string name="osm_recipient_stat">Змен %1$s, сума %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM-атрымальнікі</string>
+    <string name="total_donations">Усяго ахвяраванняў</string>
+</resources>

OsmAnd/res/values-ca/strings.xml

@@ -2690,7 +2690,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="import_as_gpx">Importa com un arxiu GPX</string>
     <string name="import_as_favorites">Importa com punts Preferits</string>
     <string name="import_file">Importa fitxer</string>
-	<string name="tap_on_map_to_hide_interface_descr">Prement en el mapa s\'oculten els botons de control i els ginys.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Prement el mapa canvien els botons de control i els ginys.</string>
     <string name="tap_on_map_to_hide_interface">Mode de pantalla completa</string>
     <string name="show_on_top_bar">Mostra a la barra superior</string>
     <string name="mark_passed">Marca com passat</string>
@@ -2745,4 +2745,24 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \n
 \n</string>
     <string name="one_tap_active">S\'activa amb un toc</string>
-    </resources>
+    <string name="what_is_here">El que hi ha aquí:</string>
+    <string name="parked_at">aparcat a</string>
+    <string name="pick_up_till">Treure abans de</string>
+    <string name="without_time_limit">Sense límit de temps</string>
+    <string name="context_menu_read_full_article">Llegiu l\'article complet</string>
+    <string name="context_menu_read_article">Llegiu l\'article</string>
+    <string name="context_menu_points_of_group">Tots els punts del grup</string>
+    <string name="opened_from">Obert des de</string>
+    <string name="opened_till">Obert fins a</string>
+    <string name="will_be_closed_at">Es tancarà a</string>
+    <string name="will_be_opened_at">S\'obrirà a</string>
+    <string name="will_be_opened_on">S\'obrirà el</string>
+    <string name="additional_actions">Accions addicionals</string>
+    <string name="av_locations_selected_desc">Arxiu GPX amb coordenades i dades de les notes seleccionades.</string>
+    <string name="av_locations_all_desc">Fitxer GPX amb coordenades i dades de totes les notes.</string>
+    <string name="shared_string_actions">Accions</string>
+    <string name="shared_string_marker">Marcador</string>
+    <string name="osm_recipient_stat">%1$s edicions, %2$s mBTC en total</string>
+    <string name="osm_recipients_label">Receptors OSM</string>
+    <string name="total_donations">Total de donacions</string>
+</resources>

OsmAnd/res/values-da/phrases.xml

@@ -3743,4 +3743,6 @@
 <string name="poi_payment_centre">Betalingscenter</string>
 	<string name="poi_money_transfer">Pengeoverførsel</string>
 
-</resources>
+<string name="poi_route_subway_ref">Metro</string>
+
+	</resources>

OsmAnd/res/values-da/strings.xml

@@ -2994,4 +2994,24 @@ Repræsenterer område: %1$s x %2$s</string>
 \n• Vandretid tager hensyn til terræn (stigning) (Naismiths regel)
 \n
 \n</string>
+    <string name="av_locations_selected_desc">GPX fil med koordinaterne og data for de valgte noter.</string>
+    <string name="av_locations_all_desc">GPX-fil med koordinater og data for alle noter.</string>
+	<string name="osm_recipient_stat">Redigeringer %1$s, sum %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM modtagere</string>
+    <string name="total_donations">Samlede donationer</string>
+<string name="what_is_here">Hvad er der her:</string>
+    <string name="parked_at">parkeret på</string>
+    <string name="pick_up_till">Hent til</string>
+    <string name="without_time_limit">Uden tidsbegrænsning</string>
+    <string name="context_menu_read_full_article">Læs hele artiklen</string>
+    <string name="context_menu_read_article">Læs artikel</string>
+    <string name="context_menu_points_of_group">Alle punkter i gruppen</string>
+    <string name="opened_from">Åben fra</string>
+    <string name="opened_till">Åben til</string>
+    <string name="will_be_closed_at">Vil være lukket på</string>
+    <string name="will_be_opened_at">Vil blive åbnet på</string>
+    <string name="will_be_opened_on">Der åbnes på</string>
+    <string name="additional_actions">Yderligere handlinger</string>
+    <string name="shared_string_actions">Handlinger</string>
+    <string name="shared_string_marker">Markør</string>
     </resources>

OsmAnd/res/values-de/strings.xml

@@ -471,8 +471,8 @@
 	<string name="level_to_switch_vector_raster">Min. Vektor-Zoomstufe</string>
 	
 	<string name="create_poi_link_to_osm_doc"><u>Online OSM</u> Klassifizierung mit Bildern.</string>
-	<string name="error_doing_search">Fehler in der Offline-Suche aufgetreten</string>
+	<string name="error_doing_search">Fehler in der Offline-Suche aufgetreten.</string>
-	<string name="search_offline_geo_error">Konnte geointent nicht verarbeiten: \'%s\'</string>
+	<string name="search_offline_geo_error">Konnte geo intent nicht verarbeiten: \'%s\'.</string>
 	<string name="search_osm_offline">Adresssuche mit Offline-Daten</string>
 	<string name="system_locale">Systemeinstellung</string>
 	<string name="preferred_locale_descr">Anzeigesprache wählen (App nach Änderungen neu starten).</string>
@@ -1276,7 +1276,7 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
 	<string name="use_displayed_track_for_navigation">Möchten Sie die angezeigte Strecke zur Navigation verwenden?</string>
 	<string name="keep_and_add_destination_point">Als letztes Ziel hinzufügen</string>
 	<string name="select_gpx">GPX-Datei auswählen…</string>
-	<string name="route_descr_select_destination">Ziel auswählen.</string>
+	<string name="route_descr_select_destination">Ziel auswählen</string>
 	<string name="interrupt_music_descr">Sprachansagen pausieren (nicht nur dämpfen) Musikwiedergabe.</string>
 	<string name="always_center_position_on_map">Standort immer in Bildschirmmitte anzeigen</string>
 	<string name="voice_pref_title">Stimme</string>
@@ -1300,7 +1300,7 @@ Proportionaler Speicher %4$s MB (Android Limit %5$s MB, Dalvik %6$s MB).</string
 	<string name="shared_string_my_favorites">Meine Favoriten</string>
 	<string name="shared_string_my_places">Meine Orte</string>
 	<string name="loading_smth">%1$s wird geladen …</string>
-	<string name="map_widget_plain_time">Uhrzeit</string>
+	<string name="map_widget_plain_time">Aktuelle Zeit</string>
 	<string name="selected_gpx_info_show">"
 \n
 \nZur Darstellung auf der Karte lange drücken"</string>
@@ -2655,7 +2655,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="quick_action_add_destination">Ziel hinzufügen</string>
     <string name="quick_action_replace_destination">Ziel ersetzen</string>
     <string name="quick_action_add_first_intermediate">Ersten Zwischenstopp hinzufügen</string>
-    <string name="quick_action_add_destination_desc">Drücken der Aktionstaste fügt die zum Bildschirmmittelpunkt gehörende Position als Ziel hinzu. Ursprüngliches Ziel wird zum letzten Zwischenstopp.</string>
+    <string name="quick_action_add_destination_desc">Drücken der Aktionstaste fügt die zum Bildschirmmittelpunkt gehörende Position als Ziel hinzu. Das zuvor eingestellte Ziel wird zum letzten Zwischenziel.</string>
     <string name="quick_action_replace_destination_desc">Drücken der Aktionstaste ersetzt das Ziel durch die dem Bildschirmmittelpunkt entsprechende Position.</string>
     <string name="quick_action_add_first_intermediate_desc">Drücken der Aktionstaste fügt die zum Bildschirmmittelpunkt gehörende Position als ersten Zwischenstopp ein.</string>
     <string name="subscribe_email_error">Fehler</string>
@@ -2896,7 +2896,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="looking_for_tracks_with_waypoints">Suche nach Spuren mit Wegpunkten</string>
     <string name="shared_string_more_without_dots">Mehr</string>
     <string name="appearance_on_the_map">Darstellung auf der Karte</string>
-    <string name="favourites_group">Favoriten Kategorie</string>
+    <string name="favourites_group">Favoritenkategorie</string>
     <string name="add_group">Gruppe hinzufügen</string>
     <string name="empty_state_markers_active">Kartenmarkierungen erstellen!</string>
     <string name="empty_state_markers_groups">Gruppen importieren</string>
@@ -2909,7 +2909,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="go_to_next_field">Zum nächsten Feld gehen</string>
     <string name="rename_marker">Markierung umbenennen</string>
     <string name="mark_passed">Markierung passiert</string>
-    <string name="track_waypoints">Track-Wegpunkte</string>
+    <string name="track_waypoints">Spuren-Wegpunkte</string>
     <string name="modify_the_search_query">Suchanfrage verändern.</string>
     <string name="empty_state_osm_edits">Erstellen oder ändern von OSM-Objekten</string>
     <string name="empty_state_osm_edits_descr">OSM-POI erstellen oder verändern, OSM-Notizen eröffnen oder bearbeiten, und aufgezeichnete GPX-Dateien hinzufügen.</string>
@@ -2924,7 +2924,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="import_gpx_file_description">kann als Favoriten-Punkte oder als Track-Datei importiert werden.</string>
     <string name="empty_state_av_notes_desc">Audio-, Video- oder Fotonotizen zu jedem Punkt auf der Karte über Widget oder Kontextmenü hinzufügen.</string>
     <string name="notes_by_date">Notizen nach Datum</string>
-    <string name="tap_on_map_to_hide_interface_descr">Berührung der Karte verbirgt Steuerungselementen und Widgets.</string>
+    <string name="tap_on_map_to_hide_interface_descr">Ein Tippen auf die Karte schaltet die Steuerschaltflächen und Bedienelemente um.</string>
     <string name="release_3_0">• Erkennung von Stoppschildern jetzt nach Fahrtrichtung
 \n
 \n• Neuer Algorithmus für die Bereitstellung von sinnvollen Auf-/Abstieg-Werten für GPX-tracks
@@ -2933,4 +2933,33 @@ Abgedeckte Fläche: %1$s x %2$s</string>
 \n
 \n</string>
     <string name="one_tap_active">Aktiviren mit einem Tap</string>
-    </resources>
+    <string name="what_is_here">Was ist hier:</string>
+    <string name="without_time_limit">Ohne Zeitbegrenzung</string>
+    <string name="context_menu_read_full_article">Ganzen Artikel lesen</string>
+    <string name="context_menu_read_article">Artikel lesen</string>
+    <string name="context_menu_points_of_group">Alle Punkte der Gruppe</string>
+    <string name="opened_from">Geöffnet ab</string>
+    <string name="opened_till">Geöffnet bis</string>
+    <string name="will_be_closed_at">Schließt um</string>
+    <string name="will_be_opened_at">Öffnet um</string>
+    <string name="will_be_opened_on">Öffnet am</string>
+    <string name="additional_actions">Zusätzliche Aktionen</string>
+    <string name="parked_at">geparkt um</string>
+    <string name="pick_up_till">Abholung bis</string>
+    <string name="av_locations_selected_desc">GPX-Datei mit Koordinaten und Daten der ausgewählten Notizen.</string>
+    <string name="av_locations_all_desc">GPX-Datei mit Koordinaten und Daten aller Notizen.</string>
+    <string name="shared_string_actions">Aktionen</string>
+    <string name="shared_string_marker">Markierung</string>
+    <string name="add_track_to_markers_descr">Wählen Sie eine Spur aus, um ihre Wegpunkte zu den Markierungen hinzuzufügen. (Nur Spuren mit Wegpunkten werden aufgelistet.)</string>
+    <string name="add_favourites_group_to_markers_descr">Wählen Sie eine Favoritenkategorie aus, die Sie den Markierungen hinzufügen möchten.</string>
+    <string name="add_group_descr">Sie können Gruppen aus Favoriten oder Spuren-Wegpunkten importieren.</string>
+    <string name="empty_state_markers_active_desc">Tippen Sie Orte lang oder kurz an, tippen Sie anschließend auf die Markierungsfahnenschaltfläche.</string>
+    <string name="empty_state_markers_groups_desc">Sie können Favoritengruppen oder Spuren-Wegpunkte als Markierungen importieren.</string>
+    <string name="show_guide_line_descr">Hilfslinien von Ihrem Standort bis zu den aktiven Markierungspunkten anzeigen.</string>
+    <string name="show_arrows_descr">Ein oder zwei Pfeile anzeigen, die die Richtung zu den aktiven Markierungen angeben.</string>
+    <string name="distance_indication_descr">Wählen Sie aus, wie der Abstand zu aktiven Markierungen angezeigt werden soll.</string>
+    <string name="active_markers_descr">Wählen Sie aus, wie viele Richtungsanzeiger angezeigt werden sollen.</string>
+    <string name="osm_recipient_stat">%1$s bearbeitet, Summe %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM-Empfänger</string>
+    <string name="total_donations">Spenden insgesamt</string>
+</resources>

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

@@ -3709,4 +3709,6 @@
 <string name="poi_payment_centre">Centro de pagos</string>
 	<string name="poi_money_transfer">Transferencia de dinero</string>
 
-</resources>
+<string name="poi_route_subway_ref">Subte</string>
+
+	</resources>

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

@@ -968,7 +968,7 @@ Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú p
     <string name="shared_location">Ubicación compartida</string>
     <string name="osmand_parking_event">Buscar el auto del estacionamiento</string>
     <string name="osmand_parking_warning">Advertencia</string>
-    <string name="osmand_parking_warning_text">Una notificación para recoger tu automóvil se añadió al Calendario. Permanecerá allí hasta que la borres manualmente.</string>
+    <string name="osmand_parking_warning_text">Una notificación para recoger el automóvil se añadió al Calendario. Permanecerá allí hasta que la borres manualmente.</string>
     <string name="osmand_parking_time_limit_title">Definir el tiempo límite del estacionamiento</string>
     <string name="osmand_parking_delete_confirm">¿Quieres borrar el marcador del estacionamiento?</string>
     <string name="osmand_parking_delete">Quitar marcador de estacionamiento</string>
@@ -1049,7 +1049,7 @@ Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú p
     <string name="accessibility_mode">Modo accesibilidad</string>
     <string name="accessibility_mode_descr">Activa las funciones de accesibilidad.</string>
     <string name="accessibility_default">Usar ajuste global del sistema</string>
-    <string name="backToMenu">Volver al Menú</string>
+    <string name="backToMenu">Volver al menú</string>
     <string name="zoomOut">Alejar</string>
     <string name="zoomIn">Acercar</string>
     <string name="zoomIs">El nivel de ampliación es</string>
@@ -2812,10 +2812,10 @@ Proporciona un código completo</string>
     <string name="import_as_gpx">Importar como archivo GPX</string>
     <string name="import_as_favorites">Importar como favoritos</string>
     <string name="import_file">Importar archivo</string>
-	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa oculta los botones de la interfaz y los controles.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa alterna los botones de la interfaz y los controles.</string>
     <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
     <string name="show_on_top_bar">Mostrar en la barra superior</string>
-    <string name="mark_passed">Descartar marcador</string>
+    <string name="mark_passed">Descartar</string>
     <string name="rename_marker">Renombrar marcador</string>
     <string name="digits_quantity">Número de dígitos decimales</string>
     <string name="shared_string_right">Derecha</string>
@@ -2867,4 +2867,24 @@ Proporciona un código completo</string>
 \n • El tiempo de caminata es consciente del terreno ascendente (regla de Naismith).
 \n
 \n</string>
+    <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas elegidas.</string>
+    <string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>
+	<string name="osm_recipient_stat">Ediciones %1$s, sum %2$s mBTC</string>
+    <string name="osm_recipients_label">Destinatarios de OSM</string>
+    <string name="total_donations">Total de donaciones</string>
+<string name="what_is_here">Aquí hay:</string>
+    <string name="parked_at">estacionado a las</string>
+    <string name="pick_up_till">Recoger hasta las</string>
+    <string name="without_time_limit">Sin límite de tiempo</string>
+    <string name="context_menu_read_full_article">Leer artículo completo</string>
+    <string name="context_menu_read_article">Leer artículo</string>
+    <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
+    <string name="opened_from">Abierto de</string>
+    <string name="opened_till">Abierto hasta las</string>
+    <string name="will_be_closed_at">Cerrará a las</string>
+    <string name="will_be_opened_at">Abrirá a las</string>
+    <string name="will_be_opened_on">Abrirá sobre las</string>
+    <string name="additional_actions">Acciones adicionales</string>
+    <string name="shared_string_actions">Acciones</string>
+    <string name="shared_string_marker">Marcador</string>
     </resources>

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

@@ -3471,4 +3471,6 @@
 <string name="poi_payment_centre">Centro de pagos</string>
 	<string name="poi_money_transfer">Transferencia de dinero</string>
 
-</resources>
+<string name="poi_route_subway_ref">Metro</string>
+
+	</resources>

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

@@ -981,7 +981,7 @@ Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú p
     <string name="shared_location">Ubicación compartida</string>
     <string name="osmand_parking_event">Buscar el auto del estacionamiento</string>
     <string name="osmand_parking_warning">Advertencia</string>
-    <string name="osmand_parking_warning_text">Una notificación para recoger tu automóvil se añadió al Calendario. Permanecerá allí hasta que la borres manualmente.</string>
+    <string name="osmand_parking_warning_text">Una notificación para recoger el automóvil se añadió al Calendario. Permanecerá allí hasta que la borres manualmente.</string>
     <string name="osmand_parking_time_limit_title">Definir el tiempo límite del estacionamiento</string>
     <string name="osmand_parking_delete_confirm">¿Quieres borrar el marcador del estacionamiento?</string>
     <string name="osmand_parking_delete">Quitar marcador de estacionamiento</string>
@@ -1062,7 +1062,7 @@ Tanto la ubicación como el tiempo del estacionamiento se muestran en el menú p
     <string name="accessibility_mode">Modo accesibilidad</string>
     <string name="accessibility_mode_descr">Activa las funciones de accesibilidad.</string>
     <string name="accessibility_default">Usar ajuste global del sistema</string>
-    <string name="backToMenu">Volver al Menú</string>
+    <string name="backToMenu">Volver al menú</string>
     <string name="zoomOut">Alejar</string>
     <string name="zoomIn">Acercar</string>
     <string name="zoomIs">El nivel de ampliación es</string>
@@ -2826,10 +2826,10 @@ Proporciona un código completo</string>
     <string name="import_as_gpx">Importar como archivo GPX</string>
     <string name="import_as_favorites">Importar como favoritos</string>
     <string name="import_file">Importar archivo</string>
-	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa oculta los botones de la interfaz y los controles.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa alterna los botones de la interfaz y los controles.</string>
     <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
     <string name="show_on_top_bar">Mostrar en la barra superior</string>
-    <string name="mark_passed">Descartar marcador</string>
+    <string name="mark_passed">Descartar</string>
     <string name="digits_quantity">Número de dígitos decimales</string>
     <string name="shared_string_right">Derecha</string>
     <string name="shared_string_left">Izquierda</string>
@@ -2881,4 +2881,24 @@ Proporciona un código completo</string>
 \n • El tiempo de caminata es consciente del terreno ascendente (regla de Naismith).
 \n
 \n</string>
-    </resources>
+    <string name="what_is_here">Aquí hay:</string>
+    <string name="parked_at">estacionado a las</string>
+    <string name="pick_up_till">Recoger hasta las</string>
+    <string name="without_time_limit">Tiempo ilimitado</string>
+    <string name="context_menu_read_full_article">Leer artículo completo</string>
+    <string name="context_menu_read_article">Leer artículo</string>
+    <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
+    <string name="opened_from">Abierto de</string>
+    <string name="opened_till">Abierto hasta las</string>
+    <string name="will_be_closed_at">Cerrará a las</string>
+    <string name="will_be_opened_at">Abrirá a las</string>
+    <string name="will_be_opened_on">Abrirá sobre las</string>
+    <string name="additional_actions">Acciones adicionales</string>
+    <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas elegidas.</string>
+    <string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>
+    <string name="shared_string_actions">Acciones</string>
+    <string name="shared_string_marker">Marcador</string>
+    <string name="osm_recipient_stat">%1$s ediciones, suman %2$s mBTC</string>
+    <string name="osm_recipients_label">Destinatarios de OSM</string>
+    <string name="total_donations">Total de donaciones</string>
+</resources>

OsmAnd/res/values-es/phrases.xml

@@ -3685,10 +3685,19 @@
 	<string name="poi_map_size_city">Tamaño del mapa: Ciudad</string>
 	<string name="poi_map_size_region">Tamaño del mapa: Región</string>
 
-<string name="poi_couloir">Barranco estrecho</string>
+<string name="poi_couloir">Couloir (barranco estrecho y empinado)</string>
 	<string name="poi_charging_station_filter">Estación de carga</string>
 
 <string name="poi_depot">Depósito</string>
 
 <string name="poi_letter_box">Buzón</string>
-	</resources>
+	<string name="poi_route_subway_ref">Metro</string>
+
+	<string name="poi_post_street">Calle</string>
+	<string name="poi_post_housenumber">Número de portal</string>
+	<string name="poi_post_flats">Piso de oficina</string>
+
+	<string name="poi_payment_centre">Centro de pago</string>
+	<string name="poi_money_transfer">Transferencia de dinero</string>
+
+</resources>

OsmAnd/res/values-es/strings.xml

@@ -659,7 +659,7 @@ El espacio de almacenamiento usado es {1} MB.
     <string name="shared_string_on">Activado</string>
     <string name="shared_string_off">Desactivado</string>
     <string name="accessibility_default">De acuerdo con el ajuste global del sistema</string>
-    <string name="backToMenu">Volver al Menú</string>
+    <string name="backToMenu">Volver al menú</string>
     <string name="zoomOut">Alejar</string>
     <string name="zoomIn">Acercar</string>
     <string name="zoomIs">El nivel de zoom es</string>
@@ -2746,7 +2746,7 @@ Por favor proporciona un código completo</string>
     <string name="shared_string_back">Atrás</string>
     <string name="view">Ver</string>
 	<string name="waypoints_added_to_map_markers">Puntos de ruta añadidos a marcadores de mapa</string>
-	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa alterna la vista de la interfaz y los controles.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Una pulsación en el mapa alterna los botones y los controles.</string>
     <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
     <string name="show_on_top_bar">Mostrar en la barra superior</string>
     <string name="mark_passed">Descartar marcador</string>
@@ -2805,4 +2805,24 @@ Por favor proporciona un código completo</string>
     <string name="notes_by_date">Notas por fecha</string>
     <string name="by_date">Por fecha</string>
     <string name="by_type">Por tipo</string>
-    </resources>
+    <string name="what_is_here">Lo que hay aquí:</string>
+    <string name="parked_at">Aparcado en</string>
+    <string name="pick_up_till">Recoger hasta las</string>
+    <string name="without_time_limit">Tiempo ilimitado</string>
+    <string name="context_menu_read_full_article">Leer el artículo completo</string>
+    <string name="context_menu_read_article">Leer artículo</string>
+    <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
+    <string name="opened_from">Abierto desde</string>
+    <string name="opened_till">Abierto hasta</string>
+    <string name="will_be_closed_at">Se cerrará en</string>
+    <string name="will_be_opened_at">Se abrirá en</string>
+    <string name="will_be_opened_on">Se abrirá en</string>
+    <string name="additional_actions">Acciones adicionales</string>
+    <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas seleccionadas.</string>
+    <string name="av_locations_all_desc">Archivo GPX con las coordenadas y los datos de todas las notas.</string>
+    <string name="shared_string_actions">Acciones</string>
+    <string name="shared_string_marker">Marcador</string>
+    <string name="osm_recipient_stat">Ediciones %1$s, suma %2$s mBTC</string>
+    <string name="osm_recipients_label">Destinatarios de OSM</string>
+    <string name="total_donations">Total de donaciones</string>
+</resources>

OsmAnd/res/values-fa/strings.xml

@@ -2986,4 +2986,24 @@
 \n • در نظر گرفتن ناهمواری (صعود) برای محاسبهٔ زمان پیاده‌گردی (قاعدهٔ نای‌اسمیت)
 \n
 \n</string>
-    </resources>
+    <string name="what_is_here">اینجا کجاست:</string>
+    <string name="parked_at">ساعت پارک‌کردن</string>
+    <string name="pick_up_till">برداشتن تا</string>
+    <string name="without_time_limit">بدون محدودیت زمانی</string>
+    <string name="context_menu_read_full_article">مقالهٔ کامل را بخوانید</string>
+    <string name="context_menu_read_article">خواندن مقاله</string>
+    <string name="context_menu_points_of_group">همهٔ نقاط این گروه</string>
+    <string name="opened_from">ساعت بازشدن</string>
+    <string name="opened_till">ساعت کاری تا</string>
+    <string name="will_be_closed_at">ساعت تعطیل‌کردن</string>
+    <string name="will_be_opened_at">ساعت بازکردن</string>
+    <string name="will_be_opened_on">روز بازکردن</string>
+    <string name="additional_actions">عملیات بیشتر</string>
+    <string name="av_locations_selected_desc">فایل GPX با مختصات و داده‌های یادداشت‌های انتخاب‌شده</string>
+    <string name="av_locations_all_desc">فایل GPX با مختصات و داده‌های همهٔ یادداشت‌ها</string>
+    <string name="shared_string_actions">عملیات‌ها</string>
+    <string name="shared_string_marker">نشانه</string>
+    <string name="osm_recipient_stat">ویرایش‌ها</string>
+    <string name="osm_recipients_label">گیرندگان OSM</string>
+    <string name="total_donations">کل پرداخت‌ها</string>
+</resources>

OsmAnd/res/values-fr/phrases.xml

@@ -2153,7 +2153,7 @@
 	<string name="poi_automated">Automatisé</string>
 	<string name="poi_parking_type">Type</string>
 	<string name="poi_fuel_type">Type de carburant</string>
-	<string name="poi_fuel_avia_type">Type</string>
+	<string name="poi_fuel_avia_type">Type de carburant (avions)</string>
 	<string name="poi_payment_type">Type de paiement</string>
 	<string name="poi_traffic_signals_sound">Son</string>
 	<string name="poi_tactile_paving">Bande podotactile</string>
@@ -3013,7 +3013,7 @@
 	<string name="poi_animal_shelter_mammal">Mammifères</string>
 	<string name="poi_animal_shelter_fish">Poissons</string>
 
-	<string name="poi_information_trail_blaze">Balise de voie</string>
+	<string name="poi_information_trail_blaze">Balise de chemin</string>
 	<string name="poi_traffic_signals_sound_walk">Autorisé uniquement à pied</string>
 
 	<string name="poi_piste_grooming_backcountry">Arrière-pays</string>
@@ -3036,7 +3036,7 @@
 	<string name="poi_brushless_no">Sans balai</string>
 	<string name="poi_boat_rental_type">Location bateaux</string>
 
-<string name="poi_toilets_access_community">Accès toilettes : communauté</string>
+<string name="poi_toilets_access_community">Accès aux toilettes : propriété collective</string>
 	<string name="poi_vending_toll">Péage par automate</string>
 	<string name="poi_memorial_fassade_decoration">Décoration de façade</string>
 
@@ -3122,4 +3122,62 @@
 	<string name="poi_reservation_no">Réservation : non</string>
 	<string name="poi_reservation_members_only">Réservation : membres uniquement</string>
 
+	<string name="poi_operational_status">État opérationnel</string>
+	<string name="poi_water_supply_type">Mode de distribution de l\'eau</string>
+	<string name="poi_amperage">Ampérage</string>
+	<string name="poi_letter_box">Boite aux lettres</string>
+	<string name="poi_post_street">Rue</string>
+	<string name="poi_post_flats">Plat</string>
+
+	<string name="poi_payment_centre">Centre de paiement</string>
+	<string name="poi_health_facility_type_office">Bureau médical</string>
+	<string name="poi_parking_fee_yes">Stationnement payant : oui</string>
+	<string name="poi_parking_fee_no">Stationnement payant : non</string>
+	<string name="poi_zoo_birds">Oiseaux</string>
+	<string name="poi_motorcycle_rental_yes">Location</string>
+	<string name="poi_motorcycle_rental_no">Location : non</string>
+	<string name="poi_motorcycle_repair_yes">Réparation</string>
+	<string name="poi_motorcycle_repair_no">Réparation : non</string>
+	<string name="poi_motorcycle_parts_yes">Pièces détachées</string>
+	<string name="poi_motorcycle_parts_no">Pièces détachées : non</string>
+	<string name="poi_motorcycle_tyres_yes">Pneus</string>
+	<string name="poi_motorcycle_tyres_no">Pneus : non</string>
+	<string name="poi_owner">Propriétaire</string>
+
+	<string name="poi_direction_clockwise">Direction : sens horaire</string>
+	<string name="poi_direction_anticlockwise">Direction : sens anti-horaire</string>
+	<string name="poi_direction_entrance">Direction : entrée</string>
+	<string name="poi_direction_exit">Direction : sortie</string>
+	<string name="poi_boat_rental">Location de bateau</string>
+	<string name="poi_boat_sailboat_rental_yes">Bateaux à voile : oui</string>
+	<string name="poi_boat_sailboat_rental_no">Bateaux à voile : non</string>
+	<string name="poi_network">Réseau</string>
+
+	<string name="poi_government_archive">Archive</string>
+	<string name="poi_government_public_service">Service public</string>
+	<string name="poi_vhf">Canal VHF</string>
+
+	<string name="poi_mountain_area">Zone montagneuse</string>
+
+	<string name="poi_operational_status_broken">Cassé</string>
+	<string name="poi_operational_status_needs_maintenance">A réparer</string>
+
+	<string name="poi_water_purification_none">Aucune</string>
+	<string name="poi_water_purification_reverse_osmosis">Osmose inverse</string>
+	<string name="poi_water_supply_pump">Pompe</string>
+	<string name="poi_site_type_settlement">Implantation</string>
+	<string name="poi_fortification_type_sconce">Type de fortification : rempart</string>
+	<string name="poi_bridge_ref">Référence du pont</string>
+	<string name="poi_tunnel_ref">Référence du tunnel</string>
+
+	<string name="poi_health_specialty_paediatrics_no">Spécialité médicale : pédiatrie : non</string>
+	<string name="poi_health_specialty_emergency_medicine_no">Spécialité médicale : médecine d\'urgence : non</string>
+	<string name="poi_health_specialty_tropical_medicine_no">Spécialité médicale : médecine tropicale : non</string>
+	<string name="poi_health_specialty_obstetrics_postnatal_no">Spécialité médicale : obstétrique (postnatale) : non</string>
+	<string name="poi_health_specialty_obstetrics_antenatal_no">Spécialité médicale : obstétrique (prénatale) : non</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Spécialité médicale : pédiatrie sociale : non</string>
+	<string name="poi_health_specialty_obstetrics_caesarean_section_no">Spécialité médicale : obstétrique (césarienne) : non</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">Addictologie</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Orthophonie</string>
+	<string name="poi_health_specialty_manual_therapy_yes">Thérapie manuelle</string>
 	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -725,7 +725,7 @@ Au-delà la navigation bascule automatiquement sur le service en ligne CloudMade
     <string name="shared_string_on">Oui</string>
     <string name="shared_string_off">Non</string>
     <string name="accessibility_default">Selon les paramètres globaux</string>
-    <string name="backToMenu">Retour menu</string>
+    <string name="backToMenu">Retour au menu</string>
     <string name="zoomOut">Zoom -</string>
     <string name="zoomIn">Zoom +</string>
     <string name="zoomIs">Le niveau de zoom est</string>
@@ -2988,7 +2988,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="import_as_gpx">Importer comme fichier GPX</string>
     <string name="import_as_favorites">Importer comme Favoris</string>
     <string name="import_file">Importer fichier</string>
-	<string name="tap_on_map_to_hide_interface_descr">Un appui sur la carte masque les boutons et gadgets.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Un appui sur la carte bascule les boutons et gadgets.</string>
     <string name="tap_on_map_to_hide_interface">Mode plein écran</string>
     <string name="show_on_top_bar">Afficher dans la barre supérieure</string>
     <string name="mark_passed">Marquer comme visité</string>
@@ -3043,4 +3043,24 @@ représentant la zone : %1$s x %2$s</string>
 \n • Durée d\'ascension en fonction du terrain (basé sur la règle de Naismith)
 \n
 \n</string>
+    <string name="total_donations">Total des dons</string>
+<string name="av_locations_selected_desc">Fichier GPX comprenant les coordonnées et le contenu des notes sélectionnées.</string>
+    <string name="av_locations_all_desc">Fichier GPX contenant les coordonnées et les notes.</string>
+	<string name="osm_recipient_stat">Modifications : %1$s, Total : %2$s mBTC</string>
+    <string name="osm_recipients_label">Destinataires OSM</string>
+    <string name="what_is_here">Ce qu\'il y a ici :</string>
+    <string name="parked_at">stationné à</string>
+    <string name="pick_up_till">A récupérer avant</string>
+    <string name="without_time_limit">Sans limite de temps</string>
+    <string name="context_menu_read_full_article">Lire l\'article complet</string>
+    <string name="context_menu_read_article">Lire l\'article</string>
+    <string name="context_menu_points_of_group">Tous les points du groupe</string>
+    <string name="opened_from">Ouvert depuis</string>
+    <string name="opened_till">Ouvert depuis</string>
+    <string name="will_be_closed_at">Fermera à</string>
+    <string name="will_be_opened_at">Ouvrira à</string>
+    <string name="will_be_opened_on">Sera ouvert le</string>
+    <string name="additional_actions">Actions supplémentaires</string>
+    <string name="shared_string_actions">Actions</string>
+    <string name="shared_string_marker">Marque</string>
     </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -3668,4 +3668,6 @@
 	<string name="poi_payment_centre">Befizetőpont</string>
 	<string name="poi_money_transfer">Pénzküldő</string>
 
-</resources>
+<string name="poi_route_subway_ref">Metró</string>
+
+	</resources>

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

@@ -507,7 +507,7 @@
     <string name="osmo_auto_send_locations_descr">Iniciar automaticamente a viagem e enviar posições após o início do aplicativo.</string>
     <string name="osmo_auto_send_locations">Iniciar automaticamente a viagem</string>
     <string name="osmo_tracker_id">Identificador do rastreador</string>
-    <string name="osmo_tracker_id_descr">Toque para ver ou compartilhar id de rastreio. Ao usar id de rastreio, aparelhos conectados poderão ver todos os movimentos deste aparelho! Para desconectar-se selecione a opção restaurar.</string>
+    <string name="osmo_tracker_id_descr">Toque para ver o ID de rastreio.</string>
     <string name="osmo_session_token">Token de sessão: %1$s</string>
     <string name="osmo_auth_pending">À espera de autorização…</string>
     <string name="osmo_locations_sent">"Posição enviada %1$d (in buffer %2$d) "</string>
@@ -1450,7 +1450,7 @@ Pôr do Sol: %2$s</string>
 	<string name="int_seconds">segundos</string>
 	<string name="int_min">min.</string>
 	<string name="background_service_int_descr">Definir intervalo de ativação usado pelo serviço em segundo plano</string>
-	<string name="background_service_provider_descr">Escolher o provedor de posição usado pelo serviço em segundo plano</string>
+	<string name="background_service_provider_descr">Escolher o provedor de posição usado pelo serviço em segundo plano.</string>
 	<string name="background_service_provider">Provedor de posição</string>
 	<string name="background_router_service_descr">Executar OsmAnd em segundo plano para monitorar sua posição enquanto a tela estiver desligada</string>
 	<string name="background_router_service">Executar em segundo plano</string>
@@ -1952,7 +1952,7 @@ Pôr do Sol: %2$s</string>
 <string name="route_distance">Distância:</string>
     <string name="route_duration">Tempo:</string>
     <string name="missing_write_external_storage_permission">App não tem permissão para usar o cartão SD</string>
-<string name="no_location_permission">App não tem permissão para acessar os dados de localização.</string>
+<string name="no_location_permission">O aplicativo não tem permissão para acessar os dados de localização.</string>
     <string name="no_camera_permission">App não tem permissão para acessar a câmera.</string>
     <string name="no_microphone_permission">App não tem permissão para acessar o microfone.</string>
     <string name="impassable_road_desc">Escolha as vias que quer evitar durante a navegação.</string>
@@ -2097,7 +2097,7 @@ Pôr do Sol: %2$s</string>
     <string name="access_sort">Ordenar</string>
     <string name="map_mode">Modo mapa</string>
     <string name="rendering_value_medium_name">Médio</string>
-    <string name="report">Reportar</string>
+    <string name="report">Relatório</string>
     <string name="shared_string_is_open_24_7">Aberto 24 horas</string>
     <string name="average_speed">Velocidade média</string>
     <string name="average_altitude">Altitude média</string>
@@ -2191,7 +2191,7 @@ Pôr do Sol: %2$s</string>
     <string name="mapillary_menu_title_username">Nome de usuário</string>
     <string name="mapillary_menu_filter_description">Você pode filtrar imagens por quem submeteu ou por data. Os filtros só se aplicam para ampliação bem próxima.</string>
     <string name="shared_string_permissions">Permissões</string>
-    <string name="import_gpx_failed_descr">O OsmAnd não pode importar o arquivo. Favor verificar se o OsmAnd tem permissão para ler arquivo do local.</string>
+    <string name="import_gpx_failed_descr">O OsmAnd não pode importar o arquivo. Favor verificar se o OsmAnd tem permissão para ler arquivo de sua localização.</string>
     <string name="distance_moving">Distância corrigida</string>
     <string name="mapillary_image">Imagem do Mapillary</string>
     <string name="open_mapillary">Abrir o Mapillary</string>
@@ -2301,7 +2301,7 @@ Pôr do Sol: %2$s</string>
     <string name="empty_state_markers_history_desc">Marcadores marcados como visitados aparecerão nesta tela.</string>
     <string name="shared_string_two">Dois</string>
     <string name="shared_string_one">Um</string>
-    <string name="show_guide_line_descr">Exibir as linhas de guia desde a sua posição até as localizações dos marcadores ativos.</string>
+    <string name="show_guide_line_descr">Exibir as linhas de guia desde a sua posição até os locais dos marcadores ativos.</string>
     <string name="show_arrows_descr">Exibir uma ou duas setas indicando a direção para os marcadores ativos.</string>
     <string name="distance_indication_descr">Escolher como exibir a distância para os marcadores ativos.</string>
     <string name="active_markers_descr">Escolher quantos indicadores de mudança de direção são exibidos.</string>
@@ -2428,22 +2428,154 @@ Pôr do Sol: %2$s</string>
     <string name="import_track_desc">Arquivo %1$s não possui pontos de passagem, importe-o como uma trilha?</string>
     <string name="add_segment_to_the_track">Adicionar a uma trilha GPX</string>
 <string name="empty_state_av_notes_desc">Adicionar nota de áudio, vídeo ou foto para cada ponto no mapa, usando o widget ou o menu de contexto.</string>
-    <string name="quick_action_add_destination_desc">Tocando no botão de ação adicionará um destino na localização do centro da tela. O destino anteriormente definido se torna o último destino intermediário.</string>
+    <string name="quick_action_add_destination_desc">Tocando no botão de ação adicionará um destino no local do centro da tela. O destino anteriormente definido se torna o último destino intermediário.</string>
-    <string name="quick_action_replace_destination_desc">Tocando no botão de ação substituirá o destino com a localização do centro da tela.</string>
+    <string name="quick_action_replace_destination_desc">Tocando no botão de ação substituirá o destino com o local do centro da tela.</string>
-    <string name="quick_action_add_first_intermediate_desc">Tocando no botão de ação adicionará um primeiro ponto intermédio na localização do centro da tela.</string>
+    <string name="quick_action_add_first_intermediate_desc">Tocando no botão de ação adicionará um primeiro ponto intermédio no local do centro da tela.</string>
-    <string name="subscribe_email_desc">Se inscreva na nossa lista de e-mail sobre descontos do app e obtenha mais 3 downloads de mapa!</string>
+    <string name="subscribe_email_desc">Assine a nossa lista de e-mail sobre descontos do aplicativo e obtenha mais 3 downloads de mapa!</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd coleta informações sobre quais partes do aplicativo você abrir. A sua localização nunca é enviada, nem qualquer coisa digitada no aplicativo ou detalhes das áreas que você visualizar, pesquisar ou baixar.</string>
     <string name="auto_split_recording_title">Autodividir gravações após um intervalo</string>
     <string name="auto_split_recording_descr">Iniciar novo segmento após intervalo de 6 min, um novo trajeto após intervalo de 2 h, ou um novo arquivo depois de um longo intervalo se a data foi alterada.</string>
     <string name="upload_osm_note_description">Você pode enviar sua nota de OSM anonimamente ou usando seu perfil OpenStreetMap.org.</string>
     <string name="trip_rec_notification_settings_desc">Exiba uma notificação de sistema que permite iniciar a gravação de viagem.</string>
     <string name="christmas_desc">Antecipando os feriados de Natal e ano novo, você pode optar por exibir o POI associado com o Natal: árvores de Natal, mercados, etc.</string>
-    <string name="osm_live_payment_desc">Assinatura será cobrada mensalmente. Você pode cancelar sua assinatura no Google Play a qualquer momento.</string>
+    <string name="osm_live_payment_desc">A assinatura será cobrada mensalmente. Você pode cancelar a sua assinatura no Google Play a qualquer momento.</string>
-    <string name="donation_to_osm_desc">Parte de sua doação será enviada aos usuários OSM que enviam alterações ao OpenStreetMap. O custo da inscrição permanece o mesmo.</string>
+    <string name="donation_to_osm_desc">Parte de sua doação será enviada aos usuários OSM que enviam alterações ao OpenStreetMap. O custo da assinatura permanece o mesmo.</string>
-    <string name="osm_live_subscription_desc">Assinatura permite atualizações a cada hora, diariamente e semanais, e downloads ilimitados para todos os mapas globalmente.</string>
+    <string name="osm_live_subscription_desc">A assinatura permite atualizações a cada hora, diariamente e semanais, e downloads ilimitados para todos os mapas globalmente.</string>
     <string name="get_it">Adquira já</string>
     <string name="get_for">Adquira por %1$s</string>
     <string name="get_for_month">Adquira por %1$s mês</string>
     <string name="osm_live_banner_desc">Obter downloads ilimitados de mapa e atualizações de mapas mais de uma vez por mês: por hora, diária ou semanal.</string>
-    <string name="quick_action_add_gpx_descr">Tocando o botão de ação adicionará um ponto de passagem de GPX na localização do centro da tela.</string>
+    <string name="quick_action_add_gpx_descr">Tocando o botão de ação adicionará um ponto de passagem GPX no local do centro da tela.</string>
+    <string name="av_locations_all_desc">Arquivo GPX com coordenadas e dados de todas as notas.</string>
+	<string name="storage_place_description">Armazenamento de dados do OsmAnd (para mapas, trilhas, etc.): %1$s.</string>
+    <string name="first_usage_greeting">Obtenha direções e descobra novos lugares sem precisar de conexão com Internet</string>
+    <string name="rendering_attr_hideOverground_name">Objetos superficiais</string>
+    <string name="get_started">Vamos começar</string>
+    <string name="route_stops_before">%1$s paradas antes</string>
+    <string name="dist_away_from_my_location">Pesquisar a %1$s daqui</string>
+    <string name="current_track">Trajeto atual</string>
+    <string name="access_direction_audio_feedback">Resposta sonora de direção</string>
+    <string name="access_direction_audio_feedback_descr">Indicar a direção do ponto de destino por som.</string>
+    <string name="access_direction_haptic_feedback">Resposta tátil de direção</string>
+    <string name="access_direction_haptic_feedback_descr">Indica a direção do ponto de destino por vibração.</string>
+    <string name="use_osm_live_routing_description">Ativar a navegação por mudanças do OsmAnd Live.</string>
+    <string name="map_widget_magnetic_bearing">Rumo magnético</string>
+    <string name="map_widget_bearing">Rumo relativo</string>
+    <string name="access_disable_offroute_recalc">Sem recálculo de rota depois de deixá-la</string>
+    <string name="access_disable_wrong_direction_recalc">Sem recálculo de rota para a direção oposta</string>
+    <string name="access_smart_autoannounce">Auto-anúncio inteligente</string>
+    <string name="access_collapsed_list">Lista recolhida</string>
+    <string name="access_tree_list">Lista-árvore</string>
+    <string name="no_map_markers_found">Por favor, adicione marcadores de mapa pelo mapa</string>
+    <string name="no_waypoints_found">Não há pontos de passagem encontrados</string>
+    <string name="storage_permission_restart_is_required">Agora o aplicativo tem permissão para gravar no armazenamento externo. Reiniciar o aplicativo manualmente é necessário.</string>
+    <string name="shared_string_move_up">Mover para cima</string>
+    <string name="shared_string_move_down">Mover para baixo</string>
+    <string name="finish_navigation">Finalizar a navegação</string>
+    <string name="avoid_road">Evitar estrada</string>
+    <string name="osm_live_subscription">Assinatura OsmAnd Live</string>
+    <string name="osm_live_subscribe_btn">Assinar</string>
+    <string name="osm_live_user_public_name">Nome Público</string>
+    <string name="osm_live_hide_user_name">Não mostre meu nome em relatórios</string>
+    <string name="osm_live_support_region">Região de suporte</string>
+    <string name="osm_live_month_cost">Custo mensal</string>
+    <string name="osm_live_month_cost_desc">Pagamento mensal.</string>
+    <string name="osm_live_active">Ativo</string>
+    <string name="osm_live_not_active">Inativo</string>
+    <string name="osm_live_enter_email">Por favor insira um endereço de e-mail válido</string>
+    <string name="total_donations">Total de doações</string>
+<string name="what_is_here">O que há aqui:</string>
+    <string name="parked_at">estacionado em</string>
+    <string name="pick_up_till">Pegar até</string>
+    <string name="without_time_limit">Sem limite de tempo</string>
+    <string name="context_menu_read_full_article">Leia o artigo completo</string>
+    <string name="context_menu_read_article">Leia o artigo</string>
+    <string name="context_menu_points_of_group">Todos os pontos do grupo</string>
+    <string name="opened_from">Aberto a partir de</string>
+    <string name="opened_till">Aberto até</string>
+    <string name="will_be_closed_at">Fechará às</string>
+    <string name="will_be_opened_at">Abrirá às</string>
+    <string name="will_be_opened_on">Ficará aberto aos/às</string>
+    <string name="additional_actions">Ações adicionais</string>
+    <string name="av_locations_selected_desc">Arquivo GPX com coordenadas e dados das notas selecionadas.</string>
+    <string name="shared_string_actions">Ações</string>
+    <string name="shared_string_marker">Marcador</string>
+    <string name="access_autoannounce_period">Período de auto-anúncio</string>
+    <string name="access_map_linked_to_location">Mapa está vinculado a localização</string>
+    <string name="access_shared_string_navigate_up">Navegue até</string>
+    <string name="number_of_gpx_files_selected_pattern">%s arquivos GPX selecionados</string>
+    <string name="rendering_value_fine_name">Mais fino</string>
+    <string name="rendering_value_thin_name">Fino</string>
+    <string name="rendering_value_bold_name">Grosso</string>
+    <string name="storage_directory_readonly_desc">A pasta de armazenamento de dados selecionada é somente leitura. A pasta de armazenamento foi alterada temporariamente para memória interna. Por favor, escolha uma pasta de armazenamento válida.</string>
+    <string name="storage_directory_shared">Memória compartilhada</string>
+    <string name="full_report">Relatório completo</string>
+    <string name="osm_user_stat">Edições %1$s, classificação %2$s, total de edições %3$s</string>
+    <string name="osm_recipient_stat">Edições %1$s, soma de %2$s mBTC</string>
+    <string name="osm_live_email_desc">Necessários para fornecer-lhe informações sobre as contribuições.</string>
+    <string name="osm_live_enter_user_name">Por favor, digite o Nome Público</string>
+    <string name="osm_live_thanks">Obrigado por assinar as atualizações ao vivo!</string>
+    <string name="osm_live_region_desc">Parte da sua doação será enviada para os usuários OSM que enviam alterações para o mapa da região.</string>
+    <string name="osm_live_subscription_settings">Configurações de assinatura</string>
+    <string name="osm_live_ask_for_purchase">Por favor, adquira a assinatura OsmAnd Live primeiro</string>
+    <string name="osm_live_header">Esta assinatura permite atualizações a cada hora para todos os mapas ao redor do mundo. Parte da renda retorna à Comunidade OSM e é pago por cada contribuição OSM. Se você ama OsmAnd e OSM e quer apoiá-los, esta é a maneira perfeita de fazê-lo.</string>
+    <string name="select_map_marker">Selecione marcador de mapa</string>
+    <string name="map_markers_other">Outros marcadores</string>
+    <string name="upload_anonymously">Enviar anonimamente</string>
+    <string name="show_transparency_seekbar">Mostrar transparência seekbar</string>
+    <string name="upload_osm_note">Enviar Nota OSM</string>
+    <string name="map_marker_1st">Primeiro marcador de mapa</string>
+    <string name="map_marker_2nd">Segundo marcador de mapa</string>
+    <string name="shared_string_toolbar">Barra de ferramentas</string>
+    <string name="shared_string_widgets">Widgets</string>
+    <string name="rendering_value_darkyellow_name">Amarelo escuro</string>
+    <string name="rendering_value_translucent_pink_name">Rosa translúcida</string>
+    <string name="lang_es_us">Espanhol (americano)</string>
+    <string name="lang_ast">Asturiano</string>
+    <string name="navigate_point_olc">Open Location Code</string>
+    <string name="navigate_point_olc_info_invalid">Inválido OLC
+\n</string>
+    <string name="average">Média</string>
+    <string name="of">%1$d de %2$d</string>
+    <string name="ascent_descent">Subida/Descida</string>
+    <string name="moving_time">Tempo em movimento</string>
+    <string name="max_min">Máx/Mín</string>
+    <string name="min_max">Mín/Máx</string>
+    <string name="lang_en_gb">Inglês (Reino Unido)</string>
+    <string name="lang_be_by">Bielo-russo (latim)</string>
+    <string name="lang_hu_formal">Húngaro (formal)</string>
+    <string name="lang_kn">Canarês</string>
+    <string name="lang_sr_latn">Sérvio (latino)</string>
+    <string name="lang_zh_hk">Chinês (Hong Kong)</string>
+    <string name="driving_region_australia">Austrália</string>
+    <string name="osmand_extended_description_part4">O plugin de mapas de ski Skiing OsmAnd permite que você veja pistas de ski com nível de complexidade e algumas informações adicionais, como localização de elevadores e outras facilidades.</string>
+    <string name="live_monitoring_max_interval_to_send">Buffer de tempo para rastreamento on-line</string>
+    <string name="save_poi_too_many_uppercase">Nome contém muitas letras maiúsculas. Você quer continuar?</string>
+    <string name="file_name_containes_illegal_char">Nome do arquivo contém caracteres ilegais</string>
+    <string name="configure_screen_quick_action">Ação rápida</string>
+    <string name="quick_action_item_action">Ação %d</string>
+    <string name="quick_action_item_screen">Tela %d</string>
+    <string name="quick_action_add_marker">Adicionar marcador de mapa</string>
+    <string name="quick_action_add_poi">Adicionar POI</string>
+    <string name="quick_action_map_style">Mudar estilo de mapa</string>
+    <string name="quick_action_map_style_switch">O estilo do mapa foi alterado para \"%s\".</string>
+    <string name="quick_action_take_audio_note">Tome nota de áudio</string>
+    <string name="quick_action_take_video_note">Tome nota de vídeo</string>
+    <string name="quick_action_take_photo_note">Tome nota de foto</string>
+    <string name="quick_action_add_osm_bug">Adicionar Nota OSM</string>
+    <string name="quick_action_navigation_voice">Ligar/desligar voz</string>
+    <string name="quick_action_navigation_voice_off">A voz está desligada</string>
+    <string name="quick_action_navigation_voice_on">A voz está ligada</string>
+    <string name="quick_action_add_gpx">Adicionar ponto de passagem GPX</string>
+    <string name="quick_action_add_parking">Adicionar lugar de estacionamento</string>
+    <string name="quick_action_new_action">Adicionar ação</string>
+    <string name="quick_action_edit_action">Editar ação</string>
+    <string name="quick_action_add_favorite">Adicionar favorito</string>
+    <string name="dialog_add_action_title">Adicionar ação</string>
+    <string name="quick_actions_delete">Apagar ação</string>
+    <string name="quick_actions_delete_text">Tem certeza de que deseja apagar a ação \"%s\"?</string>
+    <string name="quick_favorites_show_favorites_dialog">Mostrar diálogo favoritos</string>
+    <string name="quick_favorites_name_preset">Nome do preset</string>
+    <string name="quick_action_add_marker_descr">Tocando o botão de ação adicionará um marcador de mapa no local do centro da tela.</string>
+    <string name="quick_action_add_parking_descr">Tocar o botão de ação adicionará um lugar de estacionamento no local do centro da tela.</string>
     </resources>

OsmAnd/res/values-ru/strings.xml

@@ -965,7 +965,7 @@
     <string name="shared_string_on">Включён</string>
     <string name="shared_string_off">Отключён</string>
     <string name="accessibility_default">Использовать системную настройку</string>
-    <string name="backToMenu">Главное меню</string>
+    <string name="backToMenu">Назад к меню</string>
     <string name="zoomOut">Уменьшить</string>
     <string name="zoomIn">Увеличить</string>
     <string name="zoomIs">Масштаб</string>
@@ -2640,7 +2640,7 @@
     <string name="shared_string_right">Направо</string>
     <string name="shared_string_left">Налево</string>
     <string name="show_number_pad">Показать цифровую панель</string>
-    <string name="tap_on_map_to_hide_interface_descr">Нажатие на карте скрывает кнопки управления и виджеты.</string>
+    <string name="tap_on_map_to_hide_interface_descr">Нажатие на карте переключает кнопки управления и виджеты.</string>
     <string name="show_on_top_bar">Показать на верхней панели</string>
     <string name="import_gpx_file_description">могут быть импортированы как избранные точки или как трек файл.</string>
     <string name="shared_string_more_without_dots">Больше</string>
@@ -2789,4 +2789,22 @@
 \n• Время ходьбы в зависимости от местности (подъема) (правило Нейсмита)
 \n
 \n</string>
+    <string name="osm_recipient_stat">Правок %1$s, сумма %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM получатели</string>
+    <string name="total_donations">Всего пожертвований</string>
+<string name="what_is_here">Что здесь:</string>
+    <string name="parked_at">припаркован в</string>
+    <string name="pick_up_till">Забрать до</string>
+    <string name="without_time_limit">Без ограничения по времени</string>
+    <string name="context_menu_read_full_article">Читать статью целиком</string>
+    <string name="context_menu_read_article">Читать статью</string>
+    <string name="context_menu_points_of_group">Все точки группы</string>
+    <string name="opened_from">Открыто с</string>
+    <string name="opened_till">Открыто до</string>
+    <string name="will_be_closed_at">Закроется в</string>
+    <string name="will_be_opened_at">Откроется в</string>
+    <string name="will_be_opened_on">Откроется</string>
+    <string name="additional_actions">Дополнительные действия</string>
+    <string name="shared_string_actions">Действия</string>
+    <string name="shared_string_marker">Маркер</string>
     </resources>

OsmAnd/res/values-sk/strings.xml

@@ -2989,4 +2989,24 @@ Zodpovedá oblasti: %1$s x %2$s</string>
 \n • Čas pešej trasy zohľadňuje terén/stúpanie (Naismithovo pravidlo)
 \n
 \n</string>
-    </resources>
+    <string name="what_is_here">Čo je tu:</string>
+    <string name="parked_at">zaparkované o</string>
+    <string name="pick_up_till">Vyzdvihnúť do</string>
+    <string name="without_time_limit">Bez časového obmedzenia</string>
+    <string name="context_menu_read_full_article">Prečítať celý článok</string>
+    <string name="context_menu_read_article">Prečítať článok</string>
+    <string name="context_menu_points_of_group">Všetky body skupiny</string>
+    <string name="opened_from">Otvorené od</string>
+    <string name="opened_till">Otvorené do</string>
+    <string name="will_be_closed_at">Bude zatvorené o</string>
+    <string name="will_be_opened_at">Bude otvorené o</string>
+    <string name="will_be_opened_on">Bude otvorené v</string>
+    <string name="additional_actions">Ďalšie akcie</string>
+    <string name="av_locations_selected_desc">Súbor GPX so súradnicami a údajmi vybraných poznámok.</string>
+    <string name="av_locations_all_desc">Súbor GPX so súradnicami a údajmi všetkých poznámok.</string>
+    <string name="shared_string_actions">Akcie</string>
+    <string name="shared_string_marker">Značka</string>
+    <string name="osm_recipient_stat">Počet úprav %1$s, suma %2$s mBTC</string>
+    <string name="osm_recipients_label">Prijímatelia OSM</string>
+    <string name="total_donations">Celkové príspevky</string>
+</resources>

OsmAnd/res/values-sl/strings.xml

@@ -366,7 +366,7 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="osmand_parking_warning_text">Obvestilo, da odpeljite vozilo s parkirišča, je bilo dodano v koledar. Ostalo bo zapisano, dokler ga ne izbrišete ročno.</string>
     <string name="osmand_parking_time_limit_title">Nastavi časovno omejitev parkiranja</string>
     <string name="osmand_parking_delete_confirm">Ali želite izbrisati označbo mesta, kjer je vozilo parkirano?</string>
-    <string name="osmand_parking_delete">Izbriši mesto parkiranja</string>
+    <string name="osmand_parking_delete">Izbriši označbo mesta parkiranja</string>
     <string name="osmand_parking_choose_type">Izbira vrste parkiranja</string>
     <string name="osmand_parking_lim_text">Časovno omejeno</string>
     <string name="osmand_parking_no_lim_text">Časovno neomejeno</string>
@@ -375,12 +375,12 @@ Sorazmerna velikost pomnilnika je %4$s MB (omejitev na androidu je %5$s MB, na d
     <string name="osmand_parking_time_no_limit">Časovno neomejeno parkiranje</string>
     <string name="osmand_parking_position_description">Položaj parkiranega vozila: %1$s</string>
     <string name="osmand_parking_position_description_add">Prevzem vozila ob:</string>
-    <string name="osmand_parking_position_name">Točka parkiranja</string>
+    <string name="osmand_parking_position_name">Mesto parkiranja</string>
     <string name="osmand_parking_plugin_description">Vstavek za parkiranje omogoča enostavno shranjevanje mesta parkiranja vozila in časa parkirne ure. Podatki so prikazani na zaslonu za enostavno opozarjanje.
 
 Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih parkiranja (letališča, letovišča …).</string>
     <string name="osmand_parking_plugin_name">Parkiranje (mesto in čas)</string>
-    <string name="context_menu_item_add_parking_point">Označi kot kraj parkiranja</string>
+    <string name="context_menu_item_add_parking_point">Označi kot mesto parkiranja</string>
     <string name="context_menu_item_delete_parking_point">Izbriši označbo parkirnega mesta</string>
     <string name="local_index_routing_data">Podatki usmerjanja</string>
     <string name="search_position_favorites">Izbor priljubljene točke …</string>
@@ -1074,7 +1074,7 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="plugin_distance_point_ele">nadmorska višina</string>
     <string name="plugin_distance_point">Točka</string>
     <string name="gpx_file_name">Ime datoteke GPX</string>
-    <string name="gpx_saved_sucessfully">Datoteka GPX uspešno shranjena v {0}</string>
+    <string name="gpx_saved_sucessfully">Datoteka GPX je uspešno shranjena v {0}</string>
     <string name="shared_string_do_not_show_again">Ne pokaži več</string>
     <string name="distance_measurement_start_editing">Začni z merjenjem razdalje</string>
     <string name="distance_measurement_finish_editing">Končaj določanje razdalje</string>
@@ -1107,12 +1107,9 @@ Omogoča tudi dodajanje opomb v koledar za prikaz opomnikov ob daljših časih p
     <string name="local_indexes_cat_srtm">Podatki izohips</string>
     <string name="shared_string_downloading">Poteka prejemanje</string>
     <string name="use_distance_measurement_help">* Pritisnite za določitev točke.
-
+\n* Zadržite pritisk na zemljevidu za brisanje predhodne točke.
-* Zadržite pritisk na zemljevidu za brisanje prejšnje točke.
+\n* Zadržite pritisk na točki za ogled in dodajanje opisa.
-
+\n* Za prikaz več možnosti, kliknite na gradnik za merjenje.</string>
-* Zadržite pritisk na točki za ogled ali dodajanje opisa.
-
-* Kliknite na gradnik za merjenje za prikaz več možnosti.</string>
     
     <string name="osmand_plus_extended_description_4000_chars">"
 OsmAnd (OSM Automated Navigation Directions - Avtomatsko usmerjanje), je zemljevid in program za navigacijo z dostopom do svetovnih brezplačnih, zelo kakovostnih OpenStreetMap (OSM) podatkov. Vse podatke map je mogoče shraniti na pomnilniško kartico vašega telefona za uporabo brez povezave. OsmAnd ponuja usmerjanje preko sledilnika  GPS naprave, s prikazom na zaslonu in glasovno, za avto, kolo in pešce. Vse glavne funkcije delujejo tako v povezavi kot brez nje (internet ni potreben).
@@ -2451,7 +2448,7 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="shared_string_record">Zabeleži</string>
     <string name="gpx_logging_no_data">Ni podatkov</string>
     <string name="christmas_poi">Božične točke POI</string>
-    <string name="christmas_desc_q">Ali želite prikaz Božičnih točk POI?</string>
+    <string name="christmas_desc_q">Ali želite omogočiti prikaz prazničnih prizorišč?</string>
     <string name="rendering_value_light_brown_name">Svetlorjava</string>
     <string name="rendering_value_dark_brown_name">Temnorjava</string>
     <string name="rendering_attr_surfaceIntegrity_name">Kakovost površine ceste</string>
@@ -2468,13 +2465,13 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
     <string name="save_track_precision_descr">Filter: nastavitev najmanjše natančnosti beleženja točk na zemljevidu.</string>
     <string name="osmo_share_location">Objavi</string>
     <string name="trip_rec_notification_settings_desc">Pokaži obvestilo za možnost začetka beleženja potovanja.</string>
-    <string name="release_2_5">\\022 Dejavne ikone na zemljevidu 
+    <string name="release_2_5">• Gradnik Dejavne ikone na zemljevidu 
 \n 
 \n • Zmogljivo iskanje točk POI: iskanje na primer restavracij po vrsti kuhinje, ali pa prostore za kampiranje s posebnimi zahtevami 
 \n 
 \n • Topo – Nov slog zemljevida za kolesarje in pohodnike 
 \n 
-\n • Izboljšano beleženje potovanja 
+\n • Izboljšano beleženje potovanja
 \n 
 \n • Prilagojena obvestila navigacije za različne naprave (Android Wear) 
 \n 
@@ -2482,7 +2479,7 @@ Del prihodka se vrne skupnosti OSM in se izplačuje za vsako opravljeno dejavnos
 \n 
 \n in še veliko več …</string>
     <string name="rendering_attr_contourColorScheme_description">Barvna shema izohips</string>
-    <string name="christmas_desc">Ob koncu leta je mogoče izbrati prikaz točk POI, ki so povezane z božičnimi in novoletnimi dogodki: božična in novoletna drevesca, prodajalne, razstave ...</string>
+    <string name="christmas_desc">V zadnjih dneh koledarskega leta je mogoče izbrati prikaz točk POI, ki so povezane z božičnimi in novoletnimi dogodki: postavljena novoletna drevesca, božične jasli, prodajalne, razstave ...</string>
     <string name="rendering_attr_contourColorScheme_name">Barvna shema izohips</string>
     <string name="upload_poi">Pošlji točko POI</string>
     <string name="route_calculation">Izračunavanje poti</string>
@@ -2790,12 +2787,12 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="osmand_extended_description_part8">OsmAnd je odprtokodni program, ki je v neprestanem razvoju. Vsakdo lahko sodeluje pri razvoju z objavljanjem hroščev, pregledom prevodov in razvojem programske opreme. Pri programu sodeluje živahna odprtokodna skupnost s celega sveta. Napredek razvoja je odvisen tudi od donacij za programiranje in preizkušanje programske opreme. Ocena kakovosti in pokritosti zemljevidov: • Zahodna Evropa: **** • Vzhodna Evropa: *** • Rusija: *** • Severna Amerika: *** • Južna Amerika: ** • Azija: ** • Japonska in Koreja: *** • Bližnji vzhod: ** • Afrika: ** • Antarktika: * Večina zemljevidov držav je na voljo za prejem! Uporabite zanesljiv navigacijski sistem za različne države – Francijo, Nemčijo, Mehiko, Združeno kraljestvo, Španijo, Nizozemsko, Združene države, Rusijo, Brazilijo in mnoge druge.</string>
     <string name="quick_action_resume_pause_navigation">Nadaljuj/Ustavi navigacijo</string>
     <string name="quick_action_start_stop_navigation">Začni/Končaj navigacijo</string>
-    <string name="release_2_7">\\022 Vstavek Mapillary za slikovno podporo ulic
+    <string name="release_2_7">• Vstavek Mapillary za slikovno podporo ulic 
-\n
+\n 
-\n • Gradnik ravnila za merjenje razdalj
+\n • Gradnik Ravnilo za merjenje razdalj 
-\n
+\n 
-\n • Razdelitev intervalov GPX za podrobnejši prikaz poti
+\n • Razdelitev intervalov GPX za podrobnejši prikaz poti 
-\n
+\n 
 \n • Druge posodobitve in razrešene napake
 \n
 \n</string>
@@ -2960,14 +2957,14 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="waypoints_added_to_map_markers">Vmesne točke so dodane med označbe zemljevida.</string>
 	<string name="plan_route_no_markers_toast">Za uporabo te zmožnosti je treba dodati vsaj eno označbo.</string>
     <string name="marker_moved_to_active">Označba zemljevida je premaknjena med dejavne</string>
-    <string name="release_2_8">\\022 Popolnoma predelane označbe zemljevida z vodilnimi črtami in načrtovanjem poti
+    <string name="release_2_8">• Popolnoma predelane označbe zemljevida z vodilnimi črtami in načrtovanjem poti 
-\n
+\n 
-\n • Orodje za merjenje razdalje sedaj omogoča prilagajanje potem in shranjevanje točk kot sledi
+\n • Orodje za merjenje razdalje sedaj omogoča prilagajanje potem in shranjevanje točk kot sledi 
-\n
+\n 
-\n • OsmAnd Live: odprava hroščev, posodobitve, ki so samodejno vključene v navigacijo, se objavljajo vsakih 30 minut
+\n • OsmAnd Live: razrešeni hrošči in posodobitve, ki so samodejno vključene v navigacijo, se objavljajo vsakih 30 minut
 \n
 \n</string>
-    <string name="release_3_0">\\022 Zaznava znakov STOP po novem vpliva na usmerjanje vožnje 
+    <string name="release_3_0">• Zaznava znakov STOP po novem vpliva na usmerjanje vožnje 
 \n 
 \n • Z novim algoritmom so vrednosti spustov in vzponov na sledeh GPX bolj smiselne 
 \n 
@@ -2976,8 +2973,28 @@ Koda predstavlja območje: %1$s x %2$s</string>
 \n</string>
     <string name="empty_state_osm_edits_descr">Ustvari ali spremeni točke POI, ureja opombe OSM in omogoča objavljanje zabeleženih sledi GPX.</string>
     <string name="coordinate_input_accuracy_description">Samodejno preklopi na naslednje polje, ko je vpisana %1$d decimalka.</string>
-    <string name="tap_on_map_to_hide_interface_descr">S pritiskom na zemljevid se skrijejo gumbi in gradniki.</string>
+    <string name="tap_on_map_to_hide_interface_descr">S pritiskom na zemljevid se preklopi prikaz gumbov in gradnikov.</string>
     <string name="import_gpx_file_description">"je lahko  uvožen med priljubljene točke ali kot datoteka sledi."</string>
     <string name="marker_show_distance_descr">Način določanja razdalje in smeri do označb zemljevida na zaslonu:</string>
     <string name="map_orientation_change_in_accordance_with_speed_descr">Hitrost, pri kateri se usmerjenost preklopi »iz smeri gibanja« na »kompas«.</string>
-    </resources>
+    <string name="what_is_here">Kaj je tu:</string>
+    <string name="parked_at">parkirano</string>
+    <string name="pick_up_till">Odpelji do</string>
+    <string name="without_time_limit">Brez časovne omejitve</string>
+    <string name="context_menu_read_full_article">Preberi celotno objavo</string>
+    <string name="context_menu_read_article">Preberi objavo</string>
+    <string name="context_menu_points_of_group">Vse točke skupine</string>
+    <string name="opened_from">Odprto od</string>
+    <string name="opened_till">Odprto do</string>
+    <string name="will_be_closed_at">Zapre se ob</string>
+    <string name="will_be_opened_at">Odpre se ob</string>
+    <string name="will_be_opened_on">Odprto bo na</string>
+    <string name="additional_actions">Dodatna dejanja</string>
+    <string name="av_locations_selected_desc">Datoteka GPX s koordinatami in podatki izbranih sporočil.</string>
+    <string name="av_locations_all_desc">Datoteka GPX s koordinatami in podatki vseh sporočil.</string>
+    <string name="shared_string_actions">Dejanja</string>
+    <string name="shared_string_marker">Označba</string>
+    <string name="osm_recipient_stat">Število urejanj %1$s, vsota %2$s mBTC</string>
+    <string name="osm_recipients_label">Prejemniki skupine OSM</string>
+    <string name="total_donations">Skupno donacij</string>
+</resources>

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

@@ -3677,4 +3677,16 @@
 
 	<string name="poi_charging_station_filter">充電站</string>
 
+<string name="poi_route_subway_ref">捷運</string>
+
+	<string name="poi_depot">車站</string>
+
+	<string name="poi_letter_box">信箱</string>
+	<string name="poi_post_street">街</string>
+	<string name="poi_post_housenumber">門牌號碼</string>
+	<string name="poi_post_flats">平地</string>
+
+	<string name="poi_payment_centre">支付中心</string>
+	<string name="poi_money_transfer">匯款</string>
+
 </resources>

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

@@ -228,7 +228,7 @@
     <string name="shared_string_on">開啟</string>
     <string name="shared_string_off">關閉</string>
     <string name="accessibility_default">配合整體的系統設定</string>
-    <string name="backToMenu">回主選單</string>
+    <string name="backToMenu">回到選單</string>
     <string name="zoomOut">縮小</string>
     <string name="zoomIn">放大</string>
     <string name="zoomIs">縮放程度為</string>
@@ -2921,7 +2921,7 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="import_as_gpx">匯入為 GPX 檔案</string>
     <string name="import_as_favorites">匯入為我的收藏</string>
     <string name="import_file">匯入檔案</string>
-	<string name="tap_on_map_to_hide_interface_descr">在地圖上輕點以隱藏控制按鈕和小工具。</string>
+	<string name="tap_on_map_to_hide_interface_descr">在地圖上輕點以切換控制按鈕和小工具。</string>
     <string name="tap_on_map_to_hide_interface">全螢幕模式</string>
     <string name="show_on_top_bar">在頂列上顯示</string>
     <string name="mark_passed">已經過標記</string>
@@ -2976,4 +2976,24 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
 \n• 地形（上坡）察覺登山健行時間（尼史密夫定律）
 \n
 \n</string>
+    <string name="av_locations_selected_desc">包括座標和所選註解資料的 GPX 檔案。</string>
+    <string name="av_locations_all_desc">包括座標和所有註解資料的 GPX 檔案。</string>
+	<string name="osm_recipient_stat">編輯 %1$s，合計 %2$s mBTC</string>
+    <string name="osm_recipients_label">OSM 收件人</string>
+    <string name="total_donations">捐款總計</string>
+<string name="parked_at">停在</string>
+    <string name="without_time_limit">沒有時間限制</string>
+    <string name="context_menu_read_full_article">閱讀全文</string>
+    <string name="context_menu_read_article">閱讀文章</string>
+    <string name="context_menu_points_of_group">群組的全部標點</string>
+    <string name="opened_from">已開啟自</string>
+    <string name="opened_till">已開啟直到</string>
+    <string name="will_be_closed_at">將關閉于</string>
+    <string name="will_be_opened_at">將開啟于</string>
+    <string name="what_is_here">這裡的內容：</string>
+    <string name="pick_up_till">取得直到</string>
+    <string name="will_be_opened_on">將被開啟</string>
+    <string name="additional_actions">輔助的操作</string>
+    <string name="shared_string_actions">操作</string>
+    <string name="shared_string_marker">標記</string>
     </resources>

OsmAnd/res/values/strings.xml

@@ -11,11 +11,11 @@
     -->
     <string name="what_is_here">What\'s here:</string>
     <string name="parked_at">parked at</string>
-    <string name="pick_up_till">Pick up till</string>
+    <string name="pick_up_till">Pick up until</string>
     <string name="without_time_limit">Without time limit</string>
     <string name="context_menu_read_full_article">Read full article</string>
     <string name="context_menu_read_article">Read article</string>
-    <string name="context_menu_points_of_group">All points of group</string>
+    <string name="context_menu_points_of_group">All points of the group</string>
     <string name="opened_from">Opened from</string>
     <string name="opened_till">Opened till</string>
     <string name="will_be_closed_at">Will be closed at</string>
@@ -75,7 +75,7 @@
     <string name="coordinate_input_accuracy">%1$d digits</string>
     <string name="go_to_next_field">Go to next field</string>
     <string name="rename_marker">Rename marker</string>
-    <string name="tap_on_map_to_hide_interface_descr">A tap on the map hide the control buttons and widgets.</string>
+    <string name="tap_on_map_to_hide_interface_descr">A tap on the map toggles the control buttons and widgets.</string>
     <string name="tap_on_map_to_hide_interface">Full screen mode</string>
     <string name="mark_passed">Mark passed</string>
     <string name="import_gpx_file_description">can be imported as Favorites points, or as track file.</string>
@@ -2033,7 +2033,7 @@
     <string name="accessibility_mode">Accessibility mode</string>
     <string name="accessibility_mode_descr">Turns on the accessibility features.</string>
     <string name="accessibility_default">According to the global system setting</string>
-    <string name="backToMenu">Back To Menu</string>
+    <string name="backToMenu">Back to menu</string>
     <string name="zoomOut">Zoom out</string>
     <string name="zoomIn">Zoom in</string>
     <string name="zoomIs">Zoom level is</string>
@@ -2837,6 +2837,6 @@
     <string name="import_track_desc">File %1$s does not contain waypoints, import it as a track?</string>
     <string name="move_point">Move Point</string>
     <string name="add_segment_to_the_track">Add to a GPX track</string>
-    <string name="osm_recipients_label">OSM Recipients</string>
+    <string name="osm_recipients_label">OSM recipients</string>
-    <string name="total_donations">Total Donations</string>
+    <string name="total_donations">Total donations</string>
 </resources>

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

@@ -47,12 +47,7 @@ public class AppModeDialog {
 	public static View prepareAppModeView(Activity a, final List<ApplicationMode> values , final Set<ApplicationMode> selected, 
 				ViewGroup parent, final boolean singleSelection, boolean drawer, boolean useMapTheme, final View.OnClickListener onClickListener) {
 		View ll = a.getLayoutInflater().inflate(R.layout.mode_toggles, parent);
-		boolean nightMode;
+		boolean nightMode = isNightMode(((OsmandApplication) a.getApplication()), useMapTheme);
-		if (useMapTheme) {
-			nightMode = ((OsmandApplication) a.getApplication()).getDaynightHelper().isNightModeForMapControls();
-		} else {
-			nightMode = !((OsmandApplication) a.getApplication()).getSettings().isLightContent();
-		}
 		ll.setBackgroundColor(ContextCompat.getColor(a, nightMode ? R.color.route_info_bg_dark : R.color.route_info_bg_light));
 		final View[] buttons = new View[values.size()];
 		int k = 0;
@@ -75,12 +70,7 @@ public class AppModeDialog {
 			final ApplicationMode mode = visible.get(i);
 			final boolean checked = selected.contains(mode);
 			ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
-			boolean nightMode;
+			boolean nightMode = isNightMode(ctx, useMapTheme);
-			if (useMapTheme) {
-				nightMode = ctx.getDaynightHelper().isNightModeForMapControls();
-			} else {
-				nightMode = !ctx.getSettings().isLightContent();
-			}
 			if (checked) {
 				iv.setImageDrawable(ctx.getIconsCache().getIcon(mode.getSmallIconDark(), nightMode ? R.color.route_info_checked_mode_icon_color_dark : R.color.route_info_checked_mode_icon_color_light));
 				iv.setContentDescription(String.format("%s %s", mode.toHumanString(ctx), ctx.getString(R.string.item_checked)));
@@ -129,13 +119,7 @@ public class AppModeDialog {
 		int metricsY = (int) ctx.getResources().getDimension(R.dimen.route_info_modes_height);
 		View tb = layoutInflater.inflate(R.layout.mode_view, null);
 		ImageView iv = (ImageView) tb.findViewById(R.id.app_mode_icon);
-		boolean nightMode;
+		iv.setImageDrawable(ctx.getIconsCache().getIcon(mode.getSmallIconDark(), isNightMode(ctx, useMapTheme) ? R.color.route_info_checked_mode_icon_color_dark : R.color.route_info_checked_mode_icon_color_light));
-		if (useMapTheme) {
-			nightMode = ctx.getDaynightHelper().isNightModeForMapControls();
-		} else {
-			nightMode = !ctx.getSettings().isLightContent();
-		}
-		iv.setImageDrawable(ctx.getIconsCache().getIcon(mode.getSmallIconDark(), nightMode ? R.color.route_info_checked_mode_icon_color_dark : R.color.route_info_checked_mode_icon_color_light));
 		iv.setContentDescription(mode.toHumanString(ctx));
 //		tb.setCompoundDrawablesWithIntrinsicBounds(null, ctx.getIconsCache().getIcon(mode.getIconId(), R.color.app_mode_icon_color), null, null);
 		LayoutParams lp = new LinearLayout.LayoutParams(metricsX, metricsY);
@@ -143,4 +127,14 @@ public class AppModeDialog {
 		layout.addView(tb, lp);
 		return tb;
 	}
+
+	private static boolean isNightMode(OsmandApplication ctx, boolean useMapTheme) {
+		boolean nightMode;
+		if (useMapTheme) {
+			nightMode = ctx.getDaynightHelper().isNightModeForMapControls();
+		} else {
+			nightMode = !ctx.getSettings().isLightContent();
+		}
+		return nightMode;
+	}
 }

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

@@ -43,7 +43,7 @@ public class AudioVideoNoteMenuBuilder extends MenuBuilder {
 			DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
 			Date date = new Date(recording.getFile().lastModified());
 			buildRow(view, R.drawable.ic_action_data, dateFormat.format(date) + " — " + timeFormat.format(date),
-					0, false, null, false, 0, false, null);
+					0, false, null, false, 0, false, null, false);
 
 			buildPlainMenuItems(view);
 

OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java

@@ -134,9 +134,9 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
 				int monthItemPosition = monthReportsSpinner.getSelectedItemPosition();
 				String monthUrlString = monthsForReportsAdapter.getQueryString(monthItemPosition);
 				String countryUrlString = selectedCountryItem.getDownloadName();
-				if (countryUrlString.length() > 0) {
+				boolean isRecipientsReport = v.getId() == R.id.numberOfRecipientsLayout;
+				if (countryUrlString.length() > 0 || isRecipientsReport) {
 					Bundle bl = new Bundle();
-					boolean isRecipientsReport = v.getId() == R.id.numberOfRecipientsLayout;
 					bl.putString(UsersReportFragment.URL_REQUEST,
 							String.format(isRecipientsReport ? RECIPIENTS_BY_MONTH : USERS_RANKING_BY_MONTH, monthUrlString, countryUrlString));
 					userReportFragment.setArguments(bl);
@@ -281,7 +281,7 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
 		clearTextViewResult(recipientsTextView);
 		clearTextViewResult(donationsTextView);
 		clearTextViewResult(donationsTotalTextView);
-		
+
 		String recfinalUrl = String.format(RECIPIENTS_BY_MONTH, monthUrlString, regionUrlString);
 		recChangesByMontAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recfinalUrl);
 	}

OsmAnd/src/net/osmand/plus/liveupdates/UsersReportFragment.java

@@ -122,6 +122,7 @@ public class UsersReportFragment extends BaseOsmAndDialogFragment {
 			text2.setTextColor(textSecondaryColor);
 			text1.setCompoundDrawablesWithIntrinsicBounds(drawableLeft, null, null, null);
 			text1.setCompoundDrawablePadding(getResources().getDimensionPixelSize(R.dimen.list_content_padding));
+			text2.setPadding(text1.getTotalPaddingLeft(), text1.getTotalPaddingTop(), text1.getTotalPaddingRight(), text1.getTotalPaddingBottom());
 			Object item = getItem(position);
 			if (item instanceof UserRankingByMonth) {
 				UserRankingByMonth rankingByMonth = (UserRankingByMonth) item;

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

@@ -290,15 +290,14 @@ public class MenuBuilder {
 		if (showTitleIfTruncated) {
 			buildTitleRow(view);
 		}
+		if (showTransportRoutes()) {
+			buildRow(view, 0, app.getString(R.string.transport_Routes), 0, true, getCollapsableTransportStopRoutesView(view.getContext(), false),
+					false, 0, false, null, true);
+		}
 		buildNearestWikiRow(view);
 		if (needBuildPlainMenuItems()) {
 			buildPlainMenuItems(view);
 		}
-		if (routes.size() > 0) {
-			buildRow(view, 0, app.getString(R.string.transport_Routes), 0, true, getCollapsableTransportStopRoutesView(view.getContext(), false),
-					false, 0, false, null);
-			matchWidthDivider = true;
-		}
 		buildInternal(view);
 		if (showOnlinePhotos) {
 			buildNearestPhotosRow(view);
@@ -307,6 +306,10 @@ public class MenuBuilder {
 		buildAfter(view);
 	}
 
+	private boolean showTransportRoutes() {
+		return routes.size() > 0;
+	}
+
 	void onHide() {
 		hidden = true;
 	}
@@ -324,7 +327,7 @@ public class MenuBuilder {
 	protected void buildPlainMenuItems(View view) {
 		for (PlainMenuItem item : plainMenuItems) {
 			buildRow(view, item.getIconId(), item.getText(), 0, item.collapsable, item.collapsableView,
-					item.isNeedLinks(), 0, item.isUrl(), item.getOnClickListener());
+					item.isNeedLinks(), 0, item.isUrl(), item.getOnClickListener(), false);
 		}
 	}
 
@@ -348,7 +351,7 @@ public class MenuBuilder {
 		if (mapContextMenu != null) {
 			String title = mapContextMenu.getTitleStr();
 			if (title.length() > TITLE_LIMIT) {
-				buildRow(view, R.drawable.ic_action_note_dark, title, 0, false, null, false, 0, false, null);
+				buildRow(view, R.drawable.ic_action_note_dark, title, 0, false, null, false, 0, false, null, false);
 			}
 		}
 	}
@@ -357,7 +360,7 @@ public class MenuBuilder {
 		if (processNearstWiki() && nearestWiki.size() > 0) {
 			buildRow(view, R.drawable.ic_action_wikipedia, app.getString(R.string.wiki_around) + " (" + nearestWiki.size()+")", 0,
 					true, getCollapsableWikiView(view.getContext(), true),
-					false, 0, false, null);
+					false, 0, false, null, false);
 		}
 	}
 
@@ -380,7 +383,7 @@ public class MenuBuilder {
 			}
 		});
 		buildRow(view, R.drawable.ic_action_photo_dark, app.getString(R.string.online_photos), 0, true,
-				collapsableView, false, 1, false, null);
+				collapsableView, false, 1, false, null, false);
 
 		if (needUpdateOnly && onlinePhotoCards != null) {
 			onlinePhotoCardsRow.setCards(onlinePhotoCards);
@@ -425,7 +428,7 @@ public class MenuBuilder {
 	}
 
 	protected void buildAfter(View view) {
-		buildRowDivider(view, false);
+		buildRowDivider(view);
 	}
 
 	public boolean isFirstRow() {
@@ -438,23 +441,17 @@ public class MenuBuilder {
 
 	public View buildRow(View view, int iconId, String text, int textColor,
 							boolean collapsable, final CollapsableView collapsableView,
-							boolean needLinks, int textLinesLimit, boolean isUrl, OnClickListener onClickListener) {
+							boolean needLinks, int textLinesLimit, boolean isUrl, OnClickListener onClickListener, boolean matchWidthDivider) {
 		return buildRow(view, iconId == 0 ? null : getRowIcon(iconId), text, textColor, null, collapsable, collapsableView,
-				needLinks, textLinesLimit, isUrl, onClickListener);
+				needLinks, textLinesLimit, isUrl, onClickListener, matchWidthDivider);
-	}
-
-	public View buildRow(final View view, Drawable icon, final String text, int textColor,
-						 boolean collapsable, final CollapsableView collapsableView, boolean needLinks,
-						 int textLinesLimit, boolean isUrl, OnClickListener onClickListener) {
-		return buildRow(view, icon, text, textColor, null, collapsable, collapsableView, needLinks, textLinesLimit, isUrl, onClickListener);
 	}
 
 	public View buildRow(final View view, Drawable icon, final String text, int textColor, String secondaryText,
 							boolean collapsable, final CollapsableView collapsableView, boolean needLinks,
-							int textLinesLimit, boolean isUrl, OnClickListener onClickListener) {
+							int textLinesLimit, boolean isUrl, OnClickListener onClickListener, boolean matchWidthDivider) {
 
 		if (!isFirstRow()) {
-			buildRowDivider(view, false);
+			buildRowDivider(view);
 		}
 
 		LinearLayout baseView = new LinearLayout(view.getContext());
@@ -598,9 +595,15 @@ public class MenuBuilder {
 
 		rowBuilt();
 
+		setDividerWidth(matchWidthDivider);
+
 		return ll;
 	}
 
+	protected void setDividerWidth(boolean matchWidthDivider) {
+		this.matchWidthDivider = matchWidthDivider;
+	}
+
 	protected void copyToClipboard(String text, Context ctx) {
 		((ClipboardManager) app.getSystemService(Activity.CLIPBOARD_SERVICE)).setText(text);
 		Toast.makeText(ctx,
@@ -650,15 +653,11 @@ public class MenuBuilder {
 		rowBuilt();
 	}
 
-	public void buildRowDivider(View view, boolean matchWidth) {
+	public void buildRowDivider(View view) {
-		if (matchWidthDivider) {
-			matchWidth = true;
-			matchWidthDivider = false;
-		}
 		View horizontalLine = new View(view.getContext());
 		LinearLayout.LayoutParams llHorLineParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, dpToPx(1f));
 		llHorLineParams.gravity = Gravity.BOTTOM;
-		if (!matchWidth) {
+		if (!matchWidthDivider) {
 			llHorLineParams.setMargins(dpToPx(64f), 0, 0, 0);
 		}
 		horizontalLine.setLayoutParams(llHorLineParams);
@@ -711,82 +710,9 @@ public class MenuBuilder {
 		);
 	}
 
-	private View buildTransportRowItem(View view, TransportStopRoute route, OnClickListener listener) {
+	private void buildTransportRouteRow(ViewGroup parent, TransportStopRoute r, OnClickListener listener) {
-		LinearLayout baseView = new LinearLayout(view.getContext());
+		if (!isFirstRow()) {
-		baseView.setOrientation(LinearLayout.HORIZONTAL);
+			buildRowDivider(parent);
-		LinearLayout.LayoutParams llBaseViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-		baseView.setLayoutParams(llBaseViewParams);
-		baseView.setPadding(dpToPx(16), 0, dpToPx(16), dpToPx(12));
-		baseView.setBackgroundResource(AndroidUtils.resolveAttribute(view.getContext(), android.R.attr.selectableItemBackground));
-
-		TextViewEx transportRect = new TextViewEx(view.getContext());
-		LinearLayout.LayoutParams trParams = new LinearLayout.LayoutParams(dpToPx(32), dpToPx(18));
-		trParams.setMargins(0, dpToPx(16), 0, 0);
-		transportRect.setLayoutParams(trParams);
-		transportRect.setGravity(Gravity.CENTER);
-		transportRect.setAllCaps(true);
-		transportRect.setTypeface(FontCache.getRobotoMedium(view.getContext()));
-		transportRect.setTextColor(Color.WHITE);
-		transportRect.setTextSize(10);
-
-		GradientDrawable shape = new GradientDrawable();
-		shape.setShape(GradientDrawable.RECTANGLE);
-		shape.setCornerRadius(dpToPx(3));
-		shape.setColor(route.getColor(mapActivity.getMyApplication(), !light));
-
-		transportRect.setBackgroundDrawable(shape);
-		transportRect.setText(route.route.getRef());
-		baseView.addView(transportRect);
-
-		LinearLayout infoView = new LinearLayout(view.getContext());
-		infoView.setOrientation(LinearLayout.VERTICAL);
-		LinearLayout.LayoutParams infoViewLayoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		infoViewLayoutParams.setMargins(dpToPx(16), dpToPx(12), dpToPx(16), 0);
-		infoView.setLayoutParams(infoViewLayoutParams);
-		baseView.addView(infoView);
-
-		TextView titleView = new TextView(view.getContext());
-		LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		titleView.setLayoutParams(titleParams);
-		titleView.setTextSize(16);
-		titleView.setTextColor(app.getResources().getColor(light ? R.color.ctx_menu_bottom_view_text_color_light : R.color.ctx_menu_bottom_view_text_color_dark));
-		titleView.setText(route.getDescription(getMapActivity().getMyApplication(), true));
-		infoView.addView(titleView);
-
-		LinearLayout typeView = new LinearLayout(view.getContext());
-		typeView.setOrientation(LinearLayout.HORIZONTAL);
-		LinearLayout.LayoutParams typeViewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		typeViewParams.setMargins(0, dpToPx(8), 0, 0);
-		typeView.setGravity(Gravity.CENTER);
-		typeView.setLayoutParams(typeViewParams);
-		infoView.addView(typeView);
-
-		ImageView typeImageView = new ImageView(view.getContext());
-		LinearLayout.LayoutParams typeImageParams = new LinearLayout.LayoutParams(dpToPx(16), dpToPx(16));
-		typeImageParams.setMargins(dpToPx(4), 0, dpToPx(4), 0);
-		typeImageView.setLayoutParams(typeImageParams);
-		int drawableResId = route.type == null ? R.drawable.ic_action_polygom_dark : route.type.getResourceId();
-		typeImageView.setImageDrawable(getRowIcon(drawableResId));
-		typeView.addView(typeImageView);
-
-		TextView typeTextView = new TextView(view.getContext());
-		LinearLayout.LayoutParams typeTextParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-		typeTextView.setLayoutParams(typeTextParams);
-		typeTextView.setText(route.getTypeStrRes());
-		typeView.addView(typeTextView);
-
-		baseView.setOnClickListener(listener);
-
-		((ViewGroup) view).addView(baseView);
-
-		return baseView;
-	}
-
-	private void buildTransportRouteRow(ViewGroup parent, TransportStopRoute r, OnClickListener listener, boolean showDivider) {
-		buildTransportRowItem(parent, r, listener);
-
-		if (showDivider) {
-			buildRowDivider(parent, false);
 		}
 	}
 

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

@@ -63,18 +63,18 @@ public class AmenityMenuBuilder extends MenuBuilder {
 	private void buildRow(View view, int iconId, String text, String textPrefix,
 						  boolean collapsable, final CollapsableView collapsableView,
 						  int textColor, boolean isWiki, boolean isText, boolean needLinks,
-						  boolean isPhoneNumber, boolean isUrl) {
+						  boolean isPhoneNumber, boolean isUrl, boolean matchWidthDivider) {
 		buildRow(view, iconId == 0 ? null : getRowIcon(iconId), text, textPrefix, collapsable, collapsableView, textColor,
-				isWiki, isText, needLinks, isPhoneNumber, isUrl);
+				isWiki, isText, needLinks, isPhoneNumber, isUrl, matchWidthDivider);
 	}
 
 	protected void buildRow(final View view, Drawable icon, final String text, final String textPrefix,
 							boolean collapsable, final CollapsableView collapsableView,
 							int textColor, boolean isWiki, boolean isText, boolean needLinks,
-							boolean isPhoneNumber, boolean isUrl) {
+							boolean isPhoneNumber, boolean isUrl, boolean matchWidthDivider) {
 
 		if (!isFirstRow()) {
-			buildRowDivider(view, false);
+			buildRowDivider(view);
 		}
 
 		final String txt;
@@ -244,8 +244,6 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			button.setCompoundDrawablesWithIntrinsicBounds(compoundDrawable, null, null, null);
 			button.setCompoundDrawablePadding(dpToPx(8f));
 			llText.addView(button);
-
-			matchWidthDivider = true;
 		}
 
 		((LinearLayout) view).addView(baseView);
@@ -300,6 +298,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
 		}
 
 		rowBuilt();
+
+		setDividerWidth(matchWidthDivider);
 	}
 
 	@Override
@@ -449,15 +449,16 @@ public class AmenityMenuBuilder extends MenuBuilder {
 				isUrl = true;
 			}
 
+			boolean matchWidthDivider = !isDescription && isWiki;
 			if (isDescription) {
 				descriptions.add(new AmenityInfoRow(key, R.drawable.ic_action_note_dark, textPrefix,
-						vl, collapsable, collapsableView, 0, false, true, true, 0, "", false, false));
+						vl, collapsable, collapsableView, 0, false, true, true, 0, "", false, false, matchWidthDivider));
 			} else if (icon != null) {
 				infoRows.add(new AmenityInfoRow(key, icon, textPrefix, vl, collapsable, collapsableView,
-						textColor, isWiki, isText, needLinks, poiTypeOrder, poiTypeKeyName, isPhoneNumber, isUrl));
+						textColor, isWiki, isText, needLinks, poiTypeOrder, poiTypeKeyName, isPhoneNumber, isUrl, matchWidthDivider));
 			} else {
 				infoRows.add(new AmenityInfoRow(key, iconId, textPrefix, vl, collapsable, collapsableView,
-						textColor, isWiki, isText, needLinks, poiTypeOrder, poiTypeKeyName, isPhoneNumber, isUrl));
+						textColor, isWiki, isText, needLinks, poiTypeOrder, poiTypeKeyName, isPhoneNumber, isUrl, matchWidthDivider));
 			}
 		}
 
@@ -500,7 +501,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			AmenityInfoRow wikiInfo = new AmenityInfoRow(
 					"nearest_wiki", R.drawable.ic_action_wikipedia, null, app.getString(R.string.wiki_around) + " (" + nearestWiki.size() + ")", true,
 					getCollapsableWikiView(view.getContext(), true),
-					0, false, false, false, 1000, null, false, false);
+					0, false, false, false, 1000, null, false, false, false);
 			buildAmenityRow(view, wikiInfo);
 		}
 
@@ -517,11 +518,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
 				link = "https://www.openstreetmap.org/way/";
 			}
 			buildRow(view, R.drawable.ic_action_info_dark, link + (amenity.getId() >> 1),
-					0, false, null, true, 0, true, null);
+					0, false, null, true, 0, true, null, false);
 		}
 		buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
 				amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude(), true)
-				.replaceAll("\n", " "), 0, false, null, false, 0, false, null);
+				.replaceAll("\n", " "), 0, false, null, false, 0, false, null, false);
 		//if (st.COORDINATES_FORMAT.get() != PointDescription.OLC_FORMAT)
 		//	buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationOlcName(
 		//			amenity.getLocation().getLatitude(), amenity.getLocation().getLongitude())
@@ -532,10 +533,10 @@ public class AmenityMenuBuilder extends MenuBuilder {
 	public void buildAmenityRow(View view, AmenityInfoRow info) {
 		if (info.icon != null) {
 			buildRow(view, info.icon, info.text, info.textPrefix, info.collapsable, info.collapsableView,
-					info.textColor, info.isWiki, info.isText, info.needLinks, info.isPhoneNumber, info.isUrl);
+					info.textColor, info.isWiki, info.isText, info.needLinks, info.isPhoneNumber, info.isUrl, info.matchWidthDivider);
 		} else {
 			buildRow(view, info.iconId, info.text, info.textPrefix, info.collapsable, info.collapsableView,
-					info.textColor, info.isWiki, info.isText, info.needLinks, info.isPhoneNumber, info.isUrl);
+					info.textColor, info.isWiki, info.isText, info.needLinks, info.isPhoneNumber, info.isUrl, info.matchWidthDivider);
 		}
 	}
 
@@ -570,11 +571,12 @@ public class AmenityMenuBuilder extends MenuBuilder {
 		private boolean isUrl;
 		private int order;
 		private String name;
+		private boolean matchWidthDivider;
 
 		public AmenityInfoRow(String key, Drawable icon, String textPrefix, String text,
 							  boolean collapsable, CollapsableView collapsableView,
 							  int textColor, boolean isWiki, boolean isText, boolean needLinks,
-							  int order, String name, boolean isPhoneNumber, boolean isUrl) {
+							  int order, String name, boolean isPhoneNumber, boolean isUrl, boolean matchWidthDivider) {
 			this.key = key;
 			this.icon = icon;
 			this.textPrefix = textPrefix;
@@ -589,12 +591,13 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			this.name = name;
 			this.isPhoneNumber = isPhoneNumber;
 			this.isUrl = isUrl;
+			this.matchWidthDivider = matchWidthDivider;
 		}
 
 		public AmenityInfoRow(String key, int iconId, String textPrefix, String text,
 							  boolean collapsable, CollapsableView collapsableView,
 							  int textColor, boolean isWiki, boolean isText, boolean needLinks,
-							  int order, String name, boolean isPhoneNumber, boolean isUrl) {
+							  int order, String name, boolean isPhoneNumber, boolean isUrl, boolean matchWidthDivider) {
 			this.key = key;
 			this.iconId = iconId;
 			this.textPrefix = textPrefix;
@@ -609,6 +612,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
 			this.name = name;
 			this.isPhoneNumber = isPhoneNumber;
 			this.isUrl = isUrl;
+			this.matchWidthDivider = matchWidthDivider;
 		}
 	}
 }

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

@@ -78,9 +78,9 @@ public class FavouritePointMenuBuilder extends MenuBuilder {
 			int disabledColor = light ? R.color.secondary_text_light : R.color.secondary_text_dark;
 			color = favoriteGroup.visible ? (color | 0xff000000) : view.getResources().getColor(disabledColor);
 			String name = view.getContext().getString(R.string.context_menu_points_of_group);
-			buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_action_folder, color), name, 0,
+			buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_action_folder, color), name, 0, null,
 					true, getCollapsableFavouritesView(view.getContext(), true, favoriteGroup, fav),
-					false, 0, false, null);
+					false, 0, false, null, false);
 		}
 	}
 

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

@@ -34,7 +34,7 @@ public class GpxItemMenuBuilder extends MenuBuilder {
 		String description = GpxUiHelper.getDescription(app, item.analysis, false);
 		String[] lines = description.split("\n");
 		for (String line : lines) {
-			buildRow(view, R.drawable.ic_action_info_dark, line, 0, false, null, false, 0, false, null);
+			buildRow(view, R.drawable.ic_action_info_dark, line, 0, false, null, false, 0, false, null, false);
 		}
 	}
 

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

@@ -44,23 +44,23 @@ public class WptPtMenuBuilder extends MenuBuilder {
 			DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(view.getContext());
 			Date date = new Date(wpt.time);
 			buildRow(view, R.drawable.ic_action_data,
-					dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, null, false, 0, false, null);
+					dateFormat.format(date) + " — " + timeFormat.format(date), 0, false, null, false, 0, false, null, false);
 		}
 		if (wpt.speed > 0) {
 			buildRow(view, R.drawable.ic_action_speed,
-					OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, null, false, 0, false, null);
+					OsmAndFormatter.getFormattedSpeed((float)wpt.speed, app), 0, false, null, false, 0, false, null, false);
 		}
 		if (!Double.isNaN(wpt.ele)) {
 			buildRow(view, R.drawable.ic_action_altitude,
-					OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, null, false, 0, false, null);
+					OsmAndFormatter.getFormattedDistance((float) wpt.ele, app), 0, false, null, false, 0, false, null, false);
 		}
 		if (!Double.isNaN(wpt.hdop)) {
 			buildRow(view, R.drawable.ic_action_gps_info,
 					Algorithms.capitalizeFirstLetterAndLowercase(app.getString(R.string.plugin_distance_point_hdop)) + ": " + (int)wpt.hdop, 0,
-					false, null, false, 0, false, null);
+					false, null, false, 0, false, null, false);
 		}
 		if (!Algorithms.isEmpty(wpt.desc)) {
-			final View row = buildRow(view, R.drawable.ic_action_note_dark, wpt.desc, 0, false, null, true, 10, false, null);
+			final View row = buildRow(view, R.drawable.ic_action_note_dark, wpt.desc, 0, false, null, true, 10, false, null, false);
 			row.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -71,7 +71,7 @@ public class WptPtMenuBuilder extends MenuBuilder {
 		}
 		if (!Algorithms.isEmpty(wpt.comment)) {
 			final View rowc = buildRow(view, R.drawable.ic_action_note_dark, wpt.comment, 0,
-					false, null, true, 10, false, null);
+					false, null, true, 10, false, null, false);
 			rowc.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -98,7 +98,7 @@ public class WptPtMenuBuilder extends MenuBuilder {
 				int color = getPointColor(wpt, getFileColor(selectedGpxFile));
 				buildRow(view, app.getIconsCache().getPaintedIcon(R.drawable.ic_type_waypoints_group, color), title, 0, gpxName,
 						true, getCollapsableWaypointsView(view.getContext(), true, gpx, wpt),
-						false, 0, false, null);
+						false, 0, false, null, false);
 			}
 		}
 	}

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

@@ -65,17 +65,15 @@ public class AmenityMenuController extends MenuController {
 					new MapMarkerMenuController(mapActivity, marker.getPointDescription(mapActivity), marker);
 			leftTitleButtonController = markerMenuController.getLeftTitleButtonController();
 			rightTitleButtonController = markerMenuController.getRightTitleButtonController();
-		} else {
+		} else if (amenity.getType().isWiki()) {
-			if (amenity.getType().isWiki()) {
+			leftTitleButtonController = new TitleButtonController() {
-				leftTitleButtonController = new TitleButtonController() {
+				@Override
-					@Override
+				public void buttonPressed() {
-					public void buttonPressed() {
+					POIMapLayer.showWikipediaDialog(mapActivity, mapActivity.getMyApplication(), amenity);
-						POIMapLayer.showWikipediaDialog(mapActivity, mapActivity.getMyApplication(), amenity);
+				}
-					}
+			};
-				};
+			leftTitleButtonController.caption = getMapActivity().getString(R.string.context_menu_read_article);
-				leftTitleButtonController.caption = getMapActivity().getString(R.string.context_menu_read_article);
+			leftTitleButtonController.leftIcon = getIcon(R.drawable.ic_action_note_dark, isLight() ? R.color.ctx_menu_controller_button_text_color_light_n : R.color.ctx_menu_controller_button_text_color_dark_n);
-				leftTitleButtonController.leftIcon = getIcon(R.drawable.ic_action_note_dark, isLight() ? R.color.ctx_menu_controller_button_text_color_light_n : R.color.ctx_menu_controller_button_text_color_dark_n);
-			}
 		}
 
 		openingHoursInfo = processOpeningHours(amenity);

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

@@ -20,10 +20,14 @@ import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditor;
 import net.osmand.plus.mapcontextmenu.editors.FavoritePointEditorFragment;
 import net.osmand.util.Algorithms;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class FavouritePointMenuController extends MenuController {
 
 	private FavouritePoint fav;
 	private MapMarker mapMarker;
+	private List<TransportStopController.TransportStopRoute> routes = new ArrayList<>();
 	private OpeningHoursInfo openingHoursInfo;
 
 	public FavouritePointMenuController(MapActivity mapActivity, PointDescription pointDescription, final FavouritePoint fav) {
@@ -44,7 +48,8 @@ public class FavouritePointMenuController extends MenuController {
 		if (getObject() instanceof TransportStop) {
 			TransportStop stop = (TransportStop) getObject();
 			TransportStopController transportStopController = new TransportStopController(getMapActivity(), pointDescription, stop);
-			transportStopController.processTransportStop(builder);
+			routes = transportStopController.processTransportStop();
+			builder.setRoutes(routes);
 		}
 
 		Object originObject = getBuilder().getOriginObject();
@@ -65,6 +70,11 @@ public class FavouritePointMenuController extends MenuController {
 		return fav;
 	}
 
+	@Override
+	public List<TransportStopController.TransportStopRoute> getTransportStopRoutes() {
+		return routes;
+	}
+
 	@Override
 	public boolean handleSingleTapOnMap() {
 		Fragment fragment = getMapActivity().getSupportFragmentManager().findFragmentByTag(FavoritePointEditor.TAG);

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

@@ -36,14 +36,16 @@ public class TransportStopController extends MenuController {
 								   PointDescription pointDescription, TransportStop transportStop) {
 		super(new MenuBuilder(mapActivity), pointDescription, mapActivity);
 		this.transportStop = transportStop;
-		processTransportStop(builder);
+		routes = processTransportStop();
+		builder.setRoutes(routes);
 	}
 
 	@Override
 	protected void setObject(Object object) {
 		if (object instanceof TransportStop) {
 			this.transportStop = (TransportStop) object;
-			processTransportStop(builder);
+			routes = processTransportStop();
+			builder.setRoutes(routes);
 		}
 	}
 
@@ -81,8 +83,8 @@ public class TransportStopController extends MenuController {
 		return getPointDescription().getTypeName();
 	}
 
-	public void processTransportStop(MenuBuilder builder) {
+	public List<TransportStopRoute> processTransportStop() {
-		routes.clear();
+		ArrayList<TransportStopRoute> routes = new ArrayList<>();
 		List<TransportIndexRepository> reps = getMapActivity().getMyApplication()
 				.getResourceManager().searchTransportRepositories(transportStop.getLocation().getLatitude(),
 						transportStop.getLocation().getLongitude());
@@ -93,14 +95,14 @@ public class TransportStopController extends MenuController {
 			if (t.acceptTransportStop(transportStop)) {
 				boolean empty = transportStop.getReferencesToRoutes() == null || transportStop.getReferencesToRoutes().length == 0;
 				if(!empty) {
-					addRoutes(useEnglishNames, t, transportStop, transportStop, 0);
+					addRoutes(routes, useEnglishNames, t, transportStop, transportStop, 0);
 				}
 				ArrayList<TransportStop> ls = new ArrayList<>();
 				QuadRect ll = MapUtils.calculateLatLonBbox(transportStop.getLocation().getLatitude(), transportStop.getLocation().getLongitude(), 150);
 				t.searchTransportStops(ll.top, ll.left, ll.bottom, ll.right, -1, ls, null);
 				for(TransportStop tstop : ls) {
 					if(tstop.getId().longValue() != transportStop.getId().longValue() || empty) {
-						addRoutes(useEnglishNames, t, tstop, transportStop,  
+						addRoutes(routes, useEnglishNames, t, tstop, transportStop,
 								(int) MapUtils.getDistance(tstop.getLocation(), transportStop.getLocation()));
 					}
 				}
@@ -122,10 +124,10 @@ public class TransportStopController extends MenuController {
 			}
 		});
 
-		builder.setRoutes(routes);
+		return routes;
 	}
 
-	private void addRoutes(boolean useEnglishNames, TransportIndexRepository t, TransportStop s, TransportStop refStop, int dist) {
+	private void addRoutes(List<TransportStopRoute> routes, boolean useEnglishNames, TransportIndexRepository t, TransportStop s, TransportStop refStop, int dist) {
 		Collection<TransportRoute> rts = t.getRouteForStop(s);
 		if (rts != null) {
 			for (TransportRoute rs : rts) {
@@ -133,7 +135,7 @@ public class TransportStopController extends MenuController {
 				if (topType == null && type != null && type.isTopType()) {
 					topType = type;
 				}
-				if (!containsRef(rs)) {
+				if (!containsRef(routes, rs)) {
 					TransportStopRoute r = new TransportStopRoute();
 					r.type = type;
 					r.desc = useEnglishNames ? rs.getEnName(true) : rs.getName();
@@ -141,13 +143,13 @@ public class TransportStopController extends MenuController {
 					r.refStop = refStop;
 					r.stop = s;
 					r.distance = dist;
-					this.routes.add(r);
+					routes.add(r);
 				}
 			}
 		}
 	}
 
-	private boolean containsRef(TransportRoute transportRoute) {
+	private boolean containsRef(List<TransportStopRoute> routes, TransportRoute transportRoute) {
 		for (TransportStopRoute route : routes) {
 			if (route.route.getRef().equals(transportRoute.getRef())) {
 				return true;

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

@@ -33,13 +33,13 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
 	@NonNull
 	@Override
 	public View getView(final int position, @Nullable View convertView, @NonNull ViewGroup parent) {
-		View v = convertView;
+		if (convertView == null) {
-		if (v == null) {
+			convertView = menu.getMapActivity().getLayoutInflater().inflate(R.layout.menu_obj_list_item, parent, false);
-			v = menu.getMapActivity().getLayoutInflater().inflate(R.layout.menu_obj_list_item, parent, false);
 		}
 		final MapMultiSelectionMenu.MenuObject item = getItem(position);
 		if (item != null) {
-			v.setOnClickListener(new View.OnClickListener() {
+			AndroidUtils.setBackground(menu.getMapActivity(), convertView, !menu.isLight(), R.drawable.expandable_list_item_background_light, R.drawable.expandable_list_item_background_dark);
+			convertView.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View view) {
 					if (listener != null) {
@@ -48,8 +48,8 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
 				}
 			});
 			IconsCache iconsCache = menu.getMapActivity().getMyApplication().getIconsCache();
-			final View iconLayout = v.findViewById(R.id.context_menu_icon_layout);
+			final View iconLayout = convertView.findViewById(R.id.context_menu_icon_layout);
-			final ImageView iconView = (ImageView) v.findViewById(R.id.context_menu_icon_view);
+			final ImageView iconView = (ImageView) convertView.findViewById(R.id.context_menu_icon_view);
 			Drawable icon = item.getLeftIcon();
 			int iconId = item.getLeftIconId();
 			if (icon != null) {
@@ -64,13 +64,13 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
 			}
 
 			// Text line 1
-			TextView line1 = (TextView) v.findViewById(R.id.context_menu_line1);
+			TextView line1 = (TextView) convertView.findViewById(R.id.context_menu_line1);
-			((TextView) v.findViewById(R.id.context_menu_line1)).setTextColor(ContextCompat.getColor(getContext(),
+			((TextView) convertView.findViewById(R.id.context_menu_line1)).setTextColor(ContextCompat.getColor(getContext(),
 					!menu.isLight() ? R.color.ctx_menu_title_color_dark : R.color.ctx_menu_title_color_light));
 			line1.setText(item.getTitleStr());
 
 			// Text line 2
-			TextView line2 = (TextView) v.findViewById(R.id.context_menu_line2);
+			TextView line2 = (TextView) convertView.findViewById(R.id.context_menu_line2);
 			((TextView) line2).setTextColor(ContextCompat.getColor(getContext(), R.color.ctx_menu_subtitle_color));
 			line2.setText(item.getTypeStr());
 			Drawable slIcon = item.getTypeIcon();
@@ -78,11 +78,11 @@ public class MultiSelectionArrayAdapter extends ArrayAdapter<MapMultiSelectionMe
 			line2.setCompoundDrawablePadding(AndroidUtils.dpToPx(menu.getMapActivity(), 5f));
 
 			// Divider
-			View divider = v.findViewById(R.id.divider);
+			View divider = convertView.findViewById(R.id.divider);
 			divider.setVisibility(position != getCount() - 1 ? View.VISIBLE : View.GONE);
 		}
 
-		return v;
+		return convertView;
 	}
 
 	public interface OnClickListener {

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

@@ -30,8 +30,8 @@ public class EditPOIMenuBuilder extends MenuBuilder {
 		if (osmPoint instanceof OsmNotesPoint) {
 			OsmNotesPoint notes = (OsmNotesPoint) osmPoint;
 
-			buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false, null, false, 0, false, null);
+			buildRow(view, R.drawable.ic_action_note_dark, notes.getText(), 0, false, null, false, 0, false, null, false);
-			buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false, null, false, 0, false, null);
+			buildRow(view, R.drawable.ic_group, notes.getAuthor(), 0, false, null, false, 0, false, null, false);
 
 		} else if (osmPoint instanceof OpenstreetmapPoint) {
 			OpenstreetmapPoint point = (OpenstreetmapPoint) osmPoint;
@@ -56,7 +56,7 @@ public class EditPOIMenuBuilder extends MenuBuilder {
 					if (resId == 0) {
 						resId = R.drawable.ic_action_folder_stroke;
 					}
-					buildRow(view, resId, poiTranslation, 0, false, null, false, 0, false, null);
+					buildRow(view, resId, poiTranslation, 0, false, null, false, 0, false, null, false);
 					break;
 				}
 			}
@@ -67,12 +67,12 @@ public class EditPOIMenuBuilder extends MenuBuilder {
 					continue;
 				}
 				String text = e.getKey() + "=" + e.getValue();
-				buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, null, false, 0, false, null);
+				buildRow(view, R.drawable.ic_action_info_dark, text, 0, false, null, false, 0, false, null, false);
 			}
 		}
 
 		buildRow(view, R.drawable.ic_action_get_my_location, PointDescription.getLocationName(app,
 				osmPoint.getLatitude(), osmPoint.getLongitude(), true)
-				.replaceAll("\n", " "), 0, false, null, false, 0, false, null);
+				.replaceAll("\n", " "), 0, false, null, false, 0, false, null, false);
 	}
 }