Resolve merge conflict in strings

OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java

@@ -643,7 +643,7 @@ public class OpeningHoursParser {
 		private boolean off = false;
 
 		/**
-		 * Aadditional information or limitation.
+		 * Additional information or limitation.
 		 * https://wiki.openstreetmap.org/wiki/Key:opening_hours/specification#explain:comment
 		 */
 		private String comment;
@@ -1106,7 +1106,7 @@ public class OpeningHoursParser {
 						} else if (time > endTime && days[ad] && checkAnotherDay) {
 							diff = 24 * 60 - endTime  + time;
 						}
-						if (limit == WITHOUT_TIME_LIMIT || (diff != -1 && diff <= limit || limit == CURRENT_DAY_TIME_LIMIT)) {
+						if (limit == WITHOUT_TIME_LIMIT || ((diff != -1 && diff <= limit) || limit == CURRENT_DAY_TIME_LIMIT)) {
 							formatTime(startTime, sb);
 							break;
 						}

OsmAnd/res/layout/map_context_menu_fragment.xml

@@ -8,7 +8,7 @@
     android:layout_height="match_parent"
     android:background="@android:color/transparent">
 
-    <LinearLayout
+    <net.osmand.plus.mapcontextmenu.InterceptorLinearLayout
         android:id="@+id/context_menu_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -19,7 +19,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/bg_map_context_menu"
-            android:clickable="true"
             android:orientation="vertical">
 
             <LinearLayout
@@ -398,7 +397,6 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:background="?selectableItemBackground"
-                    android:clickable="true"
                     android:gravity="center"
                     android:orientation="vertical"
                     android:paddingBottom="@dimen/context_menu_main_actions_padding_bottom"
@@ -581,7 +579,7 @@
             android:foreground="@drawable/bg_contextmenu_shadow"
             android:foregroundGravity="top|fill_horizontal">
 
-            <ScrollView
+            <net.osmand.plus.LockableScrollView
                 android:id="@+id/context_menu_bottom_scroll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -596,10 +594,11 @@
 
                 </LinearLayout>
 
-            </ScrollView>
+            </net.osmand.plus.LockableScrollView>
+
         </FrameLayout>
 
-    </LinearLayout>
+    </net.osmand.plus.mapcontextmenu.InterceptorLinearLayout>
 
     <FrameLayout
         android:id="@+id/context_menu_fab_container"

OsmAnd/res/values-az/strings.xml

@@ -1792,7 +1792,7 @@
     <string name="is_saved">yadda saxlandı</string>
     <string name="marker_save_as_track_descr">İşarələri burada göstərə biləcəyiniz fayla ixrac edin:</string>
     <string name="move_to_history">Tarixçəyə daşı</string>
-    <string name="group_will_be_removed_after_restart">Proqramı yenidən başladıldıqdan sonra qrup silinəcək.</string>
+    <string name="group_will_be_removed_after_restart">Proqram yenidən başladıldıqdan sonra qrup silinəcək.</string>
     <string name="show_arrows_on_the_map">Xəritədə oxları göstər</string>
     <string name="remove_from_map_markers">Xəritə işarələrindən sil</string>
     <string name="descendingly">azalan</string>
@@ -1816,4 +1816,15 @@
     <string name="switch_start_finish">Başlanğıc və təyinat nöqtələrinin yerini dəyiş</string>
     <string name="shared_string_undo_all">HAMISINI QAYTAR</string>
     <string name="shared_string_undo">QAYTAR</string>
+    <string name="save_poi_without_poi_type_message">POI-ni həqiqətən POI növü olmadan yadda saxlamaq istəyirsiniz?</string>
+    <string name="missing_write_external_storage_permission">Proqramın SD kartdan istifadə etmək icazəsi yoxdur</string>
+    <string name="quick_action_navigation_voice">Səs yanılı/sönülü</string>
+    <string name="quick_action_navigation_voice_off">Səs sönülüdür</string>
+    <string name="quick_action_navigation_voice_on">Səs yanılıdır</string>
+    <string name="quick_action_new_action">Fəaliyyət əlavə et</string>
+    <string name="quick_action_edit_action">Fəaliyyətə düzəliş et</string>
+    <string name="dialog_add_action_title">Fəaliyyət əlavə et</string>
+    <string name="quick_actions_delete">Fəaliyyəti sil</string>
+    <string name="quick_actions_delete_text">“%s” fəaliyyətini silmək istədiyinizə əminsiniz?</string>
+    <string name="quick_favorites_show_favorites_dialog">Favoritlər dialoqunu göstər</string>
     </resources>

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

@@ -2936,11 +2936,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="empty_state_av_notes">Rabi natatki!</string>
     <string name="empty_state_av_notes_desc">Dadajcie aŭdyjo-, videa- ci fotanatatku na lubuju kropku na mapie, vykarystoŭvajučy vidžet ci kantekstnaje mieniu.</string>
     <string name="modify_the_search_query">Źmianicie pošukavy zapyt.</string>
-    <string name="release_3_0">• Vyjaŭliennie stop-sihnalaŭ ciapier uličvaje napramak ruchu
+    <string name="release_3_0">\\022 
-\n
-\n • Navy alharytm, što nadaje dziejsnyja značenni padjomu/spusku dlia GPX-sliadoŭ
-\n
-\n • Čas chadźby ŭ zaliežnasci ad miascovasci (padjomu) (pravila Niejsmita)
 \n
 \n</string>
     <string name="what_is_here">Što tut:</string>
@@ -2972,7 +2968,13 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="lang_lo">Łaoskaja</string>
     <string name="will_open_tomorrow_at">Adčynicca zaŭtra a</string>
     <string name="rendering_attr_hidePOILabels_name">Nazvy POI</string>
-    <string name="release_2_9">\\022 Abnoŭlienaje kantekstnaje mieniu: pakazvaje kali adkryvajucca/zakryvajucca POI 
+    <string name="release_2_9">• Vyjaŭliennie stop-sihnalaŭ ciapier uličvaje napramak ruchu
+\n
+\n • Navy alharytm, što nadaje dziejsnyja značenni padjomu/spusku dlia GPX-sliadoŭ
+\n
+\n • Čas chadźby ŭ zaliežnasci ad miascovasci (padjomu) (pravila Niejsmita)
+\n
+\n • Abnoŭlienaje kantekstnaje mieniu: pakazvaje kali adkryvajucca/zakryvajucca POI 
 \n 
 \n • Mieniu transparta: usie dastupnyja maršruty ciapier na miescie 
 \n 
@@ -2991,4 +2993,6 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="winter_and_ski_renderer">Zimovy/lyžny</string>
     <string name="touring_view_renderer">Turystyčny (kantrast i detali)</string>
     <string name="nautical_renderer">Marski</string>
+<string name="copy_location_name">Kapijavać nazvu kropki/POI</string>
+    <string name="toast_empty_name_error">Miesca nie maje nazvy</string>
 </resources>

OsmAnd/res/values-be/strings.xml

@@ -2985,11 +2985,7 @@
     <string name="empty_state_av_notes">Рабі нататкі!</string>
     <string name="empty_state_av_notes_desc">Дадайце аўдыё-, відэа- ці фотанататку на любую кропку на мапе, выкарыстоўваючы віджэт ці кантэкстнае меню.</string>
     <string name="modify_the_search_query">Зьмяніце пошукавы запыт.</string>
-    <string name="release_3_0">• Выяўленне стоп-сігналаў цяпер улічвае напрамак руху
+    <string name="release_3_0">\\022 
-\n
-\n • Навы алгарытм, што надае дзейсныя значэнні пад\'ёму/спуску для GPX-слядоў
-\n
-\n • Час хадзьбы ў залежнасці ад мясцовасці (пад\'ёму) (правіла Нейсміта)
 \n
 \n</string>
     <string name="what_is_here">Што тут:</string>
@@ -3020,7 +3016,13 @@
     <string name="shared_string_without_name">Без назвы</string>
     <string name="lang_lo">Лаоская</string>
     <string name="rendering_attr_hidePOILabels_name">Назвы POI</string>
-    <string name="release_2_9">\\022 Абноўленае кантэкстнае меню: паказвае калі адкрываюцца/закрываюцца POI
+    <string name="release_2_9">• Выяўленне стоп-сігналаў цяпер улічвае напрамак руху
+\n
+\n • Навы алгарытм, што надае дзейсныя значэнні пад\'ёму/спуску для GPX-слядоў
+\n
+\n • Час хадзьбы ў залежнасці ад мясцовасці (пад\'ёму) (правіла Нейсміта)
+\n
+\n • Абноўленае кантэкстнае меню: паказвае калі адкрываюцца/закрываюцца POI 
 \n 
 \n • Меню транспарта: усе даступныя маршруты цяпер на месце 
 \n 
@@ -3040,4 +3042,6 @@
     <string name="touring_view_renderer">Турыстычны (кантраст і дэталі)</string>
     <string name="nautical_renderer">Марскі</string>
 <string name="will_open_tomorrow_at">Адчыніцца заўтра а</string>
+    <string name="copy_location_name">Капіяваць назву кропкі/POI</string>
+    <string name="toast_empty_name_error">Месца не мае назвы</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3037,4 +3037,6 @@ Repræsenterer område: %1$s x %2$s</string>
 \n 
 \n</string>
     <string name="will_open_tomorrow_at">Åbner i morgen kl.</string>
+    <string name="copy_location_name">Kopiér Punkt/IP-navn</string>
+    <string name="toast_empty_name_error">Placering har intet navn</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -613,7 +613,7 @@
 	<string name="poi_aquarium">Aquarium</string>
 	<string name="poi_team_handball">Handball</string>
   <string name="poi_shop">Geschäft</string>
-		<string name="poi_shop_food">Gemischtwaren- und Lebensmittelgeschäft</string>
+		<string name="poi_shop_food">Gemischtwarengeschäft und Supermarkt</string>
 	<string name="poi_emergency">Notfall</string>
 	<string name="poi_road_obstacle">Straßenhindernis</string>
 		<string name="poi_filling_station">Tankstelle</string>
@@ -3410,8 +3410,8 @@
 	<string name="poi_animal_shelter_mammal">Säugetiere</string>
 	<string name="poi_animal_shelter_fish">Fische</string>
 
-	<string name="poi_animal_shelter_type">Tierannahme</string>
+	<string name="poi_animal_shelter_type">Tiere erlaubt</string>
-	<string name="poi_animal_shelter_purpose">Bestimmung</string>
+	<string name="poi_animal_shelter_purpose">Zweck</string>
 
 <string name="poi_owner">Eigentümer</string>
 
@@ -3522,9 +3522,9 @@
 	<string name="poi_location_entrance">Lage: Eingang</string>
 
 	<string name="poi_operational_status">Betriebsstatus</string>
-	<string name="poi_water_supply_type">Wasser-Versorgungs-Art</string>
+	<string name="poi_water_supply_type">Wasserversorgungsart</string>
 	<string name="poi_water_purification">Wasseraufbereitung</string>
-	<string name="poi_water_place_access">Zugang zum Wasserplatz</string>
+	<string name="poi_water_place_access">Wasserplatzzugang</string>
 
 <string name="poi_location_rooftop">Lage: Auf dem Dach</string>
 	<string name="poi_visibility_house">Sichtbarkeit: Haus</string>
@@ -3663,4 +3663,37 @@
 
 	<string name="poi_climbing_style">Klettertechnik</string>
 
+<string name="poi_ref_post">Postleitzahl</string>
+
+	<string name="poi_climbing_sport_yes">Sport: ja</string>
+	<string name="poi_climbing_sport_no">Sport: nein</string>
+	<string name="poi_climbing_trad_yes">Traditionell: ja</string>
+	<string name="poi_climbing_trad_no">Traditionell: nein</string>
+	<string name="poi_climbing_ice_yes">Eis: ja</string>
+	<string name="poi_climbing_ice_no">Eis: nein</string>
+	<string name="poi_climbing_rock_limestone">Kletterfelsen: Kalkstein</string>
+	<string name="poi_climbing_rock_granite">Kletterfelsen: Granit</string>
+	<string name="poi_climbing_rock_sandstone">Kletterfelsen: Sandstein</string>
+	<string name="poi_climbing_rock_quartzite">Kletterfelsen: Quarzit</string>
+	<string name="poi_climbing_rock_gneiss">Kletterfelsen: Gneis</string>
+	<string name="poi_climbing_rock_porphyry">Kletterfelsen: Porphyr</string>
+	<string name="poi_climbing_orientation_n">Wandausrichtung: N</string>
+	<string name="poi_climbing_orientation_ne">Wandausrichtung: NO</string>
+	<string name="poi_climbing_orientation_e">Wandausrichtung: O</string>
+	<string name="poi_climbing_orientation_se">Wandausrichtung: SO</string>
+	<string name="poi_climbing_orientation_s">Wandausrichtung: S</string>
+	<string name="poi_climbing_orientation_sw">Wandausrichtung: SW</string>
+	<string name="poi_climbing_orientation_w">Wandausrichtung: W</string>
+	<string name="poi_climbing_orientation_nw">Wandausrichtung: NW</string>
+	<string name="poi_climbing_routes">Kletterrouten</string>
+
+	<string name="poi_diameter_crown">Durchmesser der Krone</string>
+
+	<string name="poi_meadow_agricultural">Typ: landwirtschaftlich</string>
+	<string name="poi_meadow_transitional">Typ: vorübergehend</string>
+	<string name="poi_frozen_food">Tiefkühlkost</string>
+
+	<string name="poi_agrarian">Hofladen</string>
+
+
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -1672,7 +1672,7 @@ Mit Neuanmeldung fortfahren?</string>
     
     <string name="shared_string_show_all">Alle anzeigen</string>
     <string name="coordinates">Koordinaten</string>
-    <string name="error_avoid_specific_road">Es konnte keine alternative Streckenführung gefunden werden</string>
+    <string name="error_avoid_specific_road">Keine Umgehungsstraße gefunden</string>
     <string name="shared_string_dismiss">Verwerfen</string>
     <string name="everything_up_to_date">Alle Daten aktuell</string>
     <string name="use_opengl_render">OpenGL-Rendering verwenden</string>
@@ -1720,7 +1720,7 @@ Mit Neuanmeldung fortfahren?</string>
     <string name="shared_string_my_location">Meine Position</string>
 
     <string name="navigation_over_track">Navigation entlang der Strecke starten?</string>
-    <string name="avoid_roads_msg">Sie können die Route ändern, indem Sie Straßen auswählen, die vermieden werden sollen</string>
+    <string name="avoid_roads_msg">Sie können eine Alternativroute einleiten, indem Sie Straßen auswählen, die vermieden werden sollen</string>
     <string name="enable_proxy_title">HTTP-Proxy aktivieren</string>
     <string name="enable_proxy_descr">HTTP-Proxy für alle Netzwerkanfragen einrichten.</string>
     <string name="proxy_host_title">Proxy-Host</string>
@@ -2806,7 +2806,7 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="import_track">Track importieren</string>
     <string name="import_track_desc">Die Datei %1$s enthält keine Wegpunkte, soll sie als Track importiert werden?</string>
     <string name="move_point">Punkt verschieben</string>
-    <string name="add_segment_to_the_track">Zu einem GPX-Track hinzufügen</string>
+    <string name="add_segment_to_the_track">Zu einer GPX-Spur hinzufügen</string>
 <string name="do_not_use_animations">Verwenden Sie keine Animationen</string>
     <string name="do_not_use_animations_descr">Deaktiviert Animationen in der App.</string>
     <string name="keep_showing_on_map">Weiterhin auf der Karte anzeigen</string>
@@ -2871,15 +2871,27 @@ Abgedeckte Fläche: %1$s x %2$s</string>
 \n• Bug-Fixes, neue Daten auf dem Server alle 30 Minuten, Updates implementiert in der Navigation
 \n
 \n</string>
-	<string name="release_2_9">
+	<string name="release_2_9">\\022 Erkennung von Stoppschildern jetzt nach Fahrtrichtung 
-	\u2022 Aktualisiert das Kontextmenü: Zeige, wenn der POI geöffnet / geschlossen wird\n\n
+\n 
-	\u2022 Transportmenü: Alle verfügbaren Routen sind jetzt oben\n\n
+\n • Neuer Algorithmus für die Bereitstellung von sinnvollen Auf-/Abstieg-Werten für GPX-Spuren
-	\u2022 Wikipedia: Die Schaltfläche zum Öffnen des Originalartikels hinzugefügt, das Erscheinungsbild der Artikel aktualisiert\n\n
+\n 
-	\u2022 Route: Möglichkeit, Start- und Endpunkte in einem Tipp zu tauschen\n\n
+\n • Dauer des Aufstiegs entsprechend dem Gelände (Naismiths Regel) 
-	\u2022 Notizen: Sortierung nach Typ und Datum hinzugefügt\n\n
+\n
-	\u2022 OSM-Bearbeitungen: Symbolen und Namen für die POI-Kategorie und abgeschlossene Aktionen anzeigen\n\n
+\n • Kontextmenü aktualisiert: Anzeigen, wann der POI geöffnet / geschlossen wird
-	\u2022 Neuer schneller Koordinateneingabebildschirm für die schnelle Erstellung von Markern\n\n
+\n
-	</string>
+\n • Transportmenü: Alle verfügbaren Routen sind jetzt oben
+\n
+\n • Wikipedia: Die Schaltfläche zum Öffnen des Originalartikels hinzugefügt, das Erscheinungsbild der Artikel aktualisiert
+\n
+\n • Route: Möglichkeit zum Tausch der Start- und Endpunkte mit einem Tipp hinzugefügt
+\n
+\n • Notizen: Sortierung nach Typ und Datum hinzugefügt
+\n
+\n • OSM-Bearbeitungen: Symbolen und Namen für die POI-Kategorie und abgeschlossene Aktionen anzeigen
+\n
+\n • Neuer schneller Koordinateneingabebildschirm für die schnelle Erstellung von Markern
+\n
+\n</string>
     <string name="rendering_value_darkyellow_name">Dunkelgelb</string>
     <string name="show_map">Karte anzeigen</string>
     <string name="route_is_calculated">Route wird berechnet</string>
@@ -2934,11 +2946,7 @@ Abgedeckte Fläche: %1$s x %2$s</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">Ein Tippen auf die Karte schaltet die Steuerschaltflächen und Bedienelemente um.</string>
-    <string name="release_3_0">• Erkennung von Stoppschildern jetzt nach Fahrtrichtung
+    <string name="release_3_0">\\022 
-\n
-\n• Neuer Algorithmus für die Bereitstellung von sinnvollen Auf-/Abstieg-Werten für GPX-tracks
-\n
-\n• Dauer des Aufstiegs entsprechend dem Gelände (Naismiths Regel)
 \n
 \n</string>
     <string name="one_tap_active">Aktivieren mit einem Tap</string>
@@ -2971,4 +2979,14 @@ Abgedeckte Fläche: %1$s x %2$s</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>
+<string name="will_open_tomorrow_at">Öffnet morgen um</string>
+    <string name="rendering_attr_hidePOILabels_name">POI-Beschriftungen</string>
+    <string name="shared_string_without_name">Ohne Name</string>
+    <string name="lang_lo">Laotisch</string>
+    <string name="day_off_label">aus</string>
+    <string name="winter_and_ski_renderer">Winter und Ski</string>
+    <string name="touring_view_renderer">Touring-Ansicht (Kontrast und Details)</string>
+    <string name="nautical_renderer">Nautisch</string>
+    <string name="copy_location_name">Punkt/POI-Name kopieren</string>
+    <string name="toast_empty_name_error">Ort hat keinen Namen</string>
 </resources>

OsmAnd/res/values-eo/phrases.xml

@@ -3712,4 +3712,17 @@
 	<string name="poi_climbing_routes">Grimpad-kursoj</string>
 
 
+<string name="poi_circumference">Ĉirkaŭo</string>
+	<string name="poi_diameter_crown">Ĉirkaŭo de arbokrono</string>
+
+	<string name="poi_meadow_agricultural">Speco: falĉata</string>
+	<string name="poi_meadow_perpetual">Speco: konservata de naturo</string>
+	<string name="poi_meadow_transitional">Speco: nekonservata (arbustiĝas)</string>
+	<string name="poi_meadow_pasture">Speco: paŝtejo</string>
+
+	<string name="poi_frozen_food">Frostigit-manĝaĵa vendejo</string>
+
+	<string name="poi_agrarian">Agrokultura vendejo</string>
+
+
 </resources>

OsmAnd/res/values-eo/strings.xml

@@ -2898,11 +2898,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="by_date">Laŭ dato</string>
     <string name="by_type">Laŭ speco</string>
     <string name="modify_the_search_query">Modifi serĉpeton</string>
-    <string name="release_3_0">• Ekkonado de STOP-signoj nun konsideras direkton de veturo
+    <string name="release_3_0">\\022 
-\n
-\n • Nova algoritmo liveranta sencplenajn valoroj de supreniro/malsupreniro por GPX-spuroj
-\n
-\n • Marŝada tempo konsideras profilon de tereno (regulo de Naismith)
 \n
 \n</string>
     <string name="empty_state_markers_history">\@string/shared_string_history</string>
@@ -2928,4 +2924,32 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="total_donations">Donacoj tute</string>
 <string name="shared_string_without_name">Sennoma</string>
     <string name="lang_lo">Laŭa</string>
+    <string name="will_open_tomorrow_at">Estos malfermita morgaŭ je</string>
+    <string name="rendering_attr_hidePOILabels_name">Etikedoj de interesejoj</string>
+    <string name="release_2_9">• Ekkonado de STOP-signoj nun konsideras direkton de veturo
+\n
+\n• Nova algoritmo liveranta sencplenajn valoroj de supreniro/malsupreniro por GPX-spuroj 
+\n 
+\n• Marŝada tempo konsideras profilon de tereno (regulo de Naismith)
+\n
+\n• Plibonigita kunteksta menuo: montras kiam interesejoj (mal)fermiĝas
+\n
+\n• Transporta menuo: ĉiuj disponeblaj kursoj nun montriĝas ĉe supre
+\n
+\n• Vikipedio: aldonis butonon por malfermi la originalan artikolon, plibonigita vidigo de artikoloj
+\n
+\n• Kurso: aldonis eblon por interŝanĝi komencan punkton per fina je unu frapeto
+\n
+\n• Notoj: aldonis ordigadon laŭ tipo aŭ dato
+\n
+\n• OSM-redaktoj: montras piktogramon kaj nomon de kategorion de interesejo, montras faritajn agojn
+\n
+\n• Nova rapida ekrano por enigi koordinatojn por rapide krei map-markojn
+\n</string>
+    <string name="day_off_label">fermita</string>
+    <string name="winter_and_ski_renderer">Vintro kaj skiado</string>
+    <string name="touring_view_renderer">Turisma mapo (kontrasta kaj detala)</string>
+    <string name="nautical_renderer">Marnavigada</string>
+    <string name="copy_location_name">Kopii nomon de punkto</string>
+    <string name="toast_empty_name_error">Loko estas sennoma</string>
 </resources>

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

@@ -210,7 +210,7 @@
 	<string name="poi_public_transport_platform_tram">Parada de tranvía</string>
 	<string name="poi_tram_stop">Parada de tranvía</string>
 	<string name="poi_public_transport_station">Estación de transporte público</string>
-	<string name="poi_bus_station">Estación de colectivo</string>
+	<string name="poi_bus_station">Estación de colectivos</string>
 	<string name="poi_railway_station">Estación de tren</string>
 	<string name="poi_railway_platform">Andén de tren</string>
 	<string name="poi_halt">Parada de tren</string>
@@ -3758,4 +3758,17 @@
 	<string name="poi_climbing_routes">Rutas de escalada</string>
 
 
+<string name="poi_circumference">Circunferencia</string>
+	<string name="poi_diameter_crown">Diámetro de la corona</string>
+
+	<string name="poi_meadow_agricultural">Tipo: Agrícola</string>
+	<string name="poi_meadow_perpetual">Tipo: Perpetuo</string>
+	<string name="poi_meadow_transitional">Tipo: Temporario</string>
+	<string name="poi_meadow_pasture">Tipo: Pasto</string>
+
+	<string name="poi_frozen_food">Alimentos congelados</string>
+
+	<string name="poi_agrarian">Almacén agrícola</string>
+
+
 </resources>

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

@@ -2860,11 +2860,7 @@ Proporciona un código completo</string>
     <string name="by_date">Por fecha</string>
     <string name="by_type">Por tipo</string>
     <string name="modify_the_search_query">Modificar la consulta de búsqueda.</string>
-    <string name="release_3_0">• La detección de señales de alto, ahora considera la dirección de desplazamiento
+    <string name="release_3_0">\\022 
-\n
-\n • Nuevo algoritmo que proporciona valores significativos de ascenso y descenso para trazas GPX.
-\n
-\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>
@@ -2889,4 +2885,25 @@ Proporciona un código completo</string>
     <string name="shared_string_marker">Marcador</string>
     <string name="shared_string_without_name">Sin nombre</string>
     <string name="lang_lo">Laosiana</string>
+    <string name="will_open_tomorrow_at">Abrirá mañana a las</string>
+    <string name="rendering_attr_hidePOILabels_name">Etiquetas de PDI</string>
+    <string name="release_2_9">• Se actualizó el menú contextual: ahora muestra cuando el PDI está abierto o cerrado.
+\n
+\n • Menú de transporte: todas las rutas disponibles están en la parte superior.
+\n
+\n • Wikipedia: se añadió el botón para abrir el artículo original, se actualizó la apariencia de los artículos
+\n
+\n • Ruta: se añadió la posibilidad de intercambiar los puntos de inicio y fin con una sola pulsación
+\n
+\n • Notas: se añadió el orden por tipo y fecha
+\n
+\n • Edición OSM: ahora muestra un icono y el nombre de la categoría de PDI, también muestra las acciones completadas.
+\n
+\n • Nueva pantalla de ingreso rápido de coordenadas para la creación rápida de marcadores</string>
+    <string name="day_off_label">cerrado (día libre)</string>
+    <string name="winter_and_ski_renderer">Invierno y esquí</string>
+    <string name="touring_view_renderer">Vista de Touring (contraste y detalles)</string>
+    <string name="nautical_renderer">Náutico</string>
+<string name="copy_location_name">Copiar nombre del punto/PDI</string>
+    <string name="toast_empty_name_error">Ubicación sin nombre</string>
 </resources>

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

@@ -3520,4 +3520,17 @@
 	<string name="poi_climbing_routes">Rutas de escalada</string>
 
 
+<string name="poi_circumference">Circunferencia</string>
+	<string name="poi_diameter_crown">Diámetro de la corona</string>
+
+	<string name="poi_meadow_agricultural">Tipo: agrícola</string>
+	<string name="poi_meadow_perpetual">Tipo: perpetuo</string>
+	<string name="poi_meadow_transitional">Tipo: transición</string>
+	<string name="poi_meadow_pasture">Tipo: pasto</string>
+
+	<string name="poi_frozen_food">Alimentos congelados</string>
+
+	<string name="poi_agrarian">Almacén agrícola</string>
+
+
 </resources>

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

@@ -2874,11 +2874,7 @@ Proporciona un código completo</string>
     <string name="by_date">Por fecha</string>
     <string name="by_type">Por tipo</string>
     <string name="modify_the_search_query">Modificar la consulta de búsqueda.</string>
-    <string name="release_3_0">• La detección de señales de alto, ahora considera la dirección de desplazamiento
+    <string name="release_3_0">\\022 
-\n
-\n • Nuevo algoritmo que proporciona valores significativos de ascenso y descenso para trazas GPX.
-\n
-\n • El tiempo de caminata es consciente del terreno ascendente (regla de Naismith).
 \n
 \n</string>
     <string name="what_is_here">Aquí hay:</string>
@@ -2903,4 +2899,25 @@ Proporciona un código completo</string>
     <string name="total_donations">Total de donaciones</string>
 <string name="shared_string_without_name">Sin nombre</string>
     <string name="lang_lo">Laosiana</string>
+    <string name="will_open_tomorrow_at">Abrirá mañana a las</string>
+    <string name="rendering_attr_hidePOILabels_name">Etiquetas de PDI</string>
+    <string name="release_2_9">• Se actualizó el menú contextual: ahora muestra cuando el PDI está abierto o cerrado. 
+\n 
+\n • Menú de transporte: todas las rutas disponibles están en la parte superior. 
+\n 
+\n • Wikipedia: se añadió el botón para abrir el artículo original, se actualizó la apariencia de los artículos 
+\n 
+\n • Ruta: se añadió la posibilidad de intercambiar los puntos de inicio y fin con una sola pulsación 
+\n 
+\n • Notas: se añadió el orden por tipo y fecha 
+\n 
+\n • Edición OSM: ahora muestra un icono y el nombre de la categoría de PDI, también muestra las acciones completadas. 
+\n 
+\n • Nueva pantalla de ingreso rápido de coordenadas para la creación rápida de marcadores</string>
+    <string name="day_off_label">Cerrado (día libre)</string>
+    <string name="winter_and_ski_renderer">Invierno y esquí</string>
+    <string name="touring_view_renderer">Vista de Touring (contraste y detalles)</string>
+    <string name="nautical_renderer">Náutico</string>
+    <string name="copy_location_name">Copiar nombre del punto/PDI</string>
+    <string name="toast_empty_name_error">Ubicación sin nombre</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -95,9 +95,9 @@
     <!-- string name="lat_lon_pattern">Laius: %1$.5f pikkus: %2$.5f</string -->
     <string name="follow_us">Järgi meid</string>
     <string name="access_direction_audio_feedback">Suunamise tagasiside heliga</string>
-    <string name="access_direction_audio_feedback_descr">Näita sihtpunkti suunda heliga</string>
+    <string name="access_direction_audio_feedback_descr">Näita sihtpunkti suunda heliga.</string>
     <string name="access_direction_haptic_feedback">Suunamise tagasiside kompides</string>
-    <string name="access_direction_haptic_feedback_descr">Näita sihtpunkti suunda vibratsiooniga</string>
+    <string name="access_direction_haptic_feedback_descr">Näita sihtpunkti suunda vibratsiooniga.</string>
     <string name="shared_string_from">alates</string>
     <string name="city_type_district">Linnaosa</string>
     <string name="city_type_neighbourhood">Naabruskond</string>
@@ -105,26 +105,26 @@
 	<string name="shared_string_is_open_24_7">Avatud 24/7</string>
     <string name="storage_directory_card">Mälukaart</string>
     <string name="coords_format">Koordinaatide formaat</string>
-    <string name="coords_format_descr">Geograafiliste koordinaatide vorming</string>
+    <string name="coords_format_descr">Geograafiliste koordinaatide vorming.</string>
   	<string name="current_track">Praegune teekond</string>
-    <string name="use_osm_live_routing_description">Aktiveeri OsmAnd Live muutuste navigeerimine</string>
+    <string name="use_osm_live_routing_description">Aktiveeri OsmAnd Live muutuste navigeerimine.</string>
 	<string name="use_osm_live_routing">OsmAnd Live navigeerimine</string>
     <string name="access_no_destination">Sihtkoht pole määratud</string>
     <string name="map_widget_magnetic_bearing">Asimuut</string>
     <string name="map_widget_bearing">Suhteline kurss</string>
     <string name="access_disable_offroute_recalc">Ära otsi uut marsruuti, kui eelmiselt lahkuti</string>
-    <string name="access_disable_offroute_recalc_descr">Väldib automaatset uue marsruudi otsimist, kui eelmiselt marsruudilt lahkuti</string>
+    <string name="access_disable_offroute_recalc_descr">Väldib automaatset uue marsruudi otsimist, kui eelmiselt marsruudilt lahkuti.</string>
     <string name="access_disable_wrong_direction_recalc">Ära otsi vastassuuna jaoks uut marsruuti</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Väldib automaatset uue marsruudi otsimist kui liigutakse vastassuunas</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Väldib automaatset uue marsruudi otsimist kui liigutakse vastassuunas.</string>
     <string name="access_smart_autoannounce">Nutikas teavitamine</string>
-    <string name="access_smart_autoannounce_descr">Teavita ainult juhul, kui suund sihtkoha poole muutub</string>
+    <string name="access_smart_autoannounce_descr">Teavita ainult juhul, kui suund sihtkoha poole muutub.</string>
     <string name="access_autoannounce_period">Automaatse teavituse periood</string>
-    <string name="access_autoannounce_period_descr">Minimaalne ajaintervall teavituste vahel</string>
+    <string name="access_autoannounce_period_descr">Minimaalne ajaintervall teavituste vahel.</string>
     <string name="access_default_color">Vaikevärv</string>
     <string name="access_category_choice">Vali kategooria</string>
     <string name="access_hint_enter_name">Sisesta nimi</string>
     <string name="access_hint_enter_category">Sisesta kategooria</string>
-    <string name="access_hint_enter_description">Sisesta kirjeldus</string>
+    <string name="access_hint_enter_description">Sisesta kirjeldus.</string>
     <string name="access_map_linked_to_location">Kaart on asukohaga lingitud</string>
     <string name="access_collapsed_list">Kitsendatud nimekiri</string>
     <string name="access_expanded_list">Laiendatud nimekiri</string>
@@ -153,7 +153,7 @@
     <string name="mapillary">Mapillary</string>
     <string name="increase_search_radius">Suurenda otsingu raadiust</string>
     <string name="nothing_found">Midagi ei leitud :(</string>
-    <string name="nothing_found_descr">Muuda otsingu päringut või suurenda otsingu raadiust</string>
+    <string name="nothing_found_descr">Muuda otsingu päringut või suurenda otsingu raadiust.</string>
     
     <string name="shared_string_permissions">Load</string>
     <string name="import_gpx_failed_descr">OsmAnd ei saa faili importida. Palun veendu, et OsmAnd\'il on õigus lugeda faili selle asukohast.</string>
@@ -167,13 +167,13 @@
     <string name="shared_string_reset">Lähtesta</string>
     <string name="shared_string_reload">Laadi uuesti</string>
     <string name="wrong_user_name">Vale kasutajanimi!</string>
-    <string name="mapillary_menu_title_dates">Kuupäevad</string>
+    <string name="mapillary_menu_title_dates">Kuupäev</string>
     <string name="mapillary_menu_edit_text_hint">Sisesta kasutajatunnus</string>
     <string name="mapillary_menu_title_username">Kasutajatunnus</string>
     <string name="improve_coverage_install_mapillary_desc">Sa võid lisada oma fotod või foto seeriad siia asukohta.
 \n
 \nSelleks, paigalda Mapillary rakendus Google Play veebipoest.</string>
-    <string name="no_photos_descr">Sellest asukohast meil fotosid ei ole</string>
+    <string name="no_photos_descr">Sellest asukohast meil fotosid ei ole.</string>
     <string name="restart_search">Taaskäivita otsing</string>
     <string name="quick_action_showhide_osmbugs_title">Näita/peida OSM Notes</string>
     <string name="quick_action_osmbugs_show">Näita OSM Notes</string>

OsmAnd/res/values-eu/phrases.xml

@@ -1587,7 +1587,7 @@
 
 <string name="poi_aerialway_platter">Erretilu igogailua</string>
 	<string name="poi_aerialway_mixed_lift">Igogailu nahasia</string>
-	<string name="poi_aerialway_drag_lift">Arrastatze igogailua</string>
+	<string name="poi_aerialway_drag_lift">Teleaulki</string>
 	<string name="poi_beauty_salon_nails">Manikura</string>
 	<string name="poi_massage">Masaje zentroa</string>
 	<string name="poi_tattoo">Tatuaje zentroa</string>
@@ -1837,9 +1837,9 @@
 	<string name="poi_wiki_lang_cy">Wikia galesez</string>
 	<string name="poi_wiki_lang_eo">Wikia esperantoz</string>
 	<string name="poi_wiki_lang_eu">Wikia euskaraz</string>
-	<string name="poi_fuel_lpg">Petrolio gas likidotua (PGL)</string>
+	<string name="poi_fuel_lpg">LPG erregaia</string>
-	<string name="poi_fuel_cng">Gas natural konprimitua</string>
+	<string name="poi_fuel_cng">CNG erregaia</string>
-	<string name="poi_fuel_svo">Landare-olio erregaia</string>
+	<string name="poi_fuel_svo">Biodiesel erregaia</string>
 	<string name="poi_aerialway_station">Teleaulki geltokia</string>
 	<string name="poi_aerialway_magic_carpet">Tapiz magikoa (igogailua)</string>
 	<string name="poi_aerialway_rope_tow">Kable-igogailua</string>
@@ -1856,7 +1856,7 @@
 	<string name="poi_greenfield">Orubea</string>
 	<string name="poi_mineshaft">Meazulo</string>
 	<string name="poi_training">Entrenatzeko gunea</string>
-	<string name="poi_baby_hatch">Zurtz tornua</string>
+	<string name="poi_baby_hatch">Umezurtzen tornua</string>
 	<string name="poi_podiatrist">Oin-sendagile</string>
 	<string name="poi_tax_advisor">Zerga aholkularien bulegoa</string>
 
@@ -1875,7 +1875,7 @@
 	<string name="poi_aeroway_fuel">Hegazkinentzako erregai estazioa</string>
 	<string name="poi_waterway_fuel">Ontzientzako erregai estazioa</string>
 	<string name="poi_ice_hockey">Izotz hockeya</string>
-	<string name="poi_attraction_amusement_ride">Atrakzioa</string>
+	<string name="poi_attraction_amusement_ride">Atrakzioa (jolas-parkekoa)</string>
 	<string name="poi_attraction_summer_toboggan">Udako txirrista</string>
 	<string name="poi_attraction_train">Trena (atrakzioa)</string>
 	<string name="poi_lodging">Ostatua</string>
@@ -1954,7 +1954,7 @@
 	<string name="poi_commercial">Lurraren erabilpen komertziala</string>
 	<string name="poi_retail">Txikizkako lurraren erabilpena</string>
 
-	<string name="poi_attraction_swing_carousel">Zabu birakariak</string>
+	<string name="poi_attraction_swing_carousel">Zabu hegalariak</string>
 	<string name="poi_wayside_shrine">Bide ondoko santutegia</string>
 	<string name="poi_trail_riding_station">Zaldizkoentzako zerbitzugunea</string>
 
@@ -1962,7 +1962,7 @@
 	<string name="poi_feeding_place">Animaliek jateko tokia</string>
 
 <string name="poi_village_green">Berdegunea</string>
-	<string name="poi_craft_stand_builder">Stand</string>
+	<string name="poi_craft_stand_builder">Postu diseinatzailea</string>
 	<string name="poi_craft_sun_protection">Gerizpea</string>
 	<string name="poi_anchor_berth">Ainguren amarralekua</string>
 	<string name="poi_beacon_cardinal">Itsasargi kardinala</string>
@@ -2155,7 +2155,7 @@
 	<string name="poi_payment_westfalen_card_no">Ez dira Westfalen txartelak onartzen</string>
 	<string name="poi_payment_dogecoin_yes">Dogecoin</string>
 	<string name="poi_payment_dogecoin_no">Ez dira Dogecoin txartelak onartzen</string>
-	<string name="poi_animal_boarding">Animalien ostatua</string>
+	<string name="poi_animal_boarding">Animalientzako ostatua</string>
 	<string name="poi_animal_boarding_dog">Ostatu mota: txakurrak</string>
 	<string name="poi_animal_boarding_cat">Ostatu mota: katuak</string>
 	<string name="poi_animal_boarding_dog_cat">Ostatu mota: txakurrak, katuak</string>
@@ -2215,4 +2215,71 @@
 	<string name="poi_crossing_light_no">Bidegurutze argia: ez</string>
 	<string name="poi_crossing_on_demand_yes">Eskapeko bidegurutzea</string>
 	<string name="poi_crossing_on_demand_no">Eskapeko bidegurutzea: ez</string>
+	<string name="poi_boat_rental_type">Alokairuzko ontziak</string>
+	<string name="poi_operational_status">Egoera operatiboa</string>
+	<string name="poi_water_purification">Ur arazketa</string>
+	<string name="poi_climbing_style">Eskalada estiloa</string>
+
+<string name="poi_seamark_building">Eraikuntza nautikoa</string>
+	<string name="poi_seamark_bridge">Zubi nautikoa</string>
+	<string name="poi_buoy_cardinal">Buia kardinala</string>
+	<string name="poi_buoy_isolated_danger">Buia, arrisku isolatua</string>
+	<string name="poi_social_facility_workshop">Lantegia</string>
+	<string name="poi_theatre_genre_philharmonic">Filarmonika</string>
+	<string name="poi_theatre_genre_musical">Musikala</string>
+	<string name="poi_theatre_genre_drama">Drama</string>
+	<string name="poi_theatre_genre_opera">Opera</string>
+	<string name="poi_theatre_genre_cabaret">Kabareta</string>
+	<string name="poi_theatre_genre_puppet">Txotxongiloak</string>
+	<string name="poi_theatre_genre_comedy">Komedia</string>
+	<string name="poi_theatre_genre_chamber_music">Ganbera-musika</string>
+	<string name="poi_theatre_genre_marionette">Marionetak</string>
+	<string name="poi_theatre_genre_ballet">Ballet</string>
+	<string name="poi_theatre_genre_shadow_play">Itzal txinatarrak</string>
+
+	<string name="poi_bandstand">Kioskoa</string>
+	<string name="poi_kiln">Labea</string>
+	<string name="poi_product_brick">Produktua: Adreiluak</string>
+	<string name="poi_product_quicklime">Produktua: Kare bizia</string>
+	<string name="poi_product_leather">Produktua: Larrua</string>
+	<string name="poi_product_lime">Produktua: Karea</string>
+	<string name="poi_product_beer">Produktua: Garagardoa</string>
+	<string name="poi_product_charcoal">Produktua: Ikatz begetala</string>
+	<string name="poi_product_meat">Produktua: haragia</string>
+
+	<string name="poi_wheelchair_description">Gurpil-aulki erabiltzaileentzako deskripzioa</string>
+	<string name="poi_blind_description">Itsuentzako deskripzioa</string>
+	<string name="poi_deaf_description">Gorrentzako deskripzioa</string>
+
+	<string name="poi_highway_steps">Eskailera</string>
+	<string name="poi_handrail_yes">Baranda: bai</string>
+	<string name="poi_handrail_no">Baranda: ez</string>
+	<string name="poi_ramp_yes">Arrapala: bai</string>
+	<string name="poi_ramp_no">Arrapala: ez</string>
+	<string name="poi_ramp_wheelchair_yes">Gurpil-aulkientzako arrapala: bai</string>
+	<string name="poi_ramp_wheelchair_no">Gurpil-aulkientzako arrapala: ez</string>
+	<string name="poi_ramp_stroller_yes">Arrapala (orga): bai</string>
+	<string name="poi_ramp_stroller_no">Arrapala (orga): ez</string>
+	<string name="poi_ramp_bicycle_yes">Bizikletentzako arrapala: bai</string>
+	<string name="poi_ramp_bicycle_no">Bizikletentzako arrapala: ez</string>
+	<string name="poi_ramp_luggage_yes">Bagajearentzako arrapala: bai</string>
+	<string name="poi_ramp_luggage_no">Bagajearentzako arrapala: ez</string>
+	<string name="poi_tomb_tumulus">Mota: Tumulua</string>
+	<string name="poi_frozen_food">Janari izoztua</string>
+
+	<string name="poi_agrarian">Nekazaritza denda</string>
+
+
+<string name="poi_wiki_lang_als">Wikia alsatieraz</string>
+	<string name="poi_memorial_koshinto">Koshinto</string>
+	<string name="poi_health_specialty_pulmonology_yes">Pneumologia</string>
+	<string name="poi_health_specialty_maternity_yes">Amatasuna</string>
+	<string name="poi_health_specialty_physiatry_yes">Fisioterapia eta errehabilitazioa</string>
+	<string name="poi_health_specialty_diagnostic_radiology_yes">Diagnostikorako erradiologia</string>
+	<string name="poi_health_specialty_social_paediatrics_yes">Soziologia pediatrikoa</string>
+	<string name="poi_health_specialty_social_paediatrics_no">Osasun espezialitatea: soziologia pediatrikoa: ez</string>
+	<string name="poi_health_specialty_addiction_medicine_yes">"Adikzioen medikuntza "</string>
+	<string name="poi_health_specialty_speech_therapy_yes">Hizketaren terapia</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Psikoanalisia</string>
+	<string name="poi_aquaculture_shrimp">Akuikultura: ganbak</string>
 	</resources>

OsmAnd/res/values-eu/strings.xml

@@ -2824,11 +2824,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="shared_string_without_name">Izenik gabe</string>
     <string name="av_locations_selected_desc">Hautatutako oharren koordenatuak eta datuak dituen GPX fitxategia.</string>
     <string name="av_locations_all_desc">Ohar guztien koordenatuak eta datuak dituen GPX fitxategia.</string>
-    <string name="release_3_0">\\022 Stop seinaleen detekzioak kontuan hartzen du martxaren noranzkoa
+    <string name="release_3_0">\\022 
-\n
-\n • GPX lorratzen zentzuzko igoera/jaitsiera balioak ematen dituen algoritmo berria
-\n
-\n • Terrenoa (igoera) kontuan duen mendiko ibilbideen denbora (Naismith araua)
 \n
 \n</string>
     <string name="modify_the_search_query">Aldatu bilaketaren galdera.</string>
@@ -2946,7 +2942,13 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="touring_view_renderer">Bidaiatze ikuspegia (kontrastea eta xehetasunak)</string>
     <string name="nautical_renderer">Nautikoa</string>
 <string name="rendering_attr_hidePOILabels_name">POI etiketak</string>
-    <string name="release_2_9">\\022 Laster-menua eguneratuta: erakutsi POI-a irekitzean edo ixtean
+    <string name="release_2_9">\\022 Stop seinaleen detekzioak kontuan hartzen du martxaren noranzkoa
+\n
+\n • GPX lorratzen zentzuzko igoera/jaitsiera balioak ematen dituen algoritmo berria
+\n
+\n • Terrenoa (igoera) kontuan duen mendiko ibilbideen denbora (Naismith araua)
+\n
+\n • Laster-menua eguneratuta: erakutsi POI-a irekitzean edo ixtean 
 \n 
 \n • Garraio menua: ibilbide eskuragarri guztiak orain goian daude 
 \n 
@@ -2961,4 +2963,7 @@ Area honi dagokio: %1$s x %2$s</string>
 \n • Koordenatuen sarrerarako pantaila berria markatzaileek sorrera azkarrerako 
 \n 
 \n</string>
+    <string name="will_open_tomorrow_at">Bihar irekiko du ordu honetan:</string>
+    <string name="copy_location_name">Kopiatu puntuaren / POI-aren izena</string>
+    <string name="toast_empty_name_error">Kokalekuak ez du izenik</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -2013,7 +2013,7 @@
     <string name="city_type_district">ناحیه</string>
     <string name="city_type_neighbourhood">محله</string>
     <string name="map_widget_search">جست‌وجو</string>
-	<string name="shared_string_is_open_24_7">ساعت کار 24/7</string>
+	<string name="shared_string_is_open_24_7">۲۴/۷ باز است</string>
     <string name="storage_directory_card">کارت حافظه</string>
     <string name="coords_format">قالب مختصات</string>
     <string name="coords_format_descr">قالب نمایش مختصات جغرافیایی را مشخص کنید.</string>
@@ -2978,12 +2978,7 @@
     <string name="by_type">بر اساس نوع</string>
     <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="modify_the_search_query">عبارت جست‌وجوشده را اصلاح کنید.</string>
-    <string name="release_3_0">• تشخیص علائم ایست با توجه به مسیر رانندگی 
+    <string name="release_3_0">\\022 
-\n 
-\n• الگوریتم جدید برای دادن مقادیر صعود و نزولِ مناسب به مسیرهای GPX 
-\n 
-\n 
-\n • در نظر گرفتن ناهمواری (صعود) برای محاسبهٔ زمان پیاده‌گردی (قاعدهٔ نای‌اسمیت)
 \n
 \n</string>
     <string name="what_is_here">چیزهایی که اینجاست:</string>
@@ -3012,7 +3007,13 @@
     <string name="winter_and_ski_renderer">"زمستان و اسکی "</string>
     <string name="touring_view_renderer">نمای سفر (تضاد رنگی و جزئیات بیشتر)</string>
     <string name="nautical_renderer">دریایی</string>
-<string name="release_2_9">• به‌روزرسانی برای منوی زمینه: نمایش زمان باز یا بسته‌شدن مکان (POI)
+<string name="release_2_9">• تشخیص علائم ایست با توجه به مسیر رانندگی
+\n
+\n• الگوریتم جدید برای تخصیص مقادیر صعود و نزولِ مناسب به مسیرهای GPX 
+\n
+\n• در نظر گرفتن ناهمواری (صعود) برای محاسبهٔ زمان پیاده‌گردی (قاعدهٔ نای‌اسمیت) 
+\n
+\n• به‌روزرسانی برای منوی زمینه: نمایش اوقات باز یا بسته‌شدن مکان (POI) 
 \n 
 \n• منوی حمل‌ونقل: همهٔ مسیرهای عبوری از یک ایستگاه در بالای منو نشان داده می‌شوند 
 \n 
@@ -3027,4 +3028,7 @@
 \n• ایجاد سریع نشانه‌ها از طریق صفحهٔ ورود فوری مختصات 
 \n</string>
     <string name="will_open_tomorrow_at">فردا باز می‌شود، در ساعت</string>
+    <string name="day_off_label">تعطیل</string>
+    <string name="copy_location_name">کپی‌کردن نام نقطه/POI</string>
+    <string name="toast_empty_name_error">مکان بدون نام است</string>
 </resources>

OsmAnd/res/values-fr/phrases.xml

@@ -1453,7 +1453,7 @@
 	<string name="poi_shoes_orthopedic">Orthopédique</string>
 
 	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
-	<string name="poi_internet_access_type_terminal">Terminal</string>
+	<string name="poi_internet_access_type_terminal">Borne Internet</string>
 	<string name="poi_architecture_contemporary">Architecture : contemporaine</string>
 	<string name="poi_architecture_art_nouveau">Architecture : art nouveau</string>
 	<string name="poi_architecture_neoclassicism">Architecture : néo-classique</string>
@@ -1626,7 +1626,7 @@
 
 	<string name="poi_theatre_genre_opera">Opéra</string>
 	<string name="poi_theatre_genre_philharmonic">Philharmonique</string>
-	<string name="poi_theatre_genre_musical">Musical</string>
+	<string name="poi_theatre_genre_musical">Comédie musicale</string>
 	<string name="poi_theatre_genre_drama">Dramatique</string>
 	<string name="poi_theatre_genre_cabaret">Cabaret</string>
 	<string name="poi_theatre_genre_puppet">Marionnette</string>
@@ -2734,7 +2734,7 @@
 	<string name="poi_free_flying_rigid_yes">Rigide</string>
 	<string name="poi_medical_system_kampo_yes">Kampo</string>
 	<string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
-	<string name="poi_medical_system_unani_yes">Unani</string>
+	<string name="poi_medical_system_unani_yes">Yunâni</string>
 
 	<string name="poi_button_operated_yes">Actionné par un bouton : oui</string>
 	<string name="poi_button_operated_no">Actionné par un bouton : non</string>
@@ -2790,7 +2790,7 @@
 	<string name="poi_cuisine_tea_shop">Salon de thé</string>
 	<string name="poi_cuisine_soup">Soupe</string>
 	<string name="poi_cuisine_pie">Tarte</string>
-	<string name="poi_cuisine_hotdog">Hotdog</string>
+	<string name="poi_cuisine_hotdog">Hot-dog</string>
 	<string name="poi_cuisine_salad">Salade</string>
 	<string name="poi_cuisine_frozen_yogurt">Yaourt glacé</string>
 	<string name="poi_cuisine_fried_food">Friture</string>
@@ -2822,7 +2822,7 @@
 	<string name="poi_cuisine_wine">Vin</string>
 	<string name="poi_cuisine_potato">Pomme de terre</string>
 	<string name="poi_cuisine_brunch">Brunch</string>
-	<string name="poi_cuisine_pita">Pita</string>
+	<string name="poi_cuisine_pita">Pain pita</string>
 	<string name="poi_cuisine_fondue">Fondue</string>
 	<string name="poi_cuisine_baguette">Baguette</string>
 	<string name="poi_cuisine_burrito">Burrito</string>
@@ -2884,7 +2884,7 @@
 	<string name="poi_cuisine_mongolian">Mongol</string>
 	<string name="poi_cuisine_middle_eastern">Moyen-oriental</string>
 	<string name="poi_cuisine_ukrainian">Ukrainien</string>
-	<string name="poi_cuisine_afghan">Afghan</string>
+	<string name="poi_cuisine_afghan">Cuisine afghane</string>
 	<string name="poi_cuisine_belgian">Belge</string>
 	<string name="poi_cuisine_basque">Basque</string>
 	<string name="poi_cuisine_swiss">Suisse</string>
@@ -2896,11 +2896,11 @@
 	<string name="poi_cuisine_english">Anglais</string>
 	<string name="poi_cuisine_pakistani">Pakistanais</string>
 	<string name="poi_cuisine_taiwanese">Taïwanais</string>
-	<string name="poi_cuisine_tex_mex">Tex-mex</string>
+	<string name="poi_cuisine_tex_mex">Cuisine tex-mex</string>
 	<string name="poi_cuisine_dutch">Néerlandais</string>
 	<string name="poi_cuisine_syrian">Syrien</string>
 	<string name="poi_cuisine_australian">Australien</string>
-	<string name="poi_cuisine_cajun">Cajun</string>
+	<string name="poi_cuisine_cajun">Cuisine cadienne</string>
 	<string name="poi_cuisine_egyptian">Égyptien</string>
 	<string name="poi_cuisine_senegalese">Sénégalais</string>
 	<string name="poi_cuisine_jewish">Juif</string>
@@ -2915,7 +2915,7 @@
 
 	<string name="poi_tower_construction_dish">Construction : antenne parabolique</string>
 	<string name="poi_cuisine_pastel">Pastel</string>
-	<string name="poi_cuisine_sub">Sub</string>
+	<string name="poi_cuisine_sub">Sandwich sous-marin</string>
 	<string name="poi_xmas_note">Noël : note</string>
 	<string name="poi_xmas_opening_hours">Noël : horaires d\'ouverture</string>
 	<string name="poi_xmas_location">Noël : emplacement</string>
@@ -3030,7 +3030,7 @@
 	<string name="poi_architecture_wilhelminian_style">Architecture : Style wilhelminien</string>
 	<string name="poi_tunnel_waterway">Tunnel d\'eau</string>
 	<string name="poi_bridge_waterway">Pont de voie navigable</string>
-	<string name="poi_payment_ep_minicash_yes">MiniCash</string>
+	<string name="poi_payment_ep_minicash_yes">Minicash</string>
 	<string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
 	<string name="poi_payment_ep_monedero_yes">Monedero</string>
 	<string name="poi_brushless_no">Sans balai</string>

OsmAnd/res/values-fr/strings.xml

@@ -3036,11 +3036,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="by_date">Par date</string>
     <string name="by_type">Par type</string>
     <string name="modify_the_search_query">Modifier la recherche.</string>
-    <string name="release_3_0">\\022 Les panneaux stop sont maintenant considérés comme des consignes de direction
+    <string name="release_3_0">\\022 
-\n
-\n • Nouvel algorithme fournissant des données d\'altitude (montée / descente) sur les traces GPX
-\n
-\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>
@@ -3086,4 +3082,6 @@ représentant la zone : %1$s x %2$s</string>
 \n • Nouvel écran de saisie rapide des coordonnées pour la création de marques.
 \n
 \n</string>
+    <string name="copy_location_name">Copier le nom du point</string>
+    <string name="toast_empty_name_error">L\'emplacement n\'a aucun nom</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -2486,11 +2486,7 @@
     <string name="animate_my_location_desc">הפעלת הנפשת גלישת מפה של המיקום שלי במהלך ניווט.</string>
     <string name="shared_string_in_name">ב־%1$s</string>
     <string name="one_tap_active_descr">ניתן לגעת בסמן על המפה כדי להעביר אותו לראש הסמנים הפעילים מבלי לפתוח את תפריט ההקשר.</string>
-    <string name="release_3_0">\\022 זיהוי של שלטי עצור מתחשב בכיוון הניווט
+    <string name="release_3_0">\\022 
-\n
-\n • אלגוריתם חדש מספק ערכים בעלי משמעות לעלייה/ירידה למסלולי GPX
-\n
-\n • זמן הטיול (כלל נייסמית׳) מודע לתוואי הדרך (עלייה)
 \n
 \n</string>
     <string name="one_tap_active">הפעלה בנגיעה אחת</string>
@@ -2609,4 +2605,8 @@
 <string name="access_direction_audio_feedback_descr">ציון כיוון נקודת היעד עם צליל.</string>
     <string name="delay_to_start_navigation_descr">נא לציין את זמן ההמתנה להישאר במסך תכנון הנתיב.</string>
     <string name="shared_string_without_name">ללא שם</string>
+    <string name="will_open_tomorrow_at">ייפתח מחר ב־</string>
+    <string name="rendering_attr_hidePOILabels_name">תוויות נ״ע</string>
+    <string name="copy_location_name">העתקת שם נקודה/נ״ע</string>
+    <string name="toast_empty_name_error">למיקום אין שם</string>
 </resources>

OsmAnd/res/values-hu/phrases.xml

@@ -622,7 +622,7 @@
 	<string name="poi_chocolate">Csokoládébolt</string>
 	<string name="poi_coffee">Kávébolt</string>
 	<string name="poi_pasta">Tésztabolt</string>
-	<string name="poi_pastry">Süteménybolt</string>
+	<string name="poi_pastry">Cukrászda</string>
 	<string name="poi_art">Műalkotásbolt</string>
 	<string name="poi_baby_goods">Bababolt</string>
 	<string name="poi_clothes">Ruházati bolt</string>
@@ -3670,4 +3670,63 @@
 
 <string name="poi_route_subway_ref">Metró</string>
 
+	<string name="poi_climbing_style">Sziklamászási stílus</string>
+
+<string name="poi_ref_post">Irányítószám</string>
+
+	<string name="poi_climbing_sport_yes">Sportmászás</string>
+	<string name="poi_climbing_sport_no">Sportmászás nincs</string>
+	<string name="poi_climbing_boulder_yes">Boulderezés (szabad mászás)</string>
+	<string name="poi_climbing_boulder_no">Boulderezés (szabad mászás) nincs</string>
+	<string name="poi_climbing_toprope_yes">Top rope (legfelül rögzített kötél)</string>
+	<string name="poi_climbing_toprope_no">Top rope (legfelül rögzített kötél) nincs</string>
+	<string name="poi_climbing_trad_yes">Tradicionális mászás</string>
+	<string name="poi_climbing_trad_no">Tradicionális mászás nincs</string>
+	<string name="poi_climbing_multipitch_yes">Több szakaszos utak</string>
+	<string name="poi_climbing_multipitch_no">Több szakaszos utak nincsenek</string>
+	<string name="poi_climbing_ice_yes">Jégmászás</string>
+	<string name="poi_climbing_ice_no">Jégmászás nincs</string>
+	<string name="poi_climbing_mixed_yes">Vegyes mászás (szikla &amp; jég)</string>
+	<string name="poi_climbing_mixed_no">Vegyes mászás (szikla &amp; jég) nincs</string>
+	<string name="poi_climbing_deepwater_yes">Víz fölötti szóló mászás</string>
+	<string name="poi_climbing_deepwater_no">Víz fölötti szóló mászás nincs</string>
+
+	<string name="poi_climbing_length">Mászóút hossza (átlag)</string>
+	<string name="poi_climbing_length_min">Mászóút hossza (legrövidebb)</string>
+	<string name="poi_climbing_length_max">Mászóút hossza (leghosszabb)</string>
+	<string name="poi_climbing_rock_limestone">Mászható szikla: mészkő</string>
+	<string name="poi_climbing_rock_granite">Mászható szikla: gránit</string>
+	<string name="poi_climbing_rock_sandstone">Mászható szikla: homokkő</string>
+	<string name="poi_climbing_rock_quartzite">Mászható szikla: kvarcit</string>
+	<string name="poi_climbing_rock_gneiss">Mászható szikla: gneisz</string>
+	<string name="poi_climbing_rock_porphyry">Mászható szikla: porfír</string>
+	<string name="poi_climbing_quality_solid">Szikla minősége: szilárd</string>
+	<string name="poi_climbing_quality_fragile">Szikla minősége: törékeny</string>
+	<string name="poi_climbing_bolted_yes">Rögzített ékek</string>
+	<string name="poi_climbing_bolted_no">Rögzített ékek nincsenek</string>
+	<string name="poi_climbing_orientation_n">Fal iránya: észak</string>
+	<string name="poi_climbing_orientation_ne">Fal iránya: északkelet</string>
+	<string name="poi_climbing_orientation_e">Fal iránya: kelet</string>
+	<string name="poi_climbing_orientation_se">Fal iránya: délkelet</string>
+	<string name="poi_climbing_orientation_s">Fal iránya: dél</string>
+	<string name="poi_climbing_orientation_sw">Fal iránya: délnyugat</string>
+	<string name="poi_climbing_orientation_w">Fal iránya: nyugat</string>
+	<string name="poi_climbing_orientation_nw">Fal iránya: északnyugat</string>
+	<string name="poi_climbing_summit_log_yes">Csúcskönyv</string>
+	<string name="poi_climbing_summit_log_no">Csúcskönyv nincs</string>
+	<string name="poi_climbing_routes">Mászóutak</string>
+
+	<string name="poi_circumference">Kerület (1,30 m magasan)</string>
+	<string name="poi_diameter_crown">Lombkorona átmérője</string>
+
+	<string name="poi_meadow_agricultural">Típus: mezőgazdasági</string>
+	<string name="poi_meadow_perpetual">Típus: állandó</string>
+	<string name="poi_meadow_transitional">Típus: átmeneti</string>
+	<string name="poi_meadow_pasture">Típus: legelő</string>
+
+	<string name="poi_frozen_food">Mélyhűtött élelmiszer</string>
+
+	<string name="poi_agrarian">Gazdabolt</string>
+
+
 </resources>

OsmAnd/res/values-is/strings.xml

@@ -2612,4 +2612,5 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="will_open_tomorrow_at">Mun opna á morgun kl.</string>
     <string name="animate_my_location_desc">Virkja hreyfingu við hliðrun staðsetningar minnar á meðan leiðsögn stendur.</string>
     <string name="storage_permission_restart_is_required">Núna hefur forritið heimild til að skrifa í ytri gagnageymslur. Það þarf að endurræsa forritið handvirkt.</string>
+    <string name="show_transparency_seekbar">Birta gegnsæis-sleða</string>
     </resources>

OsmAnd/res/values-it/strings.xml

@@ -2678,10 +2678,10 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="routing_attr_relief_smoothness_factor_name">Seleziona la variabilità della quota</string>
     <string name="driving_region_automatic">Automatica</string>
     <string name="do_not_send_anonymous_app_usage">Non inviare statistiche anonime sull\'utilizzo dell\'app</string>
-    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd raccoglie informazioni su quale parti dell\'applicazione tu utilizzi. La tua geolocalizzazione non viene mai inviata, nemmeno qualsiasi dato che tu immetti nell\'app o dettagli sulle aree che visualizzi cerchi o scarichi.</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd raccoglie informazioni su quale parti dell\'applicazione tu utilizzi. La tua geolocalizzazione non viene mai inviata, nemmeno qualsiasi dato che tu immetti nell\'app o dettagli sulle aree che visualizzi, cerchi o scarichi.</string>
     <string name="do_not_show_startup_messages">Non mostrare alcun messaggio all\'avvio</string>
     <string name="do_not_show_startup_messages_desc">Elimina messaggi riguardo sconti dell\'app ed eventi speciali locali.</string>
-    <string name="parking_options">Opzioni parcheggio</string>
+    <string name="parking_options">Opzioni di parcheggio</string>
     <string name="full_version_thanks">Grazie per avere acquistato la versione completa di OsmAnd!</string>
     <string name="fonts_header">Caratteri della mappa</string>
     <string name="right_side_navigation">Guida a destra</string>
@@ -2696,7 +2696,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="shared_string_visible">Visibile</string>
     <string name="restore_purchases">Ripristina gli acquisti fatti</string>
     <string name="subscribe_email_error">Errore</string>
-    <string name="subscribe_email_desc">Sottoscrivi la mailing list della nostra applicazione e avrai ulteriori 3 download di mappe!</string>
+    <string name="subscribe_email_desc">Sottoscrivi la mailing list della nostra applicazione e otterrai ulteriori 3 download di mappe!</string>
     <string name="quick_action_auto_zoom">Zoom della mappa automatico acceso/spento</string>
     <string name="quick_action_auto_zoom_desc">Toccando il pulsante azione accenderà o spegnerà lo zoom automatico della mappa in base alla tua velocità.</string>
     <string name="quick_action_auto_zoom_on">Abilita lo oom della mappa automatico della mappa</string>
@@ -2708,7 +2708,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="quick_action_replace_destination_desc">Toccando il pulsante azione sostituirai la destinazione con la posizione al centro dello schermo.</string>
     <string name="quick_action_add_first_intermediate_desc">Toccando il pulsante azione aggiungerai un primo punto intermedio nella posizione al centro dello schermo.</string>
     <string name="no_overlay">Nessun stato sovrapposto</string>
-    <string name="no_underlay">Nessun stato di sfondo</string>
+    <string name="no_underlay">Nessun strato di sfondo</string>
     <string name="shared_string_paused">In pausa</string>
     <string name="type_city_town">Scrivi la città o il paese</string>
     <string name="type_postcode">Scrivi il codice postale</string>
@@ -2719,7 +2719,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="shared_string_in_name">in %1$s</string>
     <string name="type_address">Scrivi l\'indirizzo</string>
     <string name="animate_my_location">Simula la mia posizione</string>
-    <string name="animate_my_location_desc">In navigazione abilita l\'interpolazione della mia localizzazione.</string>
+    <string name="animate_my_location_desc">In navigazione abilita l\'interpolazione della Mia Posizione.</string>
     <string name="shared_string_overview">Panoramica</string>
     <string name="show_from_zoom_level">Mostra dal livello di zoom</string>
     <string name="display_zoom_level">Mostra il livello dello zoom: %1$s</string>
@@ -2848,7 +2848,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="line">Linea</string>
     <string name="save_as_route_point">Salva come punti di un percorso</string>
     <string name="save_as_line">Salva come linea</string>
-    <string name="route_point">Punto percorso</string>
+    <string name="route_point">Punto del percorso</string>
     <string name="edit_line">Modifica la linea</string>
     <string name="add_point_before">Aggiungi un punto prima</string>
     <string name="add_point_after">Aggiungi un punto dopo</string>
@@ -2890,7 +2890,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="remove_from_map_markers">Rimuovi dai Marcatori Mappa</string>
     <string name="descendingly">discendente</string>
     <string name="ascendingly">ascendente</string>
-    <string name="date_added">Dato aggiunto</string>
+    <string name="date_added">Data aggiunta</string>
     <string name="order_by">Ordina per:</string>
     <string name="coordinates_format">Formato coordinate</string>
     <string name="use_system_keyboard">Utilizza la tastiera di sistema</string>
@@ -2941,7 +2941,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="wrong_input">Dati immessi errati</string>
 	<string name="enter_new_name">Inserisci il nuovo nome</string>
 	<string name="shared_string_back">Indietro</string>
-	<string name="view">Vista</string>
+	<string name="view">Visualizza</string>
 	<string name="waypoints_added_to_map_markers">Punti intermedi aggiunti ai marcatori della mappa</string>
 	<string name="wrong_format">Formato errato</string>
     <string name="release_2_8">\\022 Rivisti completamente i marcatori, le indicazioni e la pianificazione del percorso 
@@ -3003,11 +3003,7 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="notes_by_date">Note ordinate per data</string>
     <string name="by_date">Per data</string>
     <string name="by_type">Per tipo</string>
-    <string name="release_3_0">\\022 Individuazione dei segnali di stop ora considera le direzioni di guida
+    <string name="release_3_0">\\022
-\n
-\n • Nuovo algoritmo fornisce significativi valori di salita/discesa per le tracce GPX
-\n
-\n • Tempo di percorrenza per l\'escursionismo tiene conto delle salite (Regola di Naismith)
 \n
 \n</string>
     <string name="modify_the_search_query">Modifica la richiesta di ricerca.</string>
@@ -3031,18 +3027,21 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="shared_string_marker">Marcatore</string>
     <string name="shared_string_without_name">Senza nome</string>
     <string name="rendering_attr_hidePOILabels_name">Etichette PDI</string>
-    <string name="release_2_9">"\\022 Aggiornato il menù contestuale: mostra quando i PDI aprono / chiudono
+    <string name="release_2_9">\\022 Aggiornato il menù contestuale: mostra quando i PDI aprono / chiudono 
 \n 
 \n • Menù trasporto pubblico: tutti i percorsi disponibili sono ora in alto 
 \n 
 \n • Wikipedia: aggiunto il pulsante per aprire l\'articolo originale, aggiornato l\'aspetto degli articoli 
 \n 
-\n • Percorso: aggiunta la possibilità di scambiare la partenza è la destinazione con un tocco
+\n • Percorso: aggiunta la possibilità di scambiare la partenza e la destinazione con un tocco 
 \n 
-\n • Notes aggiunto l\'ordina per data e per tipo
+\n • Note aggiunto l\'ordina per data e per tipo 
 \n 
 \n • Modifiche OSM: mostra un\'icona e il nome della categoria del PDI, mostra le azioni completate 
 \n 
-\n • Nuova schermata veloce per l\'inserimento delle coordinate per la creazione veloce di marcatori"</string>
+\n • Nuova schermata veloce per l\'inserimento delle coordinate per la creazione veloce di marcatori</string>
     <string name="osm_recipient_stat">Modifiche %1$s, sum %2$s mBTC</string>
+    <string name="copy_location_name">Copia il nome del punto/PDI</string>
+    <string name="will_open_tomorrow_at">Aprirà domani alle</string>
+    <string name="toast_empty_name_error">Il luogo non ha nome</string>
 </resources>

OsmAnd/res/values-lt/phrases.xml

@@ -113,8 +113,8 @@
 	<string name="poi_houseware">Namų apyvokos daiktai</string>
 	<string name="poi_payment_type">Mokėjimo tipas</string>
 	<string name="poi_payment_fuel_type">Kuro kortelės</string>
-	<string name="poi_fuel_type">Tipas</string>
+	<string name="poi_fuel_type">Degalų tipas</string>
-	<string name="poi_fuel_avia_type">Tipas</string>
+	<string name="poi_fuel_avia_type">Kuro tipas (avia)</string>
 	<string name="poi_internet_access_type">Interneto prieigos tipas</string>
 	<string name="poi_clothes_type">Tipas</string>
 	<string name="poi_bicycle_service">Dviračių aptarnavimas</string>
@@ -395,4 +395,15 @@
 	<string name="poi_tableware">Stalo įrankių parduotuvė</string>
 	<string name="poi_trade">Turgelis</string>
 	<string name="poi_tyres">Padangų parduotuvė</string>
+	<string name="poi_animal_shelter_purpose">Tikslas</string>
+	<string name="poi_boat_rental_type">Nuomojamos valtys</string>
+	<string name="poi_operational_status">Eksploatacinė būklė</string>
+	<string name="poi_water_supply_type">Vandens tiekimo tipas</string>
+	<string name="poi_water_purification">Vandens valymas</string>
+	<string name="poi_vacuum_cleaner">Dulkių siurblių parduotuvė</string>
+	<string name="poi_video">Video parduotuvė</string>
+	<string name="poi_electronics">Elektronikos parduotuvė</string>
+	<string name="poi_car">Automobilių pardavėjas</string>
+	<string name="poi_cosmetics">Kosmetika</string>
+	<string name="poi_watches">Laikrodžių parduotuvė</string>
 	</resources>

OsmAnd/res/values-nb/strings.xml

@@ -1978,7 +1978,7 @@
     <string name="osmo_start_service">OsMo-tjeneste</string>
     <string name="osmo_gpx_track_downloaded">OsMo-spor %1$s lastet ned.</string>
     <string name="select_index_file_to_download">Fant ikke noe. Hvis du ikke finner din region, kan du lage den selv (se http://osmand.net).</string>
-    <string name="none_selected_gpx">Ingen GPX-filer valgt. Trykk lenge for å velge et tilgjengelig spor.</string>
+    <string name="none_selected_gpx">Ingen GPX-filer valgt. For å velge lang-trykk et tilgjengelig spor.</string>
     <string name="gpx_split_interval">Oppdelingsintervall</string>
     <string name="gpx_info_asc_altitude">Nedstigning/stigning: %1$s</string>
     <string name="gpx_timespan">Tidsrom: %1$s</string>
@@ -2616,11 +2616,7 @@
     <string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string>
     <string name="active_markers_descr">Velg hvor mange retningsindikatorer som vises.</string>
     <string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og miniprogrammene.</string>
-    <string name="release_3_0">\\022 Oppdagelse av stoppskilt tar nå hensyn til kjøreretning
+    <string name="release_3_0">\\022 
-\n
-\n • Ny algoritme gir meningsfulle verdier for ned-/stigning for GPX-spor
-\n
-\n • Vandretid tar hensyn til terreng (stigning) (Naismiths regel)
 \n
 \n</string>
     <string name="mark_passed">Marker som passert</string>
@@ -2666,7 +2662,7 @@
     <string name="quick_action_showhide_poi_descr">Trykk på handlingsknappen vil vise eller skjule interessepunkter på kartet.</string>
     <string name="quick_action_page_list_descr">Trykk på handlingsknappen vil bla gjennom listen nedenfor.</string>
     <string name="quick_action_empty_param_error">Parameterne kan ikke være tomme</string>
-    <string name="quick_action_btn_tutorial_descr">Trykk lenge og dra knappen for å endre dens posisjon på skjermen.</string>
+    <string name="quick_action_btn_tutorial_descr">Lang-trykk og dra knappen for å endre dens posisjon på skjermen.</string>
     <string name="add_track_to_markers_descr">Velg et spor for å legge til dets rutepunkter til markørene. (Kun spor med rutepunkter er listet opp.)</string>
     <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="depth_contour_descr">Kartsett som inneholder havdybdekoter og nautiske punkter.</string>
@@ -2712,9 +2708,20 @@
     <string name="commit_poi">Send inn interessepunkt</string>
     <string name="poi_deleted_localy">Interessepunkt blir slettet når du laster opp endringene dine</string>
     <string name="only_download_over_wifi">Bare nedlasting over WiFi</string>
-    <string name="map_widget_fps_info">Bildefrekvens; feilrettingsinfo</string>
+    <string name="map_widget_fps_info">Feilrettingsinfo for bildefrekvens</string>
     <string name="rendering_attr_hidePOILabels_name">Interessepunktpåskrifter</string>
     <string name="will_open_tomorrow_at">Åpner i morgen</string>
     <string name="winter_and_ski_renderer">Vinter og ski</string>
     <string name="touring_view_renderer">Turvisning (kontrast og detaljer)</string>
+    <string name="disable_recording_once_app_killed_descrp">Vil sette GPX-logging i pausemodus når programmet avsluttes (via nylig brukte apper). (OsmAnds bakgrunnsindikasjon forsvinner fra Android-varslingslinjen.)</string>
+    <string name="route_is_too_long_v2">Denne ruten kan være for lang å beregne. Legg til mellomliggende reisemål hvis det ikke blir funnet noe resultat innen 10 minutter.</string>
+    <string name="intermediate_items_sort_return">Mellomliggende reisemål sortert igjen for å optimalisere deres rekkefølge på vei fra nåværende posisjon til målet.</string>
+    <string name="audionotes_location_not_defined">Sted å assosiere med notatet er ikke definert ennå. \"Bruk posisjon …\" for å tilordne et notat til det angitte stedet.</string>
+    <string name="add_waypoint_dialog_title">Legg til rutepunkt i innspilt GPX-spor</string>
+    <string name="voice_is_not_available_msg">Taleveiledning er ikke tilgjengelig, gå til \'Innstillinger\' → \'Navigeringsinnstillinger\' → \'Taleveiledning\' og velg eller last ned en språkpakke.</string>
+    <string name="use_fast_recalculation_desc">For lange turer, beregn på nytt bare den første delen av ruten.</string>
+    <string name="nautical_renderer">Nautisk</string>
+<string name="day_off_label">stengt (fridag)</string>
+    <string name="copy_location_name">Kopier punkt/interessepunkt-navn</string>
+    <string name="toast_empty_name_error">Sted har ikke noe navn</string>
 </resources>

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

@@ -11,7 +11,7 @@
 		<string name="poi_water_transport">Transporte aquático</string>
 		<string name="poi_bicycle_transport">Bicicleta</string>
 		<string name="poi_aerialway_transport">Teleférico</string>
-	<string name="poi_man_made">Construção humana</string>
+	<string name="poi_man_made">Estrutura</string>
 		<string name="poi_transport_construction">Transporte em construção</string>
 		<string name="poi_water_supply">Abastecimento de água</string>
 		<string name="poi_power">Energia elétrica</string>
@@ -79,7 +79,7 @@
 	<string name="poi_fabric">Loja de tecidos</string>
 	<string name="poi_bedding">Loja de roupa de cama</string>
 	<string name="poi_dive">Equipamento de mergulho</string>
-	<string name="poi_doityourself">Artigos para casa</string>
+	<string name="poi_doityourself">Bricolagem</string>
 	<string name="poi_erotic">Sex shop</string>
 	<string name="poi_fishing">Equipamento de pesca</string>
 	<string name="poi_florist">Floricultura</string>
@@ -90,7 +90,7 @@
 	<string name="poi_shop_yes">Loja geral</string>
 	<string name="poi_gift">Loja de presentes</string>
 	<string name="poi_glaziery">Vidraçaria</string>
-	<string name="poi_hardware">Loja de material de construção</string>
+	<string name="poi_hardware">Loja de materiais de construção</string>
 	<string name="poi_hearing_aids">Loja de aparelhos auditivos</string>
 	<string name="poi_herbalist">Ervanária</string>
 	<string name="poi_hifi">Loja de aparelhos hi-fi</string>
@@ -646,9 +646,9 @@
 	<string name="poi_craft_hvac">Aquecimento, ventilação, ar condicionado</string>
 	<string name="poi_craft_insulation">Isolação térmica</string>
 	<string name="poi_craft_jeweller">Joalheria</string>
-	<string name="poi_craft_locksmith">Serralheria</string>
+	<string name="poi_craft_locksmith">Chaveiro</string>
-	<string name="poi_craft_key_cutter">Chaveiro</string>
+	<string name="poi_craft_key_cutter">Copiador de chaves</string>
-	<string name="poi_craft_metal_construction">Ofício de construção em metal</string>
+	<string name="poi_craft_metal_construction">Serralheria</string>
 	<string name="poi_craft_optician">Ótica</string>
 	<string name="poi_craft_painter">Pintor</string>
 	<string name="poi_craft_parquet_layer">Instalador de parquet</string>
@@ -1161,10 +1161,10 @@
 	<string name="poi_wholesale">Atacado</string>
 
 	<string name="poi_trade_building_supplies">Materiais de construção</string>
-	<string name="poi_trade_plumbing">Material de canalização</string>
+	<string name="poi_trade_plumbing">Tubos e conexões</string>
-	<string name="poi_trade_agricultural_supplies">Suprimentos agrícolas</string>
+	<string name="poi_trade_agricultural_supplies">Implementos agrícolas</string>
-	<string name="poi_trade_wood">Suprimentos de madeira</string>
+	<string name="poi_trade_wood">Madeiras</string>
-	<string name="poi_trade_tile">Suprimentos de telha</string>
+	<string name="poi_trade_tile">Telhas</string>
 
 	<string name="poi_population">População</string>
 
@@ -2171,26 +2171,26 @@
 	<string name="poi_social_facility_workshop">Emprego protegido</string>
 	<string name="poi_social_facility_day_care">Berçário</string>
 
-	<string name="poi_social_facility_for_senior">Centro social para idosos</string>
+	<string name="poi_social_facility_for_senior">Idosos</string>
-	<string name="poi_social_facility_for_child">Centro social para crianças</string>
+	<string name="poi_social_facility_for_child">Crianças</string>
-	<string name="poi_social_facility_for_orphan">Centro social para órfãos</string>
+	<string name="poi_social_facility_for_orphan">Órfãos</string>
-	<string name="poi_social_facility_for_disabled">Centro social para deficientes físicos</string>
+	<string name="poi_social_facility_for_disabled">Deficientes</string>
-	<string name="poi_social_facility_for_mental_health">Centro social para pacientes com transtornos mentais</string>
+	<string name="poi_social_facility_for_mental_health">Pacientes com transtornos mentais</string>
-	<string name="poi_social_facility_for_juvenile">Centro social para jovens</string>
+	<string name="poi_social_facility_for_juvenile">Jovens</string>
-	<string name="poi_social_facility_for_homeless">Centro social para desabrigados</string>
+	<string name="poi_social_facility_for_homeless">Desabrigados</string>
-	<string name="poi_social_facility_for_migrant">Centro social para imigrantes</string>
+	<string name="poi_social_facility_for_migrant">Migrantes</string>
-	<string name="poi_social_facility_for_underprivileged">Centro social para desfavorecidos</string>
+	<string name="poi_social_facility_for_underprivileged">Desfavorecidos</string>
-	<string name="poi_social_facility_for_drug_addicted">Centro social para dependentes químicos</string>
+	<string name="poi_social_facility_for_drug_addicted">Dependentes químicos</string>
-	<string name="poi_social_facility_for_unemployed">Centro social para desempregados</string>
+	<string name="poi_social_facility_for_unemployed">Desempregados</string>
-	<string name="poi_social_facility_for_diseased">Centro social para doentes</string>
+	<string name="poi_social_facility_for_diseased">Portadores de doenças</string>
-	<string name="poi_social_facility_for_child_juvenile">Centro social para crianças e jovens</string>
+	<string name="poi_social_facility_for_child_juvenile">Crianças e jovens</string>
 
-	<string name="poi_theatre_genre_philharmonic">Gênero: filarmônica</string>
+	<string name="poi_theatre_genre_philharmonic">Filarmônica</string>
-	<string name="poi_theatre_genre_musical">Gênero: musical</string>
+	<string name="poi_theatre_genre_musical">Musical</string>
-	<string name="poi_theatre_genre_drama">Gênero: drama</string>
+	<string name="poi_theatre_genre_drama">Drama</string>
-	<string name="poi_theatre_genre_opera">Gênero: ópera</string>
+	<string name="poi_theatre_genre_opera">Ópera</string>
-	<string name="poi_theatre_genre_cabaret">Gênero: cabaré</string>
+	<string name="poi_theatre_genre_cabaret">Cabaré</string>
-	<string name="poi_theatre_genre_puppet">Gênero: fantoche</string>
+	<string name="poi_theatre_genre_puppet">Fantoche</string>
 	<string name="poi_theatre_genre_comedy">Gênero: comédia</string>
 	<string name="poi_theatre_genre_chamber_music">Gênero: música de câmara</string>
 	<string name="poi_theatre_genre_marionette">Gênero: marionete</string>
@@ -2349,15 +2349,15 @@
 	<string name="poi_artist_name">Artista</string>
 	<string name="poi_sculptor">Escultor</string>
 
-	<string name="poi_building_type_church">Tipo de construção: igreja</string>
+	<string name="poi_building_type_church">Tipo de edificação: igreja</string>
-	<string name="poi_building_type_chapel">Tipo de construção: capela</string>
+	<string name="poi_building_type_chapel">Tipo de edificação: capela</string>
-	<string name="poi_building_type_mosque">Tipo de construção: mesquita</string>
+	<string name="poi_building_type_mosque">Tipo de edificação: mesquita</string>
-	<string name="poi_building_type_temple">Tipo de construção: templo</string>
+	<string name="poi_building_type_temple">Tipo de edificação: templo</string>
-	<string name="poi_building_type_cathedral">Tipo de construção: catedral</string>
+	<string name="poi_building_type_cathedral">Tipo de edificação: catedral</string>
-	<string name="poi_building_type_monastery">Tipo de construção: mosteiro</string>
+	<string name="poi_building_type_monastery">Tipo de edificação: mosteiro</string>
-	<string name="poi_building_type_basilica">Tipo de construção: basílica</string>
+	<string name="poi_building_type_basilica">Tipo de edificação: basílica</string>
-	<string name="poi_building_type_synagogue">Tipo de construção: sinagoga</string>
+	<string name="poi_building_type_synagogue">Tipo de edificação: sinagoga</string>
-	<string name="poi_building_type_shrine">Tipo de construção: santuário</string>
+	<string name="poi_building_type_shrine">Tipo de edificação: santuário</string>
 
 	<string name="poi_cross">Cruz</string>
 	<string name="poi_prison_camp">Antigo campo de detenção</string>
@@ -2538,7 +2538,7 @@
 	<string name="poi_health_specialty_depth_psychology_yes">Psicologia profunda</string>
 	<string name="poi_health_specialty_behavior_yes">Comportamental</string>
 
-	<string name="poi_building_type_pyramid">Tipo de construção: pirâmide</string>
+	<string name="poi_building_type_pyramid">Tipo de edificação: pirâmide</string>
 
 <string name="poi_pa">Pa (assentamento fortificado maori)</string>
 
@@ -2810,7 +2810,7 @@
 	<string name="poi_dish">Prato</string>
 	<string name="poi_payment_transport_type">Tipo de pagamento (transporte)</string>
 	<string name="poi_social_facility_type">Tipo</string>
-	<string name="poi_social_facility_for">Público alvo</string>
+	<string name="poi_social_facility_for">Público-alvo</string>
 	<string name="poi_compressed_air_filter">Ar comprimido</string>
 	<string name="poi_vacuum_cleaner_filter">Aspirador de pó</string>
 	<string name="poi_free_flying_characteristic">Característica</string>

OsmAnd/res/values-ru/strings.xml

@@ -2585,15 +2585,27 @@
 \n• OsmAnd Live: исправления ошибок, обновление данных на сервере каждые 30 минут, обновления учитываются в навигации
 \n
 \n</string>
-    <string name="release_2_9">
+    <string name="release_2_9">• Обнаружение стоп-сигналов теперь учитывает направление движения 
-    \u2022 Обновили контекстное меню: показываем когда откроется/закроется POI\n\n
+\n 
-    \u2022 Меню транспорта: вынесли наверх все доступные маршруты\n\n
+\n • Новый алгоритм, предоставляющий действительные значения подъема/спуска для треков GPX 
-    \u2022 Википедия: добавили кнопку перехода к статье, обновили внешний вид статьи\n\n
+\n 
-    \u2022 Маршрут: добавили смену начальной и конечной точки\n\n
+\n • Время ходьбы в зависимости от местности (подъема) (правило Нейсмита) 
-    \u2022 Заметки: добавили сортировку по типу и дате\n\n
+\n
-    \u2022 OSM правки: показываем иконку и название категории POI, отображаем совершенное действие\n\n
+\n• Обновили контекстное меню: показываем когда откроется/закроется POI
-    \u2022 Новый экран быстрого ввода координат, для быстрого создания маркеров\n\n
+\n
-    </string>
+\n • Меню транспорта: вынесли наверх все доступные маршруты
+\n
+\n • Википедия: добавили кнопку перехода к статье, обновили внешний вид статьи
+\n
+\n • Маршрут: добавили смену начальной и конечной точки
+\n
+\n • Заметки: добавили сортировку по типу и дате
+\n
+\n • OSM правки: показываем иконку и название категории POI, отображаем совершенное действие
+\n
+\n • Новый экран быстрого ввода координат, для быстрого создания маркеров
+\n
+\n</string>
     <string name="show_map">Показать карту</string>
     <string name="plan_route_no_markers_toast">Вы должны добавить по крайней мере один маркер, чтобы использовать эту функцию.</string>
     <string name="osn_modify_dialog_error">Произошло исключение: заметка не изменена</string>
@@ -2791,12 +2803,7 @@
     <string name="by_date">По дате</string>
     <string name="by_type">По типу</string>
     <string name="modify_the_search_query">Изменить поисковый запрос.</string>
-    <string name="release_3_0">• Обнаружение стоп-сигналов теперь учитывает направление движения
+    <string name="release_3_0">• 
-\n
-\n• Новый алгоритм, предоставляющий действительные значения подъема/спуска для треков GPX
-\n
-\n• Время ходьбы в зависимости от местности (подъема) (правило Нейсмита)
-\n
 \n</string>
     <string name="osm_recipient_stat">Правок %1$s, сумма %2$s mBTC</string>
     <string name="osm_recipients_label">OSM получатели</string>
@@ -2825,4 +2832,6 @@
     <string name="rendering_attr_hidePOILabels_name">Названия POI</string>
 
     <string name="will_open_tomorrow_at">Откроется завтра в</string>
+    <string name="copy_location_name">Копировать название точки/POI</string>
+    <string name="toast_empty_name_error">Место не имеет названия</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -2933,4 +2933,7 @@ Pro praghere iscrie su còdighe intreu</string>
 \n
 \n • Ischermada lestra noa pro s\'insertadura de sas coordinatas pro sa creatzione lestra de marcadores
 \n</string>
+    <string name="day_off_label">serradu</string>
+    <string name="copy_location_name">Còpia su nùmene de su Puntu/PDI</string>
+    <string name="toast_empty_name_error">Su logu non tenet unu nùmene</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -1598,7 +1598,7 @@ Chcete pokračovať v novej registrácii?</string>
     <string name="plugin_ski_descr">Tento modul vám sprístupní celosvetové zjazdovky, bežecké trate, alpinistické trasy, lanovky a lyžiarske vleky. Trasy a zjazdovky sú farebne rozlíšené podľa obtiažnosti a zobrazené v špeciálnom \"zimnom\" štýle, ktorý pripomína zasneženú krajinu. 
 \n
 \nAktivovanie tohto pohľadu zmení štýl mapy na \"Zima a lyžovanie\", ktorý zobrazuje krajinné útvary v zimných podmienkach. Tento pohľad môže byť vypnutý jeho deaktivovaním tu alebo zmenou hodnoty v \"Štýl vykresľovania\" v \"Nastaviť mapu\".</string>
-    <string name="plugin_touringview_descr">Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Touring view\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov.
+    <string name="plugin_touringview_descr">Aktivovaním tohto pohľadu sa zmení štýl mapy na \"Cestovanie\", ktorý obsahuje viac detailov pre cestovateľov a profesionálnych vodičov. 
 \n 
 \nTento pohľad poskytuje vo všetkých priblíženiach mapy maximum cestovných detailov (napr. cesty, chodníky a orientačné značky). 
 \n 
@@ -3011,4 +3011,27 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="total_donations">Celkové príspevky</string>
 <string name="shared_string_without_name">Bez názvu</string>
     <string name="lang_lo">Laosky</string>
+    <string name="will_open_tomorrow_at">Otvorí zajtra o</string>
+    <string name="rendering_attr_hidePOILabels_name">Popisy bodov záujmu</string>
+    <string name="release_2_9">\\022 Aktualizované kontextové menu: zobrazí kedy bod záujmu otvára / zatvára
+\n
+\n • Dopravné menu: všetky dostupné linky sú teraz navrchu
+\n
+\n • Wikipedia: pridané tlačidlo na otvorenie originálneho článku, vzhľad článkov bol aktualizovaný
+\n
+\n • Trasa: pridaná možnosť vymeniť štart a cieľ jedným stlačením
+\n
+\n • Poznámky: pridané triedenie podľa typu a dátumu
+\n
+\n • Úpravy OSM: zobrazenie ikony a názvu kategórie bodu, zobrazenie dokončených akcií
+\n
+\n • Nová obrazovaka na rýchle zadávanie súradníc pre vytváranie mapových značiek
+\n
+\n</string>
+    <string name="day_off_label">zatvorené</string>
+    <string name="winter_and_ski_renderer">Zima a lyžovanie</string>
+    <string name="touring_view_renderer">Cestovanie (kontrast a detaily)</string>
+    <string name="nautical_renderer">Námorný</string>
+<string name="copy_location_name">Kopírovať názov bodu</string>
+    <string name="toast_empty_name_error">Umiestnenie nemá žiadny názov</string>
 </resources>

OsmAnd/res/values-sr/strings.xml

@@ -393,13 +393,13 @@
     <string name="search_radius_proximity">У близини</string>
     <string name="shared_string_hide">Сакриј</string>
     <string name="av_audio_format">Облик звучног излаза</string>
-    <string name="av_audio_format_descr">Изаберите облик за звучни излаз</string>
+    <string name="av_audio_format_descr">Изаберите облик за звучни излаз.</string>
     <string name="av_audio_bitrate">Битски проток звука</string>
-    <string name="av_audio_bitrate_descr">Изаберите битски проток звука</string>
+    <string name="av_audio_bitrate_descr">Изаберите битски проток звука.</string>
-    <string name="please_specify_poi_type_only_from_list">Молим, изаберите тачну врсту тачке занимања или је прескочите</string>
+    <string name="please_specify_poi_type_only_from_list">Молим, изаберите тачну врсту тачке занимања или је прескочите.</string>
-    <string name="access_from_map_description">Дугме изборника не покреће изборник, већ плочу полетника</string>
+    <string name="access_from_map_description">Дугме изборника не покреће изборник, већ полицу полетника.</string>
     <string name="access_from_map">Приступ са карте</string>
-    <string name="show_on_start_description">„Искључи“ покреће приказ карте</string>
+    <string name="show_on_start_description">„Искључи“ покреће приказ карте.</string>
     <string name="show_on_start">Прикажи при покретању</string>
     <string name="copied_to_clipboard">Умножено је у оставу исечака</string>
     <string name="osm_save_offline">Сачувај за преглед ван мреже</string>
@@ -465,9 +465,9 @@
     <string name="gps_wake_up_timer">Међувреме буђења ГПС-а</string>
     <string name="favourites_edit_dialog_title">Омиљена обавештења</string>
     <string name="simulate_your_location_stop_descr">Заустави опонашање свог положаја</string>
-    <string name="simulate_your_location_descr">Опонашај употребом прорачунате путање или снимка ГПИкс-а</string>
+    <string name="simulate_your_location_descr">Опонашај употребом прорачунате путање или снимка ГПИкс-а.</string>
     <string name="looking_up_address">Претражујем адресу</string>
-    <string name="av_locations_descr">Датотека ГПС-а са положајима белешки</string>
+    <string name="av_locations_descr">Датотека ГПС-а са положајима белешки.</string>
     <string name="av_locations">Положаји</string>
     <string name="plugin_settings">Прикључци</string>
     <string name="rendering_value_boldOutline_name">Задебљај обрисне линије</string>
@@ -707,8 +707,8 @@
     <string name="gpx_wpt">Пролазна тачка</string>
     <string name="available_maps">Доступне карте</string>
     <string name="select_voice_provider">Изаберите гласовно навођење</string>
-    <string name="select_voice_provider_descr">Изаберите или преузмите гласовно навођење свог језика</string>
+    <string name="select_voice_provider_descr">Изаберите или преузмите гласовно навођење свог језика.</string>
-    <string name="impassable_road_desc">Изаберите које путеве желите да избегавате током навођења</string>
+    <string name="impassable_road_desc">Изаберите које путеве желите да избегавате током навођења.</string>
     <string name="shared_string_sound">Звук</string>
     <string name="no_location_permission">Програм нема дозволу да приступи подацима о положају.</string>
     <string name="no_camera_permission">Програм нема дозволу да приступи камери.</string>
@@ -721,7 +721,7 @@
     <string name="av_video_quality_low">Најнижа каквоћа</string>
     <string name="av_video_quality_high">Највиша каквоћа</string>
     <string name="av_video_quality">Квалитет излаза слике</string>
-    <string name="av_video_quality_descr">Изаберите својства излазног приказа</string>
+    <string name="av_video_quality_descr">Изаберите својства приказа видеја.</string>
     <string name="osm_edit_created_note">Направи белешку ОСМ-а</string>
     <string name="context_menu_item_delete_waypoint">Да ли избрисати пролазну тачку ГПИкс-а?</string>
     <string name="context_menu_item_edit_waypoint">Уреди пролазну тачку ГПИкс-а</string>
@@ -737,11 +737,11 @@
     <string name="routing_attr_avoid_shuttle_train_name"/>
     <string name="rec_split">Сецкање снимања</string>
     <string name="rec_split_title">Користи сецкање снимака</string>
-    <string name="rec_split_desc">Преписује снимке када се препуни место за њихово складиштење</string>
+    <string name="rec_split_desc">Преписује снимке када се препуни место за њихово складиштење.</string>
     <string name="rec_split_clip_length">Дужина одсечка снимка</string>
-    <string name="rec_split_clip_length_desc">Сваки одсечак снимка неће бити дужи од одабраног времена</string>
+    <string name="rec_split_clip_length_desc">Повећај временско ограничење за снимке.</string>
     <string name="rec_split_storage_size">Величина оставе</string>
-    <string name="rec_split_storage_size_desc">Величина заузећа свих снимљених одсечака</string>
+    <string name="rec_split_storage_size_desc">Величина заузећа свих снимљених одсечака.</string>
     <string name="night">Ноћ</string>
 <string name="shared_string_go">Иди</string>
     <string name="shared_string_not_selected">Није означено</string>
@@ -853,7 +853,7 @@
     <string name="seconds_ago">пре секунде</string>
     <string name="osmo_connected_devices">Повезани уређаји</string>
     <string name="osmo_groups">Скупови/уређаји ОсМа</string>
-    <string name="osmo_auto_send_locations_descr">Самостално отпочни праћење и шаљи положај по покретању програма</string>
+    <string name="osmo_auto_send_locations_descr">Самостално отпочни праћење и шаљи положај по покретању програма.</string>
     <string name="osmo_auto_send_locations">Самостално отпочни путовање</string>
     <string name="osmo_tracker_id">Лични број праћења</string>
     <string name="osmo_auth_pending">Чекам на пријаву…</string>
@@ -1189,7 +1189,7 @@
     <string name="shared_string_is_open_24_7">Отвори стално</string>
     <string name="storage_directory_card">Складишна картица</string>
     <string name="coords_format">Облик координата</string>
-    <string name="coords_format_descr">Облик земљописних координата</string>
+    <string name="coords_format_descr">Облик земљописних координата.</string>
     <string name="app_mode_bus">Сабирница</string>
     <string name="app_mode_train">Воз</string>
     <string name="current_track">Тренутна стаза</string>
@@ -1198,10 +1198,10 @@
     <string name="move_marker_bottom_sheet_title">Помери карту ради измена положаја ознаке</string>
     <string name="follow_us">Прати нас</string>
     <string name="access_direction_audio_feedback">Звучни одзив промене правца</string>
-    <string name="access_direction_audio_feedback_descr">Указуј на правац циљне тачке звуком</string>
+    <string name="access_direction_audio_feedback_descr">Указуј на правац циљне тачке звуком.</string>
     <string name="access_direction_haptic_feedback">Одзив промене правца трешњом</string>
-    <string name="access_direction_haptic_feedback_descr">Указуј на правац циљне тачке трешњом</string>
+    <string name="access_direction_haptic_feedback_descr">Указуј на правац циљне тачке трешњом.</string>
-    <string name="use_osm_live_routing_description">Омогући навођење живих измена ОСМ-а (Пробно)</string>
+    <string name="use_osm_live_routing_description">Омогући навођење живих измена ОСМ-а.</string>
     <string name="use_osm_live_routing">Навођење уживо ОСМ-а</string>
     <string name="access_no_destination">Одредиште није подешено</string>
     <string name="access_category_choice">Изаберите врсту</string>
@@ -1236,7 +1236,7 @@
     <string name="add_points_to_map_markers_q">Да ли желите додати све тачке у ознаке на карти?</string>
     <string name="shared_string_add_to_map_markers">Додај у ознаке на карти</string>
     <string name="select_map_markers">"Одабери ознаке  на карти"</string>
-    <string name="show_map_markers_description">Покрени могућност означавања на карти</string>
+    <string name="show_map_markers_description">Покрени могућност означавања на карти.</string>
     <string name="active_markers">Дејствујуће ознаке</string>
     <string name="map_markers">Ознаке на карти</string>
     <string name="clear_active_markers_q">Желите ли уклонити све дејствујуће ознаке?</string>
@@ -1268,7 +1268,7 @@
     <string name="incremental_search_street">Прираштајно тражи улице</string>
     <string name="incremental_search_building">Прираштајно тражи зграде</string>
     <string name="search_on_the_map_item">Претрага карте</string>
-    <string name="access_smart_autoannounce_descr">Обавести ме само ако је правац ка циљној тачци измењен</string>
+    <string name="access_smart_autoannounce_descr">Обавести ме само ако је правац ка циљној тачци измењен.</string>
     <string name="no_waypoints_found">Нема пронађених пролазних тачака</string>
     <string name="get_directions">Упутства</string>
     <string name="map_marker_1st">Прва ознака карте</string>
@@ -1278,20 +1278,20 @@
     <string name="upload_osm_note_description">Можете отпремити своју белешку ОСМ-а тајно коришћењем свог налога OpenStreetMap.org-а.</string>
     <string name="show_legacy_search_desc">Дозволи стару претрагу у списку полице.</string>
     <string name="routing_attr_allow_motorway_name">Дозволи употребу путева за моторна возила</string>
-    <string name="routing_attr_allow_motorway_description">Дозволи употребу путева за моторна возила</string>
+    <string name="routing_attr_allow_motorway_description">Дозволи употребу путева за моторна возила.</string>
     <string name="map_widget_magnetic_bearing">Магнетно вретено</string>
     <string name="map_widget_bearing">Усмерено вретено</string>
-    <string name="access_disable_offroute_recalc">Не мењај путању ако сте ван пута</string>
+    <string name="access_disable_offroute_recalc">Нема прорачунавања путања по његовом напуштању</string>
-    <string name="access_disable_offroute_recalc_descr">Спречи самостални прерачун путање ако сте далеко од правилне путање</string>
+    <string name="access_disable_offroute_recalc_descr">Спречи самостални прерачун путање по њином напуштању.</string>
-    <string name="access_disable_wrong_direction_recalc">Не мењај путању због погрешног правца</string>
+    <string name="access_disable_wrong_direction_recalc">Нема прорачуна пута због погрешног правца</string>
-    <string name="access_disable_wrong_direction_recalc_descr">Спречи самостални прерачун путање ако се крећете у погрешном правцу</string>
+    <string name="access_disable_wrong_direction_recalc_descr">Спречи самостални прерачун путање ако се крећете у погрешном правцу.</string>
     <string name="access_smart_autoannounce">Паметна најава</string>
     <string name="access_autoannounce_period">Међувреме паметних најава</string>
-    <string name="access_autoannounce_period_descr">Најкраће време између најава</string>
+    <string name="access_autoannounce_period_descr">Најкраће време између најава.</string>
     <string name="access_default_color">Подразумевана боја</string>
     <string name="access_hint_enter_name">Унесите име</string>
     <string name="access_hint_enter_category">Унесите врсту</string>
-    <string name="access_hint_enter_description">Унесите опис</string>
+    <string name="access_hint_enter_description">Унесите опис.</string>
     <string name="access_map_linked_to_location">Карта је везана за положај</string>
     <string name="access_collapsed_list">Скупљени списак</string>
     <string name="access_expanded_list">Прострт списак</string>
@@ -1308,7 +1308,7 @@
     <string name="rendering_value_medium_name">Средње</string>
     <string name="rendering_value_bold_name">Дебело</string>
     <string name="report">Извештај</string>
-    <string name="osmo_tracker_id_descr">Тапните за приказ ИД-а пратиоца</string>
+    <string name="osmo_tracker_id_descr">Тапните за приказ ЛБ-а пратиоца.</string>
     <string name="storage_permission_restart_is_required">Апликацији је сада дозвољен упис на спољно складиште. Неопходно је да ручно поново покренете апликацију.</string>
     <string name="dist_away_from_my_location">Тражи на растојању %1$s</string>
     <string name="shared_string_move_up">Помери навише</string>
@@ -1324,22 +1324,22 @@
     <string name="number_of_recipients">Број примаоца</string>
     <string name="osm_user_stat">Уредбе %1$s, углед %2$s, укупних уредби %3$s</string>
     <string name="osm_editors_ranking">Углед уредника ОСМ-а</string>
-    <string name="osm_live_subscription">Претплата на ОСМ уживо</string>
+    <string name="osm_live_subscription">Претплата на ОСМанд уживо</string>
     <string name="osm_live_subscribe_btn">Претплати се</string>
-    <string name="osm_live_email_desc">Потребна нам је да обезбедимо податке о доприносима</string>
+    <string name="osm_live_email_desc">Потребно је да обезбедимо податке о доприносима.</string>
     <string name="osm_live_user_public_name">Јавно име</string>
     <string name="osm_live_hide_user_name">Не приказуј моје име у извештајима</string>
     <string name="osm_live_support_region">Подржана област</string>
     <string name="osm_live_month_cost">Месечна цена</string>
-    <string name="osm_live_month_cost_desc">Месечно плаћање</string>
+    <string name="osm_live_month_cost_desc">Месечно плаћање.</string>
     <string name="osm_live_active">Дејствено</string>
     <string name="osm_live_not_active">Недејствено</string>
     <string name="osm_live_enter_email">Молим, унесите ваљану адресу Е-поште</string>
     <string name="osm_live_enter_user_name">Молим, унесите јавно име</string>
     <string name="osm_live_thanks">Хвала што се претплаћујете на надградње уживо!</string>
-    <string name="osm_live_region_desc">Део Ваших прилога ће бити послан корисницима ОСМ-а који отпремају измене карата те области</string>
+    <string name="osm_live_region_desc">Део Ваших прилога ће бити послан корисницима ОСМ-а који отпремају измене карата те области.</string>
     <string name="osm_live_subscription_settings">Поставке претплате</string>
-    <string name="osm_live_ask_for_purchase">Молим, прво се преплатите на ОСМ уживо</string>
+    <string name="osm_live_ask_for_purchase">Молим, прво се преплатите на ОСМанд уживо</string>
 
     <string name="osm_live_header">Ова претплата омогућава часовне надградње свих светских карата.
 Део вредности се враћа заједници ОСМ-а и ислаћује сваком доприносиоцу ОСМ-а.
@@ -1639,4 +1639,50 @@
     <string name="quick_action_resume_pause_navigation_descr">Тупните ову тачку за застанак или наставак навођења.</string>
     <string name="quick_action_show_navigation_finish_dialog">П</string>
     <string name="quick_action_start_stop_navigation">Почни/заустави навођење</string>
+    <string name="will_open_tomorrow_at">Ће бити отворено сутра у</string>
+    <string name="rendering_attr_hidePOILabels_name">Ознаке тачака занимања</string>
+    <string name="shared_string_without_name">Без имена</string>
+    <string name="empty_state_markers_active_desc">Дуго или кратко тупните места, онда тупните на дугме заставице ознаке.</string>
+    <string name="map_orientation_change_in_accordance_with_speed">Задршка усмерења карте</string>
+    <string name="quick_action_start_stop_navigation_descr">Тупните на ово дугме за почетак или завршетак навођења.</string>
+    <string name="store_tracks_in_monthly_directories">Сачувај снимљене путање по месечним омотима</string>
+    <string name="store_tracks_in_monthly_directories_descrp">Сачувај снимљене путање по подомотима према месецима снимања (нпр. 2017-11).</string>
+    <string name="shared_string_reset">Врати на подразумевано</string>
+    <string name="shared_string_reload">Поново учитај</string>
+    <string name="mapillary_menu_descr_tile_cache">Поново учитај плочице ради постављања података дана.</string>
+    <string name="mapillary_menu_title_tile_cache">Оставка плочица</string>
+    <string name="wrong_user_name">Погрешно корисничко име!</string>
+    <string name="shared_string_to">Ка</string>
+    <string name="mapillary_menu_date_from">Из</string>
+    <string name="mapillary_menu_descr_dates">Прегледај само додате слике</string>
+    <string name="mapillary_menu_title_dates">Дан</string>
+    <string name="mapillary_menu_edit_text_hint">Унесите корисничко име</string>
+    <string name="mapillary_menu_descr_username">Прегледај само слике додате од</string>
+    <string name="mapillary_menu_title_username">Корисничко име</string>
+    <string name="mapillary_menu_filter_description">Можете пробирати слике према отпремачу или дану. Пробирање се примењује само при приближавању.</string>
+    <string name="map_widget_ruler_control">Обим лењира</string>
+    <string name="shared_string_permissions">Дозволе</string>
+    <string name="import_gpx_failed_descr">Османд не може увести датотеку. Молим, проверите да ли Османд има дозволе за читање датотеке са његовог положаја.</string>
+    <string name="distance_moving">Растојање је исправљено</string>
+    <string name="mapillary_image">Слика Картишта</string>
+    <string name="improve_coverage_mapillary">Побољшајте покривеност слика Картиштем</string>
+    <string name="improve_coverage_install_mapillary_desc">Можете своје слике или низ слика и додати их на овај положај карте.
+\n
+\nДа би то учинили требате уградити програм Картиште (Mapillary) из Гуглове продавнице.</string>
+    <string name="subscribe_email_desc">Претплатите се на наш дописни списак за попуст и добијте још 3 преузимања карти!</string>
+    <string name="depth_contour_descr">Скуп карата које садрже обрисе дубине мора и наутичке тачке.</string>
+    <string name="sea_depth_thanks">Хвала Вам на куповини обриса наутичких дубина!</string>
+    <string name="index_item_depth_contours_osmand_ext">Обриси наутичких дубина</string>
+    <string name="index_item_depth_points_southern_hemisphere">Наутичке дубинске тачке јужне полулопте</string>
+    <string name="index_item_depth_points_northern_hemisphere">Наутичке дубинске тачке северне полулопте</string>
+    <string name="download_depth_countours">Обриси наутичке дубине</string>
+    <string name="shared_string_color">Боја</string>
+    <string name="routing_attr_height_obstacles_description">Користите податке висине земљишта обезбеђених помоћу СРМ-а, АСТЕР-а и ЕУ-ДЕМ-а.</string>
+    <string name="auto_split_recording_title">Самоподели снимке после размака</string>
+    <string name="auto_split_recording_descr">Почни нови одсечак после размака од 6 минута, нову путању после размака од 2 сата, или нову датотеку после дужег размака ако је дан измењен.</string>
+    <string name="rendering_attr_showMtbRoutes_name">Прикажи путеве МТБ</string>
+    <string name="add_time_span">Додај временски размак</string>
+    <string name="rendering_value_darkyellow_name">Тамно-жута</string>
+    <string name="rendering_value_translucent_pink_name">Прозирна ружичаста</string>
+    <string name="lang_hsb">Српски (горњи)</string>
     </resources>

OsmAnd/res/values-tr/strings.xml

@@ -1426,7 +1426,7 @@
     <string name="versions_item">Sürümler</string>
     <string name="feedback">Görüşleriniz</string>
     <string name="contact_us">Bize Ulaşın</string>
-    <string name="map_legend">Harita Efsanesi</string>
+    <string name="map_legend">Harita İşaretleri</string>
     <string name="save_poi_without_poi_type_message">Gerçekten POI türünü belirtmeden POI\' yi kaydetmek istiyor musunuz?</string>
     <string name="poi_context_menu_modify_osm_change">OSM değişikliği değiştirme</string>
     <string name="new_version">Yeni Sürüm</string>
@@ -1779,7 +1779,7 @@
     <string name="gpx_timespan">Zaman aralığı:%1$s</string>
     <string name="gpx_timemoving">Zaman hareketli:%1$s</string>
     <string name="gpx_selection_segment_title">Bölüm</string>
-    <string name="gpx_selection_number_of_points">" %1$s noktaları"</string>
+    <string name="gpx_selection_number_of_points">%1$s nokta</string>
     <string name="gpx_selection_point">Nokta%1$s</string>
     <string name="gpx_selection_route_points">%1$s\nRota%2$s işaret</string>
     <string name="gpx_selection_points">%1$s\nPoints</string>
@@ -2260,7 +2260,7 @@
     <string name="osm_live_payment_desc">Abonelik ücreti her ay kesilecektir. Aboneliğinizi istediğiniz zaman Google Play\'den iptal edebilirsiniz.</string>
     <string name="donation_to_osm">OpenStreetMap topluluğuna bağış</string>
     <string name="donation_to_osm_desc">Bağışınızın bir bölümü, OpenStreetMap\'e değişiklik yapan OSM kullanıcılarına gönderilir. Abonelik ücretiniz aynı kalır.</string>
-    <string name="osm_live_subscription_desc">Abonelik; tüm küresel haritalar için sınır indirmeyi ve saatlik, günlük, haftalık güncellemeleri etkinleştirir.</string>
+    <string name="osm_live_subscription_desc">Abonelik; tüm küresel haritalar için sınırsız indirmeyi ve saatlik, günlük, haftalık güncellemeleri etkinleştirir.</string>
     <string name="osm_live_banner_desc">Sınırsız harita indirme edin, ve ayda birden çok harita güncellemesi al: haftalık, günlük veya saatlik.</string>
     <string name="osmand_plus_banner_desc">Sınırsız harita indirmeleri, güncellemeleri ve Wikipedia eklentisi.</string>
     <string name="skip_map_downloading">Haritaları indirmeyi atla</string>
@@ -2469,7 +2469,7 @@
     <string name="show_arrows_on_the_map">Haritada yön gösterici okları göster</string>
     <string name="measurement_tool_snap_to_road_descr">OsmAnd seçilmiş profil için rotalı noktalara bağlanacak.</string>
     <string name="none_point_error">Lütfen en az bir nokta ekleyiniz.</string>
-    <string name="measurement_tool_action_bar">Haritayı görüntüle ve noktalar ekle</string>
+    <string name="measurement_tool_action_bar">Haritayı görüntüle ve nokta ekle</string>
     <string name="store_tracks_in_monthly_directories">Kaydedilmiş track\'ları aylık klasörlerde depola</string>
     <string name="mapillary_menu_filter_description">Resimleri yükleyicisine göre veya tarihe göre süzebilirsiniz. Süzgeçler yalnızca yakınlaştırılmış görüntü yaklaştırmada uygulanır.</string>
     <string name="distance_moving">Düzeltilmiş uzaklık</string>

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

@@ -1423,12 +1423,12 @@
     <string name="restart_search">重新开始搜索</string>
     <string name="increase_search_radius">增加搜索范围</string>
     <string name="nothing_found">什么都没找到 :(</string>
-    <string name="nothing_found_descr">尝试改变搜索查询内容或增加搜索范围</string>
+    <string name="nothing_found_descr">尝试改变搜索查询内容或增加搜索范围。</string>
     <string name="quick_action_showhide_osmbugs_title">显示/隐藏 OSM 笔记</string>
     <string name="quick_action_osmbugs_show">显示 OSM 笔记</string>
     <string name="quick_action_osmbugs_hide">隐藏 OSM 笔记</string>
     <string name="shared_string_add_photos">添加照片</string>
-    <string name="routing_attr_allow_private_description">允许进入私有土地</string>
+    <string name="routing_attr_allow_private_description">允许进入私有土地。</string>
     <string name="download_tab_downloads">全部下载</string>
     <string name="download_tab_local">本地</string>
     <string name="download_tab_updates">可更新</string>
@@ -1481,7 +1481,7 @@
     <string name="online_photos">在线照片</string>
     <string name="mapillary_descr">供所有人使用的在线街景照片。协作发现景点，捕捉世界之美。</string>
     <string name="distance_moving">距离已修正</string>
-    <string name="no_photos_descr">我们没有该地点的照片</string>
+    <string name="no_photos_descr">我们没有该地点的照片。</string>
     <string name="routing_attr_short_way_name">节油道路</string>
     <string name="routing_attr_short_way_description">使用节油道路（通常更短）</string>
     <string name="configure_screen_quick_action">快捷操作</string>
@@ -1507,7 +1507,7 @@
 \n要做到這些，您需要去 Google Play 安裝 Mapillary 应用。</string>
     <string name="mapillary_action_descr">在这个地点，通过 Mapillary 贡献您的在线街景图片。</string>
     <string name="mapillary_widget">Mapillary 小工具</string>
-    <string name="mapillary_widget_descr">可以让你迅速将图片提交到 Mapillary</string>
+    <string name="mapillary_widget_descr">可以助您迅速将图片提交到 Mapillary。</string>
     <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">将街道平面照片給每个人。发现新地点、写作、获取整个世界。</string>
     <string name="quick_action_showhide_osmbugs_descr">轻点动作按钮会在地图上显示或隐藏 OSM 注解。</string>
@@ -1522,7 +1522,7 @@
     <string name="show_from_zoom_level">根据縮放等級显示</string>
     <string name="favorite_group_name">组名称</string>
     <string name="animate_my_location">动画处理我的位置</string>
-    <string name="animate_my_location_desc">在导航时为我的位置启用动画</string>
+    <string name="animate_my_location_desc">在导航时为我的位置启用动画。</string>
     <string name="quick_action_add_destination_desc">轻点按鈕将在屏幕中心位置添加一个目的地。以前设定的目的地成为最后的中转点。</string>
     <string name="quick_action_replace_destination_desc">轻点动作按钮将吧屏幕中心的位置更换为目的地。</string>
     <string name="quick_action_add_first_intermediate_desc">轻点动作按钮将在屏幕中心位置添加一个中转点。</string>
@@ -2618,8 +2618,8 @@
     <string name="mapillary_menu_title_username">用户名</string>
     <string name="mapillary_menu_edit_text_hint">输入用户名</string>
     <string name="mapillary_menu_title_dates">日期</string>
-    <string name="mapillary_menu_descr_username">查看特定用户添加的图像。</string>
+    <string name="mapillary_menu_descr_username">仅查看特定用户添加的图像</string>
-    <string name="mapillary_menu_descr_dates">查看特定时期内添加的图像。</string>
+    <string name="mapillary_menu_descr_dates">仅查看添加的图像</string>
     <string name="mapillary_menu_filter_description">您可以根据提交者或日期过滤图像。过滤器仅在高比例尺放大时产生作用。</string>
     <string name="shared_string_reload">重新载入</string>
     <string name="shared_string_reset">重置</string>
@@ -2634,10 +2634,10 @@
     <string name="moving_time">移动时间</string>
     <string name="min_max">最小/最大</string>
     <string name="quick_action_resume_pause_navigation">继续/暂停导航</string>
-    <string name="quick_action_resume_pause_navigation_descr">点击该按钮以暂停导航，或者在已暂停时恢复导航。</string>
+    <string name="quick_action_resume_pause_navigation_descr">点击该按钮以暂停或恢复导航。</string>
     <string name="quick_action_show_navigation_finish_dialog">显示导航完成对话框</string>
-    <string name="quick_action_start_stop_navigation">开始/结束导航</string>
+    <string name="quick_action_start_stop_navigation">开始/停止导航</string>
-    <string name="quick_action_start_stop_navigation_descr">点击该按钮以开始导航，或者在导航已经开始的情况下结束导航。</string>
+    <string name="quick_action_start_stop_navigation_descr">点击该按钮以开始或结束导航。</string>
     <string name="release_2_7">\\022 带有街道等级图像的 Mapillary 插件
 \n
 \n• 用于距离测量的量尺小部件
@@ -2689,11 +2689,7 @@
     <string name="additional_actions">额外的活动</string>
     <string name="av_locations_selected_desc">GPX文件，包含所选笔记的坐标和数据。</string>
     <string name="av_locations_all_desc">GPX文件，包含所有注释的坐标和数据。</string>
-    <string name="release_3_0">\\022 停车标志的检测，现在考虑驾驶方向
+    <string name="release_3_0">\\022 
-\n
-\n  •新算法为GPX轨迹提供有意义的上升/下降值
-\n
-\n  •地形（上升）能够感觉到到徒步的时间（奈史密斯的规则）
 \n
 \n</string>
     <string name="modify_the_search_query">修改搜索查询。</string>
@@ -2741,4 +2737,7 @@
     <string name="show_on_map_after_saving">保存后在地图上显示</string>
     <string name="measurement_tool_action_bar">浏览地图并添加点</string>
     <string name="measurement_tool">测量距离</string>
+    <string name="will_open_tomorrow_at">明日开始营业时间</string>
+    <string name="rendering_attr_hidePOILabels_name">兴趣点（POI）标签</string>
+    <string name="show_number_pad">显示数字盘</string>
     </resources>

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

@@ -3689,4 +3689,22 @@
 	<string name="poi_payment_centre">支付中心</string>
 	<string name="poi_money_transfer">匯款</string>
 
+<string name="poi_climbing_style">攀登方式</string>
+
+<string name="poi_ref_post">郵遞區號</string>
+
+	<string name="poi_climbing_sport_yes">運動：是的</string>
+	<string name="poi_climbing_sport_no">運動：沒有</string>
+	<string name="poi_climbing_boulder_yes">抱石：是的</string>
+	<string name="poi_climbing_boulder_no">抱石：沒有</string>
+	<string name="poi_climbing_toprope_yes">確保繩：是的</string>
+	<string name="poi_climbing_toprope_no">確保繩：沒有</string>
+	<string name="poi_climbing_trad_yes">傳統攀登：是的</string>
+	<string name="poi_climbing_trad_no">傳統攀登：不是</string>
+	<string name="poi_climbing_multipitch_yes">多繩距路線：是的</string>
+	<string name="poi_climbing_multipitch_no">多繩距路線：是的</string>
+	<string name="poi_climbing_ice_yes">結冰：是的</string>
+	<string name="poi_climbing_ice_no">結冰：沒有</string>
+	<string name="poi_climbing_mixed_yes">混合：是的</string>
+	<string name="poi_climbing_mixed_no">混合：否</string>
 	</resources>

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

@@ -2969,13 +2969,8 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="by_type">按照類型</string>
     <string name="one_tap_active_descr">輕點在地圖上的標記，將其移動到活動標記的頂端，而不用打開內容選單。</string>
     <string name="modify_the_search_query">變更搜尋的查詢。</string>
-    <string name="release_3_0">\\022 停止標誌的檢測現在考量了駕駛的方向 
+    <string name="release_3_0">"\\022 
-\n 
+\n "</string>
-\n• 為 GPX 軌跡提供有意義的上坡/下坡值的新運算法則 
-\n 
-\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>
@@ -3003,7 +2998,13 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="touring_view_renderer">旅遊風景 (對比和細節)</string>
     <string name="nautical_renderer">航海</string>
 <string name="rendering_attr_hidePOILabels_name">POI 標籤</string>
-    <string name="release_2_9">\\022 更新快顯功能選單：顯示 POI 開啟/關閉
+    <string name="release_2_9">\\022 停止標誌的檢測現在考量了駕駛的方向 
+\n 
+\n • 為 GPX 軌跡提供有意義的上坡/下坡值的新運算法則 
+\n
+\n • 地形（上坡）察覺登山健行時間（尼史密夫定律）
+\n
+\n • 更新快顯功能選單：顯示 POI 開啟/關閉
 \n
 \n • 交通運輸選單：所有可用的路線現在都在頂部 
 \n 
@@ -3018,4 +3019,6 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
 \n • 為快速標記建立，新增了快速坐標輸入畫面 
 \n</string>
     <string name="will_open_tomorrow_at">將在明天開幕</string>
+    <string name="copy_location_name">複製標點/POI 名稱</string>
+    <string name="toast_empty_name_error">位置沒有名稱</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -28,9 +28,7 @@
     <string name="av_locations_selected_desc">GPX file with coordinates and data of the selected notes.</string>
     <string name="av_locations_all_desc">GPX file with coordinates and data of all notes.</string>
     <string name="release_3_0">
-	\u2022 Detection of stop signs now considers driving direction\n\n
+	\u2022 \n\n
-	\u2022 New algorithm providing meaningful ascent/descent values for GPX tracks\n\n
-	\u2022 Terrain (ascent) aware hiking time (Naismith\'s rule)\n\n
 	</string>
     <string name="modify_the_search_query">Modify the search query.</string>
     <string name="shared_string_actions">Actions</string>
@@ -340,9 +338,13 @@
 	\u2022 OsmAnd Live: bug fixes, fresh data on the server every 30 minutes, updates implemented into the navigation\n\n
 	</string>
     <string name="release_2_9">
+	\u2022 Detection of stop signs now considers driving direction\n\n
+	\u2022 New algorithm providing meaningful ascent/descent values for GPX tracks\n\n
+	\u2022 Terrain (ascent) aware hiking time (Naismith\'s rule)\n\n
 	\u2022 Updated the context menu: show when the POI opens / closes\n\n
 	\u2022 Transport menu: all available routes are now at the top\n\n
 	\u2022 Wikipedia: added the button to open the original article, updated the appearance of articles\n\n
+<<<<<<< HEAD
     \u2022 Route: added possibility to swap start and end points in one tap\n\n
     \u2022 Notes: added sorting by type and date\n\n
     \u2022 OSM edits: show an icon and a name of the POI category, display completed actions\n\n
@@ -350,6 +352,12 @@
     \u2022 Detection of stop signs now considers driving direction\n\n
 	\u2022 New algorithm providing meaningful ascent/descent values for GPX tracks\n\n
 	\u2022 Terrain (ascent) aware hiking time (Naismith\'s rule)\n\n
+=======
+	\u2022 Route: added possibility to swap start and end points in one tap\n\n
+	\u2022 Notes: added sorting by type and date\n\n
+	\u2022 OSM edits: show an icon and a name of the POI category, display completed actions\n\n
+	\u2022 New quick coordinate input screen for quick markers creation\n\n
+>>>>>>> 0db64b7abd3b8633241f75ebec0593544eab678b
 	</string>
     <string name="auto_split_recording_title">Auto-split recordings after gap</string>
     <string name="auto_split_recording_descr">Start new segment after gap of 6 min, new track after gap of 2 h, or new file after a longer gap if the date has changed.</string>
@@ -2859,4 +2867,6 @@
     <string name="winter_and_ski_renderer">Winter and ski</string>
     <string name="touring_view_renderer">Touring view (contrast and details)</string>
     <string name="nautical_renderer">Nautical</string>
+    <string name="copy_location_name">Copy Point/POI name</string>
+    <string name="toast_empty_name_error">Location has no name</string>
 </resources>

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

@@ -0,0 +1,56 @@
+package net.osmand.plus;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.widget.ScrollView;
+
+public class LockableScrollView extends ScrollView {
+
+	// true if we can scroll (not locked)
+	// false if we cannot scroll (locked)
+	private boolean mScrollable = true;
+
+	public LockableScrollView(Context context) {
+		super(context);
+	}
+
+	public LockableScrollView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public void setScrollingEnabled(boolean enabled) {
+		mScrollable = enabled;
+	}
+
+	public boolean isScrollable() {
+		return mScrollable;
+	}
+
+	@Override
+	public boolean onTouchEvent(MotionEvent ev) {
+		switch (ev.getAction()) {
+			case MotionEvent.ACTION_DOWN:
+				// if we can scroll pass the event to the superclass
+				if (mScrollable) {
+					return super.onTouchEvent(ev);
+				}
+				// only continue to handle the touch event if scrolling enabled
+				return mScrollable;
+			default:
+				return super.onTouchEvent(ev);
+		}
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent(MotionEvent ev) {
+		// Don't do anything with intercepted touch events if
+		// we are not scrollable
+		if (!mScrollable) {
+			return false;
+		} else {
+			return super.onInterceptTouchEvent(ev);
+		}
+	}
+
+}

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

@@ -194,8 +194,8 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
 		registerListPreference(settings.ARRIVAL_DISTANCE_FACTOR, screen, arrivalNames, arrivalValues);
 
 		//array size should be equal!
-		Float[] speedLimitsKm = new Float[]{0f, 5f, 7f, 10f, 15f, 20f};
+		Float[] speedLimitsKm = new Float[]{-10f, -7f,-5f, 0f, 5f, 7f, 10f, 15f, 20f};
-		Float[] speedLimitsMiles = new Float[]{0f, 3f, 5f, 7f, 10f, 15f};
+		Float[] speedLimitsMiles = new Float[]{-7f, -5f, -3f, 0f, 3f, 5f, 7f, 10f, 15f};
 		if (settings.METRIC_SYSTEM.get() == OsmandSettings.MetricsConstants.KILOMETERS_AND_METERS) {
 			String[] speedNames = new String[speedLimitsKm.length];
 			for (int i =0; i<speedLimitsKm.length;i++){

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

@@ -216,5 +216,7 @@ public class ShareDialog {
 	public static void sendToClipboard(Activity activity, String text) {
 		ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Activity.CLIPBOARD_SERVICE);
 		clipboard.setText(text);
+		Toast.makeText(activity, R.string.copied_to_clipboard, Toast.LENGTH_LONG)
+				.show();
 	}
 }

OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java

@@ -46,6 +46,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.PlatformUtil;
 import net.osmand.ValueHolder;
 import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
 import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.ContextMenuAdapter;
 import net.osmand.plus.ContextMenuAdapter.OnRowItemClick;
@@ -1487,13 +1488,18 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 			public void run() {
 				if (visibleType == DashboardType.WAYPOINTS || visibleType == DashboardType.WAYPOINTS_FLAT) {
 					List<TargetPoint> allTargets = new ArrayList<>();
+					TargetPoint start = null;
 					if (items != null) {
 						for (Object obj : items) {
 							if (obj instanceof LocationPointWrapper) {
 								LocationPointWrapper p = (LocationPointWrapper) obj;
 								if (p.getPoint() instanceof TargetPoint) {
 									TargetPoint t = (TargetPoint) p.getPoint();
+									if (t.start) {
+										start = t;
+									} else {
 										t.intermediate = true;
+									}
 									allTargets.add(t);
 								}
 							}
@@ -1503,15 +1509,25 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 						}
 					}
 					TargetPointsHelper targetPointsHelper = getMyApplication().getTargetPointsHelper();
-					if (allTargets.size() > 0) {
+					if (start != null) {
-						TargetPoint start = allTargets.remove(0);
+						int startInd = allTargets.indexOf(start);
-						targetPointsHelper.setStartPoint(new LatLon(start.getLatitude(), start.getLongitude()),
+						TargetPoint first = allTargets.remove(0);
-								false, start.getPointDescription(getMyApplication()));
+						if (startInd != 0) {
+							start.start = false;
+							start.intermediate = startInd != allTargets.size() - 1;
+							if (targetPointsHelper.getPointToStart() == null) {
+								start.getOriginalPointDescription().setName(PointDescription
+										.getLocationNamePlain(getMyApplication(), start.getLatitude(), start.getLongitude()));
+							}
+							first.start = true;
+							first.intermediate = false;
+							targetPointsHelper.setStartPoint(new LatLon(first.getLatitude(), first.getLongitude()),
+									false, first.getPointDescription(getMyApplication()));
+						}
 					}
 					targetPointsHelper.reorderAllTargetPoints(allTargets, false);
 					newRouteIsCalculated(false, new ValueHolder<Boolean>());
 					targetPointsHelper.updateRouteAndRefresh(true);
-
 				}
 			}
 		}, 50);

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

@@ -0,0 +1,89 @@
+package net.osmand.plus.mapcontextmenu;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+import android.widget.LinearLayout;
+
+public class InterceptorLinearLayout extends LinearLayout {
+	private int mTouchSlop;
+	private boolean mIsScrolling;
+	private float mDownY;
+	private OnTouchListener listener;
+
+	public InterceptorLinearLayout(Context context) {
+		this(context, null);
+	}
+
+	public InterceptorLinearLayout(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		ViewConfiguration vc = ViewConfiguration.get(context);
+		mTouchSlop = vc.getScaledTouchSlop();
+	}
+
+	public InterceptorLinearLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+		ViewConfiguration vc = ViewConfiguration.get(context);
+		mTouchSlop = vc.getScaledTouchSlop();
+	}
+
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public InterceptorLinearLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+		ViewConfiguration vc = ViewConfiguration.get(context);
+		mTouchSlop = vc.getScaledTouchSlop();
+	}
+
+	public int getTouchSlop() {
+		return mTouchSlop;
+	}
+
+	public boolean isScrolling() {
+		return mIsScrolling;
+	}
+
+	public void setListener(OnTouchListener listener) {
+		this.listener = listener;
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent(MotionEvent ev) {
+		boolean handled = false;
+		final int action = ev.getAction();
+
+		if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
+			mIsScrolling = false;
+			handled = false;
+		} else {
+			switch (action) {
+				case MotionEvent.ACTION_DOWN:
+					mIsScrolling = false;
+					mDownY = ev.getRawY();
+					handled = false;
+				case MotionEvent.ACTION_MOVE:
+					if (mIsScrolling) {
+						handled = true;
+					} else {
+						final int yDiff = calculateDistanceY(ev);
+						if (Math.abs(yDiff) > mTouchSlop) {
+							mIsScrolling = true;
+							handled = true;
+						}
+					}
+					break;
+			}
+		}
+
+		if (listener != null) {
+			listener.onTouch(this, ev);
+		}
+		return handled;
+	}
+
+	private int calculateDistanceY(MotionEvent ev) {
+		return (int) (ev.getRawY() - mDownY);
+	}
+}

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

@@ -37,6 +37,7 @@ import net.osmand.data.LatLon;
 import net.osmand.data.PointDescription;
 import net.osmand.data.QuadPoint;
 import net.osmand.data.RotatedTileBox;
+import net.osmand.plus.LockableScrollView;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
@@ -71,8 +72,10 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	public static final float SKIP_HALF_SCREEN_STATE_KOEF = .21f;
 	public static final int ZOOM_IN_STANDARD = 17;
 
+	public static final int CURRENT_Y_UNDEFINED = Integer.MAX_VALUE;
+
 	private View view;
-	private View mainView;
+	private InterceptorLinearLayout mainView;
 	private View zoomButtonsView;
 	private ImageButton zoomInButtonView;
 	private ImageButton zoomOutButtonView;
@@ -246,6 +249,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		final View.OnTouchListener slideTouchListener = new View.OnTouchListener() {
 			private float dy;
 			private float dyMain;
+			private float mDownY;
 			private VelocityTracker velocity;
 			private boolean slidingUp;
 			private boolean slidingDown;
@@ -257,6 +261,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			@Override
 			public boolean onTouch(View v, MotionEvent event) {
 
+				if (event.getY() <= menuTopViewHeight) {
 					if (singleTapDetector.onTouchEvent(event)) {
 						moving = false;
 						if (hasMoved) {
@@ -272,20 +277,24 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 						}
 						return true;
 					}
+				}
 
 				switch (event.getAction()) {
 					case MotionEvent.ACTION_DOWN:
 						hasMoved = false;
+						mDownY = event.getRawY();
 						dy = event.getY();
 						dyMain = getViewY();
 						velocity = VelocityTracker.obtain();
 						velocityY = 0;
 						maxVelocityY = 0;
 						velocity.addMovement(event);
-						moving = true;
 						break;
 
 					case MotionEvent.ACTION_MOVE:
+						if (Math.abs(event.getRawY() - mDownY) > mainView.getTouchSlop()) {
+							moving = true;
+						}
 						if (moving) {
 							hasMoved = true;
 							float y = event.getY();
@@ -328,20 +337,12 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 			}
 		};
 
-		View topView = view.findViewById(R.id.context_menu_top_view);
-		topView.setOnTouchListener(slideTouchListener);
 		View topShadowAllView = view.findViewById(R.id.context_menu_top_shadow_all);
 		AndroidUtils.setBackground(getMapActivity(), topShadowAllView, nightMode, R.drawable.bg_map_context_menu_light,
 				R.drawable.bg_map_context_menu_dark);
-		topShadowAllView.setOnTouchListener(new View.OnTouchListener() {
+
-			@Override
+		((InterceptorLinearLayout) mainView).setListener(slideTouchListener);
-			public boolean onTouch(View v, MotionEvent event) {
+		mainView.setOnTouchListener(slideTouchListener);
-				if (event.getY() <= dpToPx(SHADOW_HEIGHT_TOP_DP) || event.getAction() != MotionEvent.ACTION_DOWN)
-					return slideTouchListener.onTouch(v, event);
-				else
-					return false;
-			}
-		});
 
 		buildHeader();
 
@@ -507,7 +508,9 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 
 		buildBottomView();
 
-		view.findViewById(R.id.context_menu_bottom_scroll).setBackgroundColor(getResources()
+		LockableScrollView bottomScrollView = (LockableScrollView) view.findViewById(R.id.context_menu_bottom_scroll);
+		bottomScrollView.setScrollingEnabled(false);
+		bottomScrollView.setBackgroundColor(getResources()
 				.getColor(nightMode ? R.color.ctx_menu_bottom_view_bg_dark : R.color.ctx_menu_bottom_view_bg_light));
 		view.findViewById(R.id.context_menu_bottom_view).setBackgroundColor(getResources()
 				.getColor(nightMode ? R.color.ctx_menu_bottom_view_bg_dark : R.color.ctx_menu_bottom_view_bg_light));
@@ -659,7 +662,7 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 
 	private void applyPosY(final int currentY, final boolean needCloseMenu, boolean needMapAdjust,
 						   final int previousMenuState, final int newMenuState, int dZoom) {
-		final int posY = getPosY(needCloseMenu);
+		final int posY = getPosY(currentY, needCloseMenu);
 		if (currentY != posY || dZoom != 0) {
 			if (posY < currentY) {
 				updateMainViewLayout(posY);
@@ -897,12 +900,6 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 		if (view != null) {
 			View bottomView = view.findViewById(R.id.context_menu_bottom_view);
 			if (menu.isExtended()) {
-				bottomView.setOnTouchListener(new View.OnTouchListener() {
-					@Override
-					public boolean onTouch(View v, MotionEvent event) {
-						return true;
-					}
-				});
 				menu.build(bottomView);
 			}
 		}
@@ -1244,10 +1241,10 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 	}
 
 	private int getPosY() {
-		return getPosY(false);
+		return getPosY(CURRENT_Y_UNDEFINED, false);
 	}
 
-	private int getPosY(boolean needCloseMenu) {
+	private int getPosY(final int currentY, boolean needCloseMenu) {
 		if (needCloseMenu) {
 			return screenHeight;
 		}
@@ -1272,8 +1269,23 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo
 				posY = Math.max(posY, minHalfY);
 				break;
 			case MenuState.FULL_SCREEN:
+				if (currentY != CURRENT_Y_UNDEFINED) {
+					int maxPosY = viewHeight - menuFullHeightMax;
+					int minPosY = Math.max(maxPosY, minHalfY);
+					if (maxPosY > minPosY) {
+						maxPosY = minPosY;
+					}
+					if (currentY > minPosY) {
+						posY = minPosY;
+					} else if (currentY < maxPosY) {
+						posY = maxPosY;
+					} else {
+						posY = currentY;
+					}
+				} else {
 					posY = -dpToPx(SHADOW_HEIGHT_TOP_DP);
 					posY = addStatusBarHeightIfNeeded(posY);
+				}
 				break;
 			default:
 				break;

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

@@ -25,6 +25,7 @@ import net.osmand.plus.download.DownloadIndexesThread;
 import net.osmand.plus.download.DownloadValidationManager;
 import net.osmand.plus.download.IndexItem;
 import net.osmand.plus.helpers.FileNameTranslationHelper;
+import net.osmand.plus.liveupdates.LiveUpdatesHelper;
 import net.osmand.plus.mapcontextmenu.MenuBuilder;
 import net.osmand.plus.mapcontextmenu.MenuController;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
@@ -107,9 +108,10 @@ public class MapDataMenuController extends MenuController {
 							Toast.makeText(mapActivity, mapActivity.getString(R.string.activate_srtm_plugin),
 									Toast.LENGTH_SHORT).show();
 						}
-					} else {
+					} else if (!downloaded || indexItem.isOutdated()) {
-						new DownloadValidationManager(getMapActivity().getMyApplication())
+						new DownloadValidationManager(app).startDownload(mapActivity, indexItem);
-								.startDownload(getMapActivity(), indexItem);
+					} else if (isLiveUpdatesOn()) {
+						LiveUpdatesHelper.runLiveUpdate(mapActivity, indexItem.getTargetFileName(), true);
 					}
 				}
 			}
@@ -179,6 +181,10 @@ public class MapDataMenuController extends MenuController {
 		updateData();
 	}
 
+	private boolean isLiveUpdatesOn() {
+		return getMapActivity().getMyApplication().getSettings().IS_LIVE_UPDATES_ON.get();
+	}
+
 	@Override
 	public boolean displayDistanceDirection() {
 		return true;
@@ -380,6 +386,8 @@ public class MapDataMenuController extends MenuController {
 				leftDownloadButtonController.caption = getMapActivity().getString(R.string.shared_string_update);
 			} else if (!downloaded) {
 				leftDownloadButtonController.caption = getMapActivity().getString(R.string.shared_string_download);
+			} else if (isLiveUpdatesOn()) {
+				leftDownloadButtonController.caption = getMapActivity().getString(R.string.live_update);
 			} else {
 				leftDownloadButtonController.visible = false;
 			}

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

@@ -5,6 +5,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.text.TextUtilsCompat;
 import android.support.v4.view.ViewCompat;
+import android.widget.Toast;
 
 import net.osmand.data.LatLon;
 import net.osmand.plus.R;
@@ -30,6 +31,7 @@ public class ShareMenu extends BaseMenuController {
 	public enum ShareItem {
 		MESSAGE(R.drawable.ic_action_message, R.string.shared_string_send),
 		CLIPBOARD(R.drawable.ic_action_copy, R.string.shared_string_copy),
+		NAME(R.drawable.ic_action_copy, R.string.copy_location_name),
 		GEO(R.drawable.ic_world_globe_dark, R.string.share_geo),
 		QR_CODE(R.drawable.ic_action_qrcode, R.string.shared_string_qr_code);
 
@@ -58,6 +60,7 @@ public class ShareMenu extends BaseMenuController {
 		List<ShareItem> list = new LinkedList<>();
 		list.add(ShareItem.MESSAGE);
 		list.add(ShareItem.CLIPBOARD);
+		list.add(ShareItem.NAME);
 		list.add(ShareItem.GEO);
 		list.add(ShareItem.QR_CODE);
 		return list;
@@ -107,6 +110,15 @@ public class ShareMenu extends BaseMenuController {
 			case CLIPBOARD:
 				ShareDialog.sendToClipboard(getMapActivity(), sms);
 				break;
+			case NAME:
+				if (!Algorithms.isEmpty(title)) {
+					ShareDialog.sendToClipboard(getMapActivity(), title);
+				} else {
+					Toast.makeText(getMapActivity(),
+							R.string.toast_empty_name_error,
+							Toast.LENGTH_LONG).show();
+				}
+				break;
 			case GEO:
 				Intent mapIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(geoUrl));
 				getMapActivity().startActivity(mapIntent);

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

@@ -126,7 +126,7 @@ public class ShareMenuFragment extends BaseOsmAndFragment implements OnItemClick
 	public void dismissMenu() {
 		menu.getMapActivity().getSupportFragmentManager().popBackStackImmediate(TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
 		if (menu.getMapActivity().getContextMenu().isVisible()) {
-			menu.getMapActivity().getContextMenu().hide(false);
+			menu.getMapActivity().getContextMenu().close();
 		}
 	}
 }

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

@@ -705,9 +705,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 			}
 
 			@Override
-			public void onItemClick(View view) {
+			public void onItemClick(int position) {
 				if (mapActivity != null && measurementLayer != null) {
-					int position = pointsRv.indexOfChild(view);
 					if (pointsListOpened) {
 						hidePointsList();
 					}

OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java

@@ -52,12 +52,6 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		final int backgroundColor = ContextCompat.getColor(mapActivity,
 				nightMode ? R.color.ctx_menu_info_view_bg_dark : R.color.ctx_menu_info_view_bg_light);
 		view.setBackgroundColor(backgroundColor);
-		view.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				listener.onItemClick(view);
-			}
-		});
 		return new MeasureToolItemVH(view);
 	}
 
@@ -129,6 +123,12 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 				listener.onRemoveClick(holder.getAdapterPosition());
 			}
 		});
+		holder.itemView.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				listener.onItemClick(holder.getAdapterPosition());
+			}
+		});
 	}
 
 	@Override
@@ -174,7 +174,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 
 		void onRemoveClick(int position);
 
-		void onItemClick(View view);
+		void onItemClick(int position);
 
 		void onDragStarted(RecyclerView.ViewHolder holder);
 

OsmAnd/src/net/osmand/plus/openseamapsplugin/NauticalMapsPlugin.java

@@ -6,6 +6,7 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.support.v7.app.AlertDialog;
 import net.osmand.IndexConstants;
+import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
@@ -13,6 +14,9 @@ import net.osmand.plus.download.DownloadActivity;
 import net.osmand.plus.download.DownloadResources;
 import net.osmand.plus.render.RendererRegistry;
 
+import java.util.LinkedHashSet;
+import java.util.Set;
+
 public class NauticalMapsPlugin extends OsmandPlugin {
 
 	public static final String ID = "nauticalPlugin.plugin";
@@ -53,6 +57,7 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 	@Override
 	public boolean init(final OsmandApplication app, final Activity activity) {
 		if(activity != null) {
+			addBoatProfile(true);
 			// called from UI 
 			previousRenderer = app.getSettings().RENDERER.get(); 
 			app.getSettings().RENDERER.set(RendererRegistry.NAUTICAL_RENDER);
@@ -83,12 +88,24 @@ public class NauticalMapsPlugin extends OsmandPlugin {
 		return true;
 	}
 
+	public void addBoatProfile(boolean flag) {
+		Set<ApplicationMode> selectedProfiles = new LinkedHashSet<>(ApplicationMode.values(app.getSettings()));
+		boolean isBoatEnabled = selectedProfiles.contains(ApplicationMode.BOAT);
+		if((!isBoatEnabled && flag) || (isBoatEnabled && !flag)) {
+			String s = app.getSettings().AVAILABLE_APP_MODES.get();
+			String currModes = flag ? s + ApplicationMode.BOAT.getStringKey() + ","
+					: s.replace(ApplicationMode.BOAT.getStringKey() + ",", "");
+			app.getSettings().AVAILABLE_APP_MODES.set(currModes);
+		}
+	}
+	
 	@Override
 	public void disable(OsmandApplication app) {
 		super.disable(app);
 		if(app.getSettings().RENDERER.get().equals(RendererRegistry.NAUTICAL_RENDER)) {
 			app.getSettings().RENDERER.set(previousRenderer);
 		}
+		addBoatProfile(false);
 	}
 
 	@Override

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

@@ -227,8 +227,11 @@ public class PointNavigationLayer extends OsmandMapLayer implements
 
 	@Override
 	public boolean isObjectMovable(Object o) {
-		TargetPointsHelper targetPoints = map.getMyApplication().getTargetPointsHelper();
+		if (o != null && o instanceof TargetPoint) {
-		return o == targetPoints.getPointToNavigate();
+			TargetPointsHelper targetPointsHelper = map.getMyApplication().getTargetPointsHelper();
+			return targetPointsHelper.getAllPoints().contains(o);
+		}
+		return false;
 	}
 
 	@Override
@@ -238,8 +241,24 @@ public class PointNavigationLayer extends OsmandMapLayer implements
 		TargetPoint newTargetPoint = null;
 		if (o instanceof TargetPoint) {
 			TargetPointsHelper targetPointsHelper = map.getMyApplication().getTargetPointsHelper();
-			targetPointsHelper.navigateToPoint(position, true, -1, new PointDescription(PointDescription.POINT_TYPE_LOCATION, ""));
+			TargetPoint oldPoint = (TargetPoint) o;
+			if (oldPoint.start) {
+				targetPointsHelper.setStartPoint(position, true, null);
+				newTargetPoint = targetPointsHelper.getPointToStart();
+			} else if (oldPoint == targetPointsHelper.getPointToNavigate()) {
+				targetPointsHelper.navigateToPoint(position, true, -1, null);
 				newTargetPoint = targetPointsHelper.getPointToNavigate();
+			} else if (oldPoint.intermediate) {
+				List<TargetPoint> points = targetPointsHelper.getIntermediatePointsWithTarget();
+				int i = points.indexOf(oldPoint);
+				if (i != -1) {
+					newTargetPoint = new TargetPoint(position,
+							new PointDescription(PointDescription.POINT_TYPE_LOCATION, ""));
+					points.set(i, newTargetPoint);
+					targetPointsHelper.reorderAllTargetPoints(points, true);
+				}
+
+			}
 			result = true;
 		}
 		if (callback != null) {