Merge branch 'master' into home_icon_on_map

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

@@ -256,4 +256,5 @@
     <string name="unit_of_length">Unità di misura di lunghezza</string>
     <string name="time_zone">Fuso orario</string>
     <string name="unit_of_speed_system">Unità di misura della velocità</string>
+    <string name="back_to_osmand">Torna a OsmAnd</string>
 </resources>

OsmAnd/res/drawable/ic_dashboard_dark.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,3C3.8954,3 3,3.8954 3,5V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V5C21,3.8954 20.1046,3 19,3H5ZM19,5H5V19H19V5ZM7,7H11V11H7V7ZM17,7H13V11H17V7ZM7,13H11V17H7V13ZM17,13H13V17H17V13Z"
+      android:fillColor="#727272"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/values-be/strings.xml

@@ -227,7 +227,7 @@
     <string name="poi_filter_for_tourists">Для турыстаў</string>
     <string name="poi_filter_fuel">Паліва</string>
     <string name="show_warnings_title">Паказваць папярэджанні…</string>
-    <string name="show_warnings_descr">"Наладка апавяшчэнняў падчас руху (абмежаванні хуткасці, вымушаныя прыпынкі, штучныя няроўнасці, тунэлі),  апавяшчэнняў пра камеры хуткасці, інфармацыі пра палосы."</string>
+    <string name="show_warnings_descr">Наладка апавяшчэнняў падчас руху (абмежаванні хуткасці, вымушаныя прыпынкі, штучныя няроўнасці, тунэлі), апавяшчэнняў пра камеры хуткасці, інфармацыі пра палосы.</string>
     <string name="use_compass_navigation_descr">Выкарыстоўваць компас калі інакш немагчыма вызначыць напрамак.</string>
     <string name="use_compass_navigation">Выкарыстоўваць компас</string>
     <string name="avoid_motorway">Без аўтамагістраляў</string>
@@ -357,27 +357,27 @@
     <string name="map_widget_next_next_turn">Паварот праз адзін</string>
     <string name="map_widget_mini_route">Малая мапа маршруту</string>
     <string name="bg_service_screen_lock">Заблакаваць</string>
-    <string name="bg_service_screen_unlock">Разблакаваць экран</string>
+    <string name="bg_service_screen_unlock">Разблакаваць</string>
     <string name="bg_service_screen_lock_toast">Экран заблакаваны</string>
     <string name="bg_service_interval">Задайце інтэрвал абуджэння:</string>
     <string name="show_cameras">Камеры хуткасці</string>
     <string name="show_traffic_warnings">Абмежаванні руху</string>
-    <string name="avoid_toll_roads">Пазбягаць платных дарог</string>
+    <string name="avoid_toll_roads">Без платных дарог</string>
     <string name="continue_follow_previous_route_auto">Працягнуць прытрымлівацца папярэдняй незавершанай навігацыі\? (%1$s секунд)</string>
     <string name="route_updated_loc_found">Чаканне пазіцыі для разліку маршруту</string>
     <string name="osmand_parking_hours">Гадзін</string>
     <string name="osmand_parking_minutes">Хвiлiн</string>
     <string name="osmand_parking_position_description_add_time">Аўтамабіль прыпаркаваны ў</string>
-    <string name="select_animate_speedup">Абярыце хуткасць сімуляцыі</string>
+    <string name="select_animate_speedup">Хуткасць сімуляцыі маршруту:</string>
     <string name="global_app_allocated_memory_descr">Адведзена памяці %1$s МБ (Абмежаванне Android %2$s МБ, Dalvik %3$s МБ).</string>
     <string name="global_app_allocated_memory">Адведзеная памяць</string>
     <string name="native_app_allocated_memory_descr">Агулам фізічнай памяці занятай дадаткам %1$s МБ (Dalvik %2$s МБ, іншае %3$s МБ). Прапарцыйнай памяці %4$s МБ (Абмежаванне Android %5$s МБ, Dalvik %6$s МБ).</string>
     <string name="native_app_allocated_memory">Фізічнай памяці агулам</string>
-    <string name="starting_point_too_far">Пачатковы пункт занадта далёка ад бліжэйшай дарогі.</string>
+    <string name="starting_point_too_far">Пункт адпраўлення знаходзіцца занадта далёка ад бліжэйшай дарогі.</string>
     <string name="shared_location">Агульныя месцы</string>
     <string name="osmand_parking_event">Забраць машыну са стаянкі</string>
     <string name="osmand_parking_warning">Папярэджанне</string>
-    <string name="osmand_parking_warning_text">Напамін аб абмежаванні часу паркоўкі аўтамабіля ўжо дададзены ў каляндар. Вам будзе неабходна яго выдаліць ўласнаручна.</string>
+    <string name="osmand_parking_warning_text">Напамін пра абмежаванне часу паркоўкі аўтамабіля дададзены ў каляндар, дзе яго можна змяніць альбо выдаліць.</string>
     <string name="osmand_parking_time_limit_title">Задайце абмежаванне часу стаянкі</string>
     <string name="osmand_parking_delete_confirm">Выдаліць адзнаку прыпаркаванага аўтамабіля\?</string>
     <string name="osmand_parking_delete">Выдаліць адзнаку стаянкі</string>
@@ -422,12 +422,12 @@
     <string name="offline_navigation_not_available">Аўтаномная навігацыя OsmAnd часова недаступная.</string>
     <string name="left_side_navigation">Левабаковы рух</string>
     <string name="left_side_navigation_descr">Для краін, дзе людзі ездзяць па леваму боку дарогі.</string>
-    <string name="unknown_from_location">Пачатковы пункт не вызначаны</string>
-    <string name="unknown_location">Становішча пакуль не вызначана</string>
-    <string name="modify_transparency">Змяніць празрыстасць (0 - празрысты, 255 - непразрысты)</string>
-    <string name="confirm_interrupt_download">Скасаваць cпампоўванне файла\?</string>
+    <string name="unknown_from_location">Пункт адпраўлення яшчэ не вызначаны.</string>
+    <string name="unknown_location">Становішча пакуль што не вызначана.</string>
+    <string name="modify_transparency">Вызначыць празрыстасць (0 - празрысты, 255 - непразрысты)</string>
+    <string name="confirm_interrupt_download">Скасаваць cпампоўванне\?</string>
     <string name="first_time_msg">Дзякуй за выкарыстанне OsmAnd. Спампаваць рэгіянальныя даныя для аўтаномнага выкарыстання можна праз «Налады» → «Кіраваць файламі мапаў». Пасля гэтага вы зможаце глядзець мапу, шукаць адрасы, бачыць POI, грамадскі транспарт і іншае.</string>
-    <string name="basemap_was_selected_to_download">Базавая мапа абраная для спампоўвання, бо неабходная для карэктнай працы.</string>
+    <string name="basemap_was_selected_to_download">Базавая мапа, неабходная для забеспячэння базавай функцыянальнасці, знаходзіцца ў чарзе на спампоўванне.</string>
     <string name="select_index_file_to_download">Нічога не знойдзена. Калі вы не знайшлі свой рэгіён, вы можаце стварыць мапу самастойна (гл. https://osmand.net).</string>
     <string name="local_indexes_cat_tile">Сеціўныя і кэшаваныя растравыя мапы</string>
     <string name="local_indexes_cat_map">Стандартныя мапы (вектарныя)</string>
@@ -436,7 +436,7 @@
     <string name="map_online_data">Сеціўныя і растравыя мапы</string>
     <string name="map_online_data_descr">Выкарвстоўваць сеціўныя мапы (cпампаваць і захоўваць фрагменты на картцы памяці).</string>
     <string name="shared_string_online_maps">Сеціўныя мапы</string>
-    <string name="online_map_settings_descr">Наладзіць крыніцы сеціўных або кэшаваных растравых мапаў.</string>
+    <string name="online_map_settings_descr">Абярыце крыніцы сеціўных або кэшаваных растравых мапаў.</string>
     <string name="osmand_rastermaps_plugin_description">Пры дапамозе гэтай убудовы вы можаце атрымаць доступ да мноства тыпаў сеціўных мапаў (тайлавых альбо растравых), ад папярэдне вызначаных фрагментаў OpenStreetMap (Mapnik) да спадарожнікавых здымкаў і пластоў адмысловага прызначэння, такіх як мапы надвор\'я, кліматычныя мапы, геалагічныя мапы, пласты зацямнення вышынь і г.д. 
 \n 
 \nЛюбую з гэтых мапаў можна выкарыстаць у якасці асноўнай (базавай) мапы для адлюстравання на экране OsmAnd або ў выглядзе накладкі / падкладкі да іншай базавай мапы (стандартнай аўтаномнай мапы OsmAnd). Для таго, каб зрабіць любую падкладку больш бачнай, некаторыя элементы вектарнай мапы OsmAnd можна лёгка схаваць праз меню \"Наладзіць мапу\". 
@@ -449,11 +449,11 @@
     <string name="prefs_plugins">Убудовы</string>
     <string name="osm_editing_plugin_description">Пры дапамозе гэтай убудовы OsmAnd можа быць выкарыстаны для паляпшэння OSM праз стварэнне альбо змену аб\'ектаў OSM POI, адкрыццё або каментаванне OSM-нататак, адпраўленне запісаных GPX-файлаў. OSM развіваецца грамадствам. Гэта глабальны праект па стварэнні свабоднай мапы. Для атрымання дадатковай інфармацыі, калі ласка, наведайце https://openstreetmap.org. Актыўны ўдзел цэніцца, і ўнёскі могуць быць зробленыя непасрэдна праз OsmAnd, калі вы пазначыце даныя свайго акаўнта OSM у наладах.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Вектарныя мапы могуць адлюстроўвацца хутчэй. Падтрымліваецца не ўсімі прыладамі.</string>
-    <string name="play_commands_of_currently_selected_voice">Абраць голас і прайграць падказкі</string>
+    <string name="play_commands_of_currently_selected_voice">Абярыце голас і пратэстуйце яго прайграўшы апавяшчэнні:</string>
     <string name="debugging_and_development">Для распрацоўшчыкаў OsmAnd</string>
     <string name="native_rendering">Хуткая адмалёўка</string>
-    <string name="test_voice_prompts">Пратэставаць галасавыя падказкі</string>
-    <string name="switch_to_raster_map_to_see">Для гэтай мясцовасці мапа адсутнічае. Спампуйце мапу з дапамогай «Налады» («Кіраваць файламі мапаў») або пераключыцца на выкарыстанне сеціўных мапаў.</string>
+    <string name="test_voice_prompts">Тэставанне галасавых падказак</string>
+    <string name="switch_to_raster_map_to_see">Спампуйце аўтаномную вектарную мапу для гэтай мясцовасці ў меню \"Налады\" (\"Кіраваць файламі мапаў\") або пераключыцеся на ўбудову \"Сеціўныя мапы\".</string>
     <string name="send_files_to_osm">Адправіць GPX-файлы ў OSM\?</string>
     <string name="gpx_visibility_txt">Бачнасць</string>
     <string name="gpx_tags_txt">Пазнакі</string>
@@ -504,7 +504,7 @@
     <string name="direction_style_sidewise">Па накірункам свету (8 сектараў)</string>
     <string name="direction_style_clockwise">Па стрэлцы гадзінніка (12 сектараў)</string>
     <string name="settings_direction_style">Стыль напрамку</string>
-    <string name="settings_direction_style_descr">Абярыце стыль адлюстроўвання адносных напрамкаў падчас руху.</string>
+    <string name="settings_direction_style_descr">Абярыце стыль адлюстроўвання адносных напрамкаў падчас руху</string>
     <string name="auto_announce_on">Уключыць аўтаматычнае агалошванне</string>
     <string name="auto_announce_off">Выключыць аўтаматычнае агалошванне</string>
     <string name="i_am_here">Я тут</string>
@@ -588,11 +588,11 @@
     <string name="city_type_city">Горад</string>
     <string name="animate_route_off">Спыніць мадэляванне</string>
     <string name="animate_route">Пачаць мадэляванне</string>
-    <string name="file_can_not_be_renamed">Немагчыма змяніць назву файла.</string>
+    <string name="file_can_not_be_renamed">Не атрымалася змяніць назву файла.</string>
     <string name="file_with_name_already_exists">Файл з такой назвай ужо існуе.</string>
     <string name="shared_string_gpx_route">GPX-маршрут</string>
-    <string name="poi_query_by_name_matches_categories">Знойдзена екалькі катэгорый POI, што адпавядаюць запыту:</string>
-    <string name="data_to_search_poi_not_available">Лакальныя даныя для пошуку POI адсутнічаюць.</string>
+    <string name="poi_query_by_name_matches_categories">Знойдзена некалькі звязаных катэгорый POI.</string>
+    <string name="data_to_search_poi_not_available">Спампаваць аўтаномныя даныя для пошуку POI.</string>
     <string name="poi_filter_by_name">Пошук па назве</string>
     <string name="old_poi_file_should_be_deleted">Файл POI \'%1$s\' залішні і можа быць выдалены.</string>
     <string name="update_poi_file_not_found">Лакальны файл для падтрымкі змен у POI не знойдзены і не можа быць створаны.</string>
@@ -616,7 +616,7 @@
     <string name="show_more_map_detail">Паказаць больш дэталяў мапы</string>
     <string name="show_more_map_detail_descr">Паказаць некаторыя дэталі вектарнай мапы (дарогі і іншыя) на меншым маштабе.</string>
     <string name="favourites_delete_multiple_succesful">Улюбёныя мясціны выдаленыя.</string>
-    <string name="favorite_delete_multiple">Вы збіраецеся выдаліць %1$d улюбёных і %2$d груп улюбёных. Вы ўпэўненыя\?</string>
+    <string name="favorite_delete_multiple">Сапраўды хочаце выдаліць %1$d улюбёных і %2$d груп улюбёных\?</string>
     <string name="favorite_home_category">Дом</string>
     <string name="favorite_friends_category">Сябры</string>
     <string name="favorite_places_category">Месцы</string>
@@ -648,14 +648,14 @@
     <string name="local_indexes_cat_poi">Даныя POI</string>
     <string name="ttsvoice">Голас TTS</string>
     <string name="search_offline_clear_search">Новы пошук</string>
-    <string name="map_text_size_descr">Абярыце памер шрыфту для назваў на мапе.</string>
+    <string name="map_text_size_descr">Памер тэксту для назваў на мапе:</string>
     <string name="map_text_size">Памер шрыфту мапы</string>
     <string name="trace_rendering">Адладачная інфармацыя пра адмалёўку</string>
     <string name="trace_rendering_descr">Паказаць прадукцыйнасць адмалёўкі.</string>
     <string name="installing_new_resources">Распакоўваюцца новыя даныя…</string>
-    <string name="internet_connection_required_for_online_route">Вы абралі сеціўны навігацыйны сэрвіс, але злучэнне з Інтэрнэтам адсутнічае.</string>
+    <string name="internet_connection_required_for_online_route">Сеціўная навігацыя не можа працаваць без злучэння з інтэрнэтам.</string>
     <string name="tts_language_not_supported_title">Мова не падтрымліваецца</string>
-    <string name="tts_language_not_supported">Абраная мова не падтрымліваецца ўсталяваным Android TTS (пераўтварэнне тэксту ў гук). Пашукаць іншы TTS у краме\? Калі не, то будзе выкарыстоўвацца іншая ўсталяваная мова TTS.</string>
+    <string name="tts_language_not_supported">Абраная мова не падтрымліваецца Android TTS (пераўтварэнне тэксту ў гук), таму будзе выкарыстоўвацца прадвызначаная мова TTS. Пашукаць іншы TTS у краме\?</string>
     <string name="tts_missing_language_data_title">Даныя адсутнічаюць</string>
     <string name="tts_missing_language_data">Перайсці ў краму, каб спампаваць абраную мову\?</string>
     <string name="gpx_option_reverse_route">Развярнуць накірунак GPX</string>
@@ -665,23 +665,23 @@
 \n\t
 \n\tДля іх выкарыстання абярыце пункт меню \'Наладзіць мапы\' → \'Крыніца мапы…\' → \'Лакальныя вектарныя мапы\'.</string>
     <string name="choose_audio_stream">Вывад галасавых падказак</string>
-    <string name="choose_audio_stream_descr">Абярыце канал для галасавых падказак.</string>
+    <string name="choose_audio_stream_descr">Абярыце канал вываду галасавых падказак.</string>
     <string name="voice_stream_voice_call">Канал телефанавання (спыняе музыку з дынамікаў)</string>
     <string name="voice_stream_notification">Канал апавяшчэння</string>
-    <string name="voice_stream_music">Аўдыё медыя / навігацыі</string>
+    <string name="voice_stream_music">Канал медыя/навігацыі</string>
     <string name="warning_tile_layer_not_downloadable">Дадатак не можа спампаваць пласт мапы %1$s. Можа дапамагчы пераўсталёўка.</string>
-    <string name="overlay_transparency_descr">Змяніць празрыстаць накладзенага пласта.</string>
+    <string name="overlay_transparency_descr">Падладзіць празрыстаць накладзенага пласта.</string>
     <string name="overlay_transparency">Празрыстасць накладкі</string>
-    <string name="map_transparency_descr">Змяніць празрыстасць асноўнай мапы.</string>
+    <string name="map_transparency_descr">Падладзіць празрыстасць асноўнай мапы.</string>
     <string name="map_transparency">Празрыстасць асноўнай мапы</string>
     <string name="layer_underlay">Мапа падкладкі…</string>
     <string name="map_underlay">Мапа падкладкі</string>
-    <string name="map_underlay_descr">Абраць мапу для падкладкі.</string>
+    <string name="map_underlay_descr">Абярыце мапу падкладкі</string>
     <string name="layer_overlay">Накладзеная мапа…</string>
     <string name="map_overlay">Мапа для накладання</string>
-    <string name="map_overlay_descr">Абраць мапу для накладання.</string>
+    <string name="map_overlay_descr">Абярыце мапу для накладання</string>
     <string name="tile_source_already_installed">Мапа ўжо ўсталяваная, «Налады» будуць абноўленыя.</string>
-    <string name="select_tile_source_to_install">Абярыце (растравыя) мапы для ўсталёўкі або абнаўлення.</string>
+    <string name="select_tile_source_to_install">Абярыце мапы (растравыя) для ўсталёўкі або абнаўлення.</string>
     <string name="internet_not_available">Немагчыма выканаць аперацыю без падлучэнне да Інтэрнэту.</string>
     <string name="install_more">Усталяваць яшчэ…</string>
     <string name="level_to_switch_vector_raster_descr">Выкарыстоўваць агульныя растравыя мапы да гэтага ўзроўню.</string>
@@ -689,7 +689,7 @@
     <string name="error_doing_search">Не атрымалася выканаць пошук у аўтаномным рэжыме.</string>
     <string name="search_osm_offline">Пошук па геаграфічнаму становішчу</string>
     <string name="system_locale">Сістэмная</string>
-    <string name="preferred_locale_descr">Абраць мову адлюстравання (набудзе моц пасля перазапуску OsmAnd).</string>
+    <string name="preferred_locale_descr">Мова інтэрфейсу (набудзе моц пасля перазапуску OsmAnd).</string>
     <string name="preferred_locale">Мова інтэрфейсу</string>
     <string name="incomplete_locale">няпоўны</string>
     <string name="unit_of_length_descr">Змяніць адзінкі вымярэння адлегласці.</string>
@@ -707,7 +707,7 @@
     <string name="send_location_email_pattern">Каб убачыць месцазнаходжанне націсніце на спасылку %1$s ці android-спасылку %2$s</string>
     <string name="send_location">Даслаць каардынаты</string>
     <string name="context_menu_item_share_location">Даслаць каардынаты</string>
-    <string name="add_waypoint_dialog_added">GPX-пункт «{0}» дададзены</string>
+    <string name="add_waypoint_dialog_added">GPX-пункт \"{0}\" дададзены</string>
     <string name="add_waypoint_dialog_title">Дадаць пункт да запісанага GPX-следу</string>
     <string name="context_menu_item_add_waypoint">Дадаць пункт GPX</string>
     <string name="amenity_type_administrative">Адміністрацыйны</string>
@@ -748,7 +748,7 @@
     <string name="osmand_routing_experimental">Аўтаномная навігацыя OsmAnd з’яўляецца эксперыментальнай і не працуе на доўгіх адлегласцях каля 20 км. 
 \n 
 \nНавігацыя часова пераключаецца на сэрвіс CloudMade.</string>
-    <string name="specified_dir_doesnt_exist">Вызначаны каталог не знойдзены.</string>
+    <string name="specified_dir_doesnt_exist">Не атрымалася знайсці вызначаны каталог.</string>
     <string name="application_dir">Каталог захоўвання даных</string>
     <string name="osmand_net_previously_installed">Усе аўтаномныя даныя ў старым усталяваным дадатку будуць падтрымлівацца новым, але ўлюбёныя мясціны патрэбна экспартаваць са старой версіі і імпартаваць у новую.</string>
     <string name="build_installed">Зборка {0} ўсталяваная ({1}).</string>
@@ -758,13 +758,13 @@
     <string name="loading_builds">Загружаюцца зборкі OsmAnd…</string>
     <string name="select_build_to_install">Абярыце зборку OsmAnd для ўсталёўкі</string>
     <string name="gps_status_app_not_found">Дадатак стану GPS не ўсталяваны. Пашукаць ў краме\?</string>
-    <string name="voice_is_not_available_msg">Галасавыя загады недаступныя. Калі ласка, перайдзіце ў «Налады» → «Налады навігацыі» → «Галасавыя даныя» і абярыце ці спампуйце пакунак галасавых падказак.</string>
-    <string name="voice_is_not_available_title">Галасавыя падказкі не абраныя</string>
+    <string name="voice_is_not_available_msg">Галасавыя загады недаступныя. Калі ласка, перайдзіце ў \"Налады\" → \"Налады навігацыі\", абярыце профіль \"Галасавыя даныя\" і абярыце ці спампуйце пакунак галасавых падказак.</string>
+    <string name="voice_is_not_available_title">Абярыце пакунак галасавых падказак</string>
     <string name="daynight_mode_day">Дзень</string>
     <string name="daynight_mode_night">Ноч</string>
     <string name="daynight_mode_auto">Усход/Захад</string>
     <string name="daynight_mode_sensor">Датчык святла</string>
-    <string name="daynight_descr">Абярыце абгрунтаванне пераключэння рэжыму дзень/ноч.</string>
+    <string name="daynight_descr">Наладзьце пераключэнне паміж дзённым і начным рэжымамі.</string>
     <string name="daynight">Рэжым дзень/ноч</string>
     <string name="download_files_question">Спампаваць {0} файл(ы) ({1} МБ)\?</string>
     <string name="items_were_selected">{0} абрана</string>
@@ -773,16 +773,16 @@
     <string name="fast_route_mode_descr">Уключыць, каб разлічваць найхутчэйшы шлях, ці выключыць для паліўна-ашчаднага шляху.</string>
     <string name="tiles_to_download_estimated_size">На маштабе {0} спампаваць {1} фрагментаў ({2} МБ)</string>
     <string name="shared_string_download_map">Спампаваць мапу</string>
-    <string name="select_max_zoom_preload_area">Абярыце максімальнае павелічэньне для папярэдняй загрузкі</string>
+    <string name="select_max_zoom_preload_area">Максімальны маштаб для папярэдняй загрузкі</string>
     <string name="maps_could_not_be_downloaded">Гэтую мапу немагчыма спампаваць</string>
     <string name="continuous_rendering">Безперапынная адмалёўка</string>
     <string name="continuous_rendering_descr">Паказваць безперапынную адмалёўку замест выявы цалкам.</string>
-    <string name="rendering_exception">Не атрымалася адмаляваць абраную вобласць</string>
+    <string name="rendering_exception">Не атрымалася адмаляваць абраную вобласць.</string>
     <string name="renderer_load_sucess">Адмалёўшчык загружаны</string>
-    <string name="renderer_load_exception">Не атрымалася загрузіць адмалёўшчык</string>
+    <string name="renderer_load_exception">Не атрымалася загрузіць адмалёўшчык.</string>
     <string name="renderers">Адмалёўка вектарнай мапы</string>
     <string name="show_point_options">Гэтае месца…</string>
-    <string name="renderers_descr">Абярыце стыль адмалёўкі мапы.</string>
+    <string name="renderers_descr">Абярыце стыль адмалёўкі мапы</string>
     <string name="poi_context_menu_website">Паказаць сайт POI</string>
     <string name="poi_context_menu_call">Паказаць тэлефон POI</string>
     <string name="download_type_to_filter">фільтраваць</string>
@@ -796,7 +796,7 @@
     <string name="no_vector_map_loaded">Вектарныя мапы не былі загружаныя</string>
     <string name="gpx_files_not_found">GPX-файлаў не знойдзена ў каталогзе слядоў</string>
     <string name="layer_gpx_layer">GPX-файлы…</string>
-    <string name="error_reading_gpx">Не атрымалася прачытаць GPX-даныя</string>
+    <string name="error_reading_gpx">Не атрымалася прачытаць GPX-даныя.</string>
     <string name="vector_data">Пазасеціўныя вектарныя мапы</string>
     <string name="transport_context_menu">Шукаць транспарт на прыпынку</string>
     <string name="poi_context_menu_modify">Змяніць POI</string>
@@ -804,14 +804,14 @@
     <string name="rotate_map_compass_opt">У напрамку компаса</string>
     <string name="rotate_map_bearing_opt">У напрамку руху</string>
     <string name="rotate_map_none_opt">Не варочаць (поўнач заўсёды ўверсе)</string>
-    <string name="rotate_map_to_bearing_descr">Абраць выроўніванне мапы.</string>
+    <string name="rotate_map_to_bearing_descr">Выраўноўванне мапы:</string>
     <string name="rotate_map_to_bearing">Арыентацыя мапы</string>
     <string name="show_route">Падрабязнасці маршруту</string>
     <string name="fav_imported_sucessfully">Улюбёныя мясціны паспяхова імпартаваныя</string>
     <string name="fav_file_to_load_not_found">GPX-файл з улюбёнымі мясцінамі не знойдзены ў {0}</string>
     <string name="fav_saved_sucessfully">Улюбёныя мясціны захаваныя ў {0}</string>
     <string name="no_fav_to_save">Улюбёныя мясціны для захавання адсутнічаюць</string>
-    <string name="error_occurred_loading_gpx">Не атрымалася загрузіць GPX</string>
+    <string name="error_occurred_loading_gpx">Не атрымалася загрузіць GPX.</string>
     <string name="send_report">Даслаць справаздачу</string>
     <string name="none_region_found">На картцы памяці не атрымалася знайсці спампаваных мапаў.</string>
     <string name="poi_namefinder_query_empty">Увядзіце для пошуку POI</string>
@@ -834,7 +834,7 @@
     <string name="gps_provider">GPS</string>
     <string name="int_seconds">секунд</string>
     <string name="int_min">хв.</string>
-    <string name="background_service_int_descr">Абярыце інтэрвал абуджэння для фонавага рэжыму.</string>
+    <string name="background_service_int_descr">Інтэрвал абуджэння для фонавага рэжыму:</string>
     <string name="background_service_int">Інтэрвал абуджэння GPS</string>
     <string name="background_service_provider_descr">Абраць крыніцу месцазнаходжання для выкарыстання фонавым сэрвісам.</string>
     <string name="background_service_provider">Крыніца каардынат</string>
@@ -2425,26 +2425,38 @@
 \n Атрымоўвайце асалоду ад галасавой і візуальная навігацыі, праглядайце пукты цікавасцяў (POI), запісвайце GPX-сляды, выкарыстоўвайце візуалізацыю контурных ліній ды даных вышыні, пераключайцеся паміж рэжымамі кіравання, яздой на ровары ды шпацырамі, рэдагуйце OSM-даныя і шмат іншага. 
 \n OsmAnd+ — платная версія праграмы. Пры набыцці, вы падтрымоўваеце праект, фінансуеце распрацоўку новых магчымасцяў ды атрымоўваце апошнія абнаўленні. 
 \nНекаторыя з галоўных магчымасцяў:</string>
-    <string name="osmand_plus_extended_description_part3">"Прагляд мапы 
+    <string name="osmand_plus_extended_description_part3">Прагляд мапы 
 \n
 \n 
+\n 
+\n
 \n • Паказвае дзе вы знаходзіцеся і куды глядзіце 
 \n
 \n 
+\n 
+\n
 \n • Пры патрэбе выраўняе мапу па компасе ці па напрамку вашага руху 
 \n
 \n 
+\n 
+\n
 \n • Захавае вашыя найважнейшыя месцы ва ўлюблёных 
 \n
 \n 
+\n 
+\n
 \n • Адлюстроўвае пункты цікавасцяў вакол вас 
 \n
 \n 
+\n 
+\n
 \n • Паказвае адмысловыя сеціўныя мапы, спадарожнікавыя здымкі (Bing), розныя накладкі накшталт турыстычных/навігацыйных GPX-слядоў і дадатковыя пласты з наладжвальнай празрыстасцю 
 \n
 \n 
-\n • Можа адлюстроўваць на мапе беларускія, англійскія, мясцовыя назвы ці  фанетычным напісаннем
-\n"</string>
+\n 
+\n
+\n • Можа адлюстроўваць на мапе беларускія, англійскія, мясцовыя назвы ці фанетычным напісаннем
+\n</string>
     <string name="osmand_plus_extended_description_part4">Выкарыстоўваюцца даныя OSM ды Вікіпедыі 
 \n • Высокаякасная інфармацыя ад найлепшых праектаў свету 
 \n • OSM-даныя даступныя па краіне ці рэгіёну 

OsmAnd/res/values-ca/strings.xml

@@ -632,12 +632,12 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="show_poi_over_map">Mostra la superposició de PDI</string>
     <string name="show_location">Mostra la vostra ubicació</string>
     <string name="searchpoi_activity">Escull un PDI</string>
-    <string name="choose_available_region">Escull una regió de la llista</string>
+    <string name="choose_available_region">Seleccioneu una regió de la llista</string>
     <string name="search_POI_level_btn">Cerca\'n més</string>
     <string name="map_source">Font del mapa</string>
-    <string name="show_poi_over_map_description">Mostra la darrera superposició de PDI seleccionada en el mapa.</string>
+    <string name="show_poi_over_map_description">Mostra la darrera superposició de PDI usada.</string>
     <string name="use_internet">Utilitza Internet</string>
-    <string name="search_address_top_text">Selecció de l\'adreça</string>
+    <string name="search_address_top_text">Adreça</string>
     <string name="favourites_context_menu_edit">Edita el Preferit</string>
     <string name="favourites_context_menu_delete">Elimina el Preferit</string>
     <string name="poi_edit_title">Edita el PDI</string>
@@ -812,9 +812,9 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="add_favorite_dialog_default_favourite_name">Preferit</string>
     <string name="add_favorite_dialog_favourite_added_template">S\'ha afegit el punt preferit «{0}».</string>
     <string name="osb_comment_dialog_success">S\'ha afegit el comentari</string>
-    <string name="poi_remove_success">PDI eliminat</string>
+    <string name="poi_remove_success">Eliminat</string>
     <string name="shared_string_clear">Neteja</string>
-    <string name="edit_filter_delete_dialog_title">Voleu eliminar el filtre seleccionat?</string>
+    <string name="edit_filter_delete_dialog_title">Voleu eliminar aquest filtre\?</string>
     <string name="no_route">Sense ruta</string>
     <string name="voice_stream_voice_call">Àudio de trucada telefònica (interrupció de la música BT del cotxe)</string>
     <string name="enable_plugin_monitoring_services">"Habiliteu el connector \"Enregistrament de ruta\"  per utilitzar els serveis de registre d\'ubicació (enregistrament GPX, seguiment en directe)"</string>
@@ -898,7 +898,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="navigate_point_top_text">Introduïu la latitud i la longitud en el format seleccionat (G - graus, M - minuts, S - segons)</string>
     <string name="navigate_point_format_D">GGG.GG</string>
     <string name="navigate_point_format_DM">GGG MM.MM</string>
-    <string name="navigate_point_format_DMS">GGG MM SS.SS</string>
+    <string name="navigate_point_format_DMS">GGG MM SS.S</string>
     <string name="favourites_remove_dialog_msg">Voleu eliminar el punt Preferit \'%s\'?</string>
     <string name="favourites_remove_dialog_success">El punt preferit {0} eliminat.</string>
     <string name="poi_action_succeded_template">Acció {0} completada.</string>
@@ -996,7 +996,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="transport_stops_to_pass">parades que heu de passar</string>
     <string name="shared_string_downloading">S\'està baixant</string>
     <string name="commiting_node">S\'està enviant el node…</string>
-    <string name="choose_intersected_street">Seleccioneu la intersecció</string>
+    <string name="choose_intersected_street">Seleccioneu el carrer intersecció</string>
     <string name="poi_remove_confirm_template">Voleu suprimir {0} (comentari)?</string>
     <string name="poi_dialog_comment_default">Canvis en el PDI</string>
     <string name="context_menu_item_destination_point">Estableix com a destinació</string>
@@ -1125,7 +1125,7 @@ Memòria proporcional %4$s MB (límit de l\'Android %5$s MB, Dalvik %6$s MB).</s
     <string name="av_camera_focus_descr">Mode d\'enfocament de la càmera:</string>
     <string name="av_camera_focus">Tipus d\'enfocament</string>
     <string name="poi_error_unexpected_template">No s\'ha pogut fer l\'acció {0}.</string>
-    <string name="map_tile_source_descr">Trieu l\'origen de les tessel·les, sigui en línia o de la memòria cau.</string>
+    <string name="map_tile_source_descr">Trieu l\'origen de les tessel·les, sigui en línia o de la memòria cau</string>
     <string name="previous_run_crashed">La darrera execució de l\'OsmAnd ha fallat. El fitxer log és a {0}. Si us plau informeu del problema i adjunteu el fitxer log.</string>
     <string name="transport_stop_to_go_out">Trieu aturada per sortir</string>
     <string name="route_head">Endavant</string>
@@ -1635,15 +1635,15 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="rate_this_app">Avalua aquesta aplicació</string>
     <string name="rate_this_app_long">Us agrairíem que avaluéssiu l\'OsmAnd al Google Play</string>
     <string name="user_hates_app_get_feedback">Digueu-nos el motiu.</string>
-    <string name="user_hates_app_get_feedback_long">Us agrairíem que ens diguéssiu que voldríeu canviar d\'aquesta aplicació.</string>
+    <string name="user_hates_app_get_feedback_long">Us agrairíem que ens feu saber qualsevol suggeriment.</string>
     <string name="download_live_updates">Actualitzacions al moment</string>
-    <string name="failed_to_upload">S\'ha produït un error en la pujada</string>
+    <string name="failed_to_upload">No s\'ha pogut pujar</string>
     <string name="delete_change">Suprimeix les modificacions</string>
     <string name="successfully_uploaded_pattern">S\'ha pujat {0}/{1}</string>
     <string name="try_again">Torneu-ho a provar</string>
     <string name="error_message_pattern">Error: {0}</string>
     <string name="no_updates_available">No hi ha actualitzacions disponibles</string>
-    <string name="we_really_care_about_your_opinion">Ens interessa la vostra opinió i valorem molt els vostres comentaris.</string>
+    <string name="we_really_care_about_your_opinion">Ens interessa la vostra opinió i els vostres comentaris.</string>
     <string name="rendering_value_boldOutline_name">Contorn destacat</string>
     <string name="traffic_warning_hazard">Perill informat</string>
     <string name="dahboard_options_dialog_title">Configura el tauler</string>
@@ -1861,7 +1861,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="shared_string_undo_all">Desfés-ho tot</string>
     <string name="shared_string_type">Tipus</string>
     <string name="starting_point">Punt d\'inici</string>
-    <string name="select_month_and_country">Seleccioneu el mes i el país</string>
+    <string name="select_month_and_country">Mes i país:</string>
     <string name="number_of_contributors">Nombre de col·laboradors</string>
     <string name="number_of_edits">Nombre d\'edicions</string>
     <string name="reports_for">Informe per</string>
@@ -2116,7 +2116,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="quick_action_add_marker">Afegeix marcador de mapa</string>
     <string name="quick_action_add_poi">Afegeix PDI</string>
     <string name="quick_action_map_style">canvia l\'estil del mapa</string>
-    <string name="quick_action_map_style_switch">L\'estil del mapa s\'ha canviat a \"%s\".</string>
+    <string name="quick_action_map_style_switch">Estil del mapa canviat a \"%s\".</string>
     <string name="quick_action_take_audio_note">Nova nota d\'àudio</string>
     <string name="quick_action_take_video_note">Nova nota de vídeo</string>
     <string name="quick_action_take_photo_note">Nova nota fotogràfica</string>
@@ -2135,8 +2135,8 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
     <string name="quick_favorites_show_favorites_dialog">Mostra el diàleg Favorits</string>
     <string name="quick_favorites_name_preset">Configuració de nom</string>
     <string name="quick_action_add_marker_descr">Prement aquest botó d\'acció s\'afegeix un marcador de mapa a la posició central de la pantalla.</string>
-    <string name="quick_action_add_gpx_descr">Prement aquest botó d\'acció s\'afegirà, al centre de la pantalla, una fita GPX.</string>
-    <string name="quick_action_take_audio_note_descr">Prement aquest botó d\'acció afegiu una nota d\'àudio en el centre de la pantalla.</string>
+    <string name="quick_action_add_gpx_descr">Un botó per afegir una fita GPX al centre de la pantalla.</string>
+    <string name="quick_action_take_audio_note_descr">Un botó per afegir una nota d\'àudio en el centre de la pantalla.</string>
     <string name="quick_action_take_video_note_descr">Prement aquest botó d\'acció afegiu una nota de vídeo en el centre de la pantalla.</string>
     <string name="quick_action_take_photo_note_descr">Prement el botó d\'acció s\'afegeix una nota fotogràfica en el centre de la pantalla.</string>
     <string name="quick_action_add_osm_bug_descr">Prement aquest botó d\'acció afegiu una nota OSM al centre de la pantalla.</string>
@@ -3459,4 +3459,5 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="osm_edits_view_descr">Podeu veure totes les vostres edicions no enviades o els errors OSM a Menú — Els meus llocs — Edicions OSM. Els punts enviats no es mostren a OsmAnd.</string>
     <string name="select_nav_icon_descr">Només veureu la icona mentre navegueu o us mogueu.</string>
     <string name="select_map_icon_descr">La icona de mapa només es mostra al mapa i es canvia a la icona de navegació quan durant aquesta.</string>
+    <string name="logcat_buffer_descr">Aquí podeu veure i compartir els enregistraments de l\'aplicació</string>
 </resources>

OsmAnd/res/values-da/phrases.xml

@@ -3792,4 +3792,5 @@
     <string name="poi_volcano_status_active">Aktiv</string>
     <string name="poi_volcano_status_inactive">Inaktiv</string>
     <string name="poi_volcano_number_of_eruptions">Antal udbrud</string>
+    <string name="poi_memorial_ghost_bike">Spøgelsescykel</string>
 </resources>

OsmAnd/res/values-da/strings.xml

@@ -3456,4 +3456,5 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Ikonet vises kun under navigation eller under bevægelse.</string>
     <string name="select_map_icon_descr">Kortikon vises kun på kortet og skifter under navigation til navigationsikon.</string>
+    <string name="logcat_buffer_descr">Her kan man se og dele logfiler for applikationen</string>
 </resources>

OsmAnd/res/values-de/phrases.xml

@@ -3787,4 +3787,5 @@
     <string name="poi_volcano_status_active">Aktiv</string>
     <string name="poi_volcano_status_inactive">Inaktiv</string>
     <string name="poi_volcano_number_of_eruptions">Anzahl der Ausbrüche</string>
+    <string name="poi_memorial_ghost_bike">Geisterfahrrad</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -3443,4 +3443,7 @@ Lon %2$s</string>
     <string name="osm_editing">OpenStreetMap-Bearbeitung</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Sie sehen das Symbol nur während der Navigation oder während der Bewegung.</string>
+    <string name="multimedia_notes_view_descr">Sie finden all Ihre Notizen im Menü unter Meine Orte — Notizen.</string>
+    <string name="button_rate">Bewerten</string>
+    <string name="logcat_buffer_descr">Hier können Sie Protokolle der Anwendung sehen und freigeben</string>
 </resources>

OsmAnd/res/values-et/phrases.xml

@@ -3766,4 +3766,5 @@
     <string name="poi_volcano_status_active">Aktiivne</string>
     <string name="poi_volcano_status_inactive">Mitteaktiivne</string>
     <string name="poi_volcano_number_of_eruptions">Pursete arv</string>
+    <string name="poi_memorial_ghost_bike">Kummitusratas</string>
 </resources>

OsmAnd/res/values-et/strings.xml

@@ -3378,4 +3378,5 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Ikooni näed ainult navigeerimise või liikumise ajal.</string>
     <string name="select_map_icon_descr">Kaardiikoon kuvatakse ainult kaardil ja muutub navigeerimise ajal navigeerimise ikooniks.</string>
+    <string name="logcat_buffer_descr">Siin saad rakenduse logisid vaadata ja jagada</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -3456,4 +3456,9 @@
     <string name="ltr_or_rtl_combine">%1$s: ‪%2$s‬</string>
     <string name="ltr_or_rtl_combine_via_space">‪%1$s %2$s‬‏</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: ‪%2$s‬</string>
+    <string name="file_does_not_contain_routing_rules">فایل %1$s قواعد مسیریابی را ندارد. لطفاً فایل دیگری انتخاب کنید.</string>
+    <string name="not_support_file_type_with_ext">قالب فایل پشتیبانی نمی‌شود. فایلی با پسوند %1$s انتخاب کنید.</string>
+    <string name="import_from_file">درون‌برد از فایل</string>
+    <string name="import_routing_file">درون‌برد فایل مسیریابی</string>
+    <string name="import_profile">درون‌برد پروفایل</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -3420,4 +3420,5 @@ représentant la zone : %1$s x %2$s</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Vous ne verrez l\'icône que lors de la navigation ou en déplacement.</string>
     <string name="select_map_icon_descr">L \'icône Carte n\'apparaît que sur la carte et est remplacée par l\'icône Navigation lors de la navigation.</string>
+    <string name="logcat_buffer_descr">Ici, vous pouvez consulter les journaux de l\'application et les partager (pour debug)</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -3437,4 +3437,6 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">הסמל יופיע רק בזמן הניווט או בזמן תזוזה.</string>
     <string name="select_map_icon_descr">סמל המפה מופיע במפה בלבד והוא מתחלף בעת הניווט לסמל הניווט.</string>
+    <string name="button_rate">דירוג</string>
+    <string name="logcat_buffer_descr">כאן ניתן לצפות ולשתף את תיעוד יומני היישומון</string>
 </resources>

OsmAnd/res/values-it/strings.xml

@@ -885,8 +885,8 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="recording_open_external_player">Apri riproduttore esterno</string>
     <string name="recording_delete_confirm">Vuoi cancellare questo elemento\?</string>
     <string name="recording_unavailable">non disponibile</string>
-    <string name="recording_context_menu_arecord">Prendi una nota audio</string>
-    <string name="recording_context_menu_vrecord">Prendi una nota video</string>
+    <string name="recording_context_menu_arecord">Registra una nota audio</string>
+    <string name="recording_context_menu_vrecord">Registra una nota video</string>
     <string name="layer_recordings">Livello registrazioni</string>
     <string name="recording_can_not_be_played">La registrazione non può essere riprodotta.</string>
     <string name="recording_context_menu_delete">Elimina la registrazione</string>
@@ -3421,4 +3421,27 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="ltr_or_rtl_combine">%1$s: %2$s</string>
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
-</resources>
+    <string name="file_does_not_contain_routing_rules">Il file \'%1$s\' non contiene regole di routing, si prega di scegliere un altro file.</string>
+    <string name="not_support_file_type_with_ext">Tipo di file non supportato. È necessario selezionare un file con estensione %1$s.</string>
+    <string name="import_from_file">Importa da file</string>
+    <string name="import_routing_file">Importa file di routing</string>
+    <string name="import_profile">Importa profilo</string>
+    <string name="multimedia_notes_prefs_descr">Dimensioni dell\'immagine, qualità audio e video</string>
+    <string name="osm_editing_prefs_descr">Accesso, password, modifica offline</string>
+    <string name="accessibility_prefs_descr">Scegli icona, colore e nome</string>
+    <string name="live_monitoring_descr">Permette di condividere la posizione corrente utilizzando la registrazione del viaggio.</string>
+    <string name="live_monitoring">Tracciamento online</string>
+    <string name="save_track_logging_accuracy">Precisione di registrazione</string>
+    <string name="tracks_view_descr">Puoi trovare tutte le tue tracce registrate in Menu - I miei luoghi - Le mie tracce o nella cartella OsmAd utilizzando il file manager.</string>
+    <string name="multimedia_notes_view_descr">Puoi trovare tutte le tue note in Menu - I miei luoghi - Note</string>
+    <string name="video_notes">Note video</string>
+    <string name="photo_notes">Note fotografiche</string>
+    <string name="route_recalculation">Ricalcolo del percorso</string>
+    <string name="login_and_pass">Nome utente e password</string>
+    <string name="plugin_global_prefs_info">Queste impostazioni del plugin sono globali e si applicano a tutti i profili.</string>
+    <string name="osm_editing">Modifica di OpenStreetMap</string>
+    <string name="osm_edits_view_descr">È possibile visualizzare tutte le modifiche non caricate o le note OSM in Menu - I miei luoghi - Modifiche OSM. I punti caricati non vengono visualizzati in OsmAnd.</string>
+    <string name="app_mode_osm">OSM</string>
+    <string name="select_nav_icon_descr">L\'icona viene visualizzata solo durante la navigazione o in movimento.</string>
+    <string name="logcat_buffer_descr">Qui puoi vedere e condividere i log dell\'applicazione</string>
+</resources>

OsmAnd/res/values-nl/phrases.xml

@@ -153,7 +153,7 @@
     <string name="poi_communication_tower">Communicatietoren</string>
     <string name="poi_pier">Pier</string>
     <string name="poi_observatory">Observatorium</string>
-    <string name="poi_astronomical_observatory">Sterrenwacht</string>
+    <string name="poi_astronomical_observatory">Astronomisch</string>
     <string name="poi_tower">Toren</string>
     <string name="poi_mast">Mast</string>
     <string name="poi_radar">Radar</string>
@@ -294,7 +294,7 @@
     <string name="poi_theatre">Theater</string>
     <string name="poi_theatre_genre_circus">Circus</string>
     <string name="poi_dance_floor">Dansvloer</string>
-    <string name="poi_nightclub">Nachtclub</string>
+    <string name="poi_nightclub">Nachtclub;Disco;Disko</string>
     <string name="poi_stripclub">Stripclub</string>
     <string name="poi_beach_resort">Badplaats</string>
     <string name="poi_dog_park">Hondenpark</string>
@@ -681,7 +681,7 @@
     <string name="poi_fuel_lh2">Vloeibare waterstof</string>
     <string name="poi_fuel_electricity">Elektriciteit</string>
     <string name="poi_junction">Kruising</string>
-    <string name="poi_rest_area">Verzorgingsplaats</string>
+    <string name="poi_rest_area">Rustpunt</string>
     <string name="poi_observation_tower">Uitkijktoren</string>
     <string name="poi_bell_tower">Kerktoren</string>
     <string name="poi_industrial">Industriegebied</string>
@@ -1177,10 +1177,10 @@
     <string name="poi_vending_bicycle_tube">Fietsbanden</string>
     <string name="poi_bridge_bicycle">Fietsbrug</string>
     <string name="poi_animal_shelter">Dierenasiel</string>
-    <string name="poi_animal_shelter_dog">Hondenasiel</string>
-    <string name="poi_animal_shelter_cat">Kattenasiel</string>
-    <string name="poi_animal_shelter_dog_cat">Honden- en kattenasiel</string>
-    <string name="poi_animal_shelter_bird">Vogelopvang</string>
+    <string name="poi_animal_shelter_dog">Honden</string>
+    <string name="poi_animal_shelter_cat">Katten</string>
+    <string name="poi_animal_shelter_dog_cat">Honden, katten</string>
+    <string name="poi_animal_shelter_bird">Vogels</string>
     <string name="poi_seats">Zitplaatsen</string>
     <string name="poi_backrest_yes">Met rugleuning</string>
     <string name="poi_backrest_no">Zonder rugleuning</string>
@@ -1203,7 +1203,7 @@
     <string name="poi_information_guidepost">Wegwijzer</string>
     <string name="poi_information_board">Bord</string>
     <string name="poi_information_map">Informatiekaart</string>
-    <string name="poi_information_office">Toeristenbureau</string>
+    <string name="poi_information_office">Bureau</string>
     <string name="poi_information_trail_blaze">Markering</string>
     <string name="poi_information_terminal">Terminal</string>
     <string name="poi_information_route_marker">Routemarkering</string>
@@ -1270,7 +1270,7 @@
     <string name="poi_piste_difficulty_freeride">Freeride</string>
     <string name="poi_piste_grooming_classic">Klassiek</string>
     <string name="poi_piste_grooming_classic_skating">Klassiek en skating</string>
-    <string name="poi_piste_grooming_backcountry">Alleen sporen</string>
+    <string name="poi_piste_grooming_backcountry">Uithoek</string>
     <string name="poi_piste_grooming_scooter">Sneeuwmobiel</string>
     <string name="poi_piste_grooming_skating">Skating</string>
     <string name="poi_piste_grooming_no">Geen</string>
@@ -1316,13 +1316,13 @@
     <string name="poi_deadlock">Doodlopende weg</string>
     <string name="poi_stars_1s">1 S (Superior Tourist)</string>
     <string name="poi_stars_2">2 (Standaard)</string>
-    <string name="poi_stars_2s">2S (Superior Standard)</string>
+    <string name="poi_stars_2s">2S (Superieur Standaard)</string>
     <string name="poi_stars_3">3 (Comfort)</string>
     <string name="poi_stars_3s">3S (Superior Comfort)</string>
     <string name="poi_stars_4">4 (First Class)</string>
-    <string name="poi_stars_4s">4S (Superior First Class)</string>
+    <string name="poi_stars_4s">4S (Superieur Eerste Klasse)</string>
     <string name="poi_stars_5">5 (Luxe)</string>
-    <string name="poi_stars_5s">5S (Superior Luxe)</string>
+    <string name="poi_stars_5s">5S (Superieur Luxe)</string>
     <string name="poi_stars_6">Sterren: 6</string>
     <string name="poi_stars_7">Sterren: 7</string>
     <string name="poi_love_hotel">Ontmoetingshotel</string>
@@ -1340,7 +1340,7 @@
     <string name="poi_payment_electronic_purses_no">Betaling met elektronische portemonnee niet mogelijk</string>
     <string name="poi_payment_cash_yes">Contant</string>
     <string name="poi_payment_cash_no">Contante betaling niet mogelijk</string>
-    <string name="poi_payment_debit_cards_yes">Bankpas</string>
+    <string name="poi_payment_debit_cards_yes">Betaalkaart</string>
     <string name="poi_payment_debit_cards_no">Betaling met debetkaarten niet mogelijk</string>
     <string name="poi_payment_bitcoin_yes">Bitcoin</string>
     <string name="poi_payment_bitcoin_no">Betaling met Bitcion niet mogelijk</string>
@@ -1451,7 +1451,7 @@
     <string name="poi_shelter_type">Type</string>
     <string name="poi_fireplace">Open haard</string>
     <string name="poi_seasonal">Seizoensgebonden</string>
-    <string name="poi_water_characteristic">Waterpartij</string>
+    <string name="poi_water_characteristic">Waterkarakteristiek</string>
     <string name="poi_beach_surface_type">Oppervlak</string>
     <string name="poi_nudism">Nudisme</string>
     <string name="poi_diet">Dieet</string>
@@ -1565,7 +1565,7 @@
     <string name="poi_drive_through_yes">Ja</string>
     <string name="poi_drive_through_no">Drive-through: nee</string>
     <string name="poi_brewery_additional">Naam van brouwerij</string>
-    <string name="poi_microbrewery_yes">Microbrouwerij</string>
+    <string name="poi_microbrewery_yes">Ja</string>
     <string name="poi_microbrewery_no">Geen microbrouwerij</string>
     <string name="poi_takeaway_filter_yes">Ja</string>
     <string name="poi_takeaway_yes">Om mee te nemen</string>
@@ -1767,7 +1767,7 @@
     <string name="poi_bridge_railway">Spoorbrug</string>
     <string name="poi_bridge_waterway">Waterbrug</string>
     <string name="poi_bridge_structure_simple_suspension">Soort brug: enkele hangbrug</string>
-    <string name="poi_bridge_structure_beam">Soort brug: balk</string>
+    <string name="poi_bridge_structure_beam">Brugstructuur: balk</string>
     <string name="poi_bridge_structure_suspension">Soort brug: enkele brug</string>
     <string name="poi_bridge_structure_arch">"Soort brug:  boogbrug"</string>
     <string name="poi_bridge_structure_floating">Soort brug: vlotbrug</string>
@@ -1826,9 +1826,9 @@
     <string name="poi_service_bicycle_chaintool_no">Fietsketting-gereedschap: nee</string>
     <string name="poi_service_bicycle_second_hand_yes">Tweedehands fietsen</string>
     <string name="poi_service_bicycle_second_hand_no">Verkoop van tweedehands fietsen: nee</string>
-    <string name="poi_service_bicycle_charging_yes">Fietsen opladen: ja</string>
-    <string name="poi_service_bicycle_charging_no">Fietsen opladen:nee</string>
-    <string name="poi_bicycle_repair_station">Doe-het-zelf fietsreparatie</string>
+    <string name="poi_service_bicycle_charging_yes">Opladen: ja</string>
+    <string name="poi_service_bicycle_charging_no">Opladen: nee</string>
+    <string name="poi_bicycle_repair_station">Fietsherstel;Doe-het-zelf fietsherstel</string>
     <string name="poi_wildlife_hide">Plek om wild te observeren</string>
     <string name="poi_training_language">Opleiding: taal</string>
     <string name="poi_training_music">Opleiding: muziek</string>
@@ -1907,7 +1907,7 @@
     <string name="poi_clothes_shirts">Overhemden</string>
     <string name="poi_clothes_dance">Dans</string>
     <string name="poi_clothes_military">Militair</string>
-    <string name="poi_historic_milestone">Oude mijlsteen</string>
+    <string name="poi_historic_milestone">Oude mijlpaal</string>
     <string name="poi_shoes_children">Kinderen</string>
     <string name="poi_shoes_women">Vrouwen</string>
     <string name="poi_shoes_sport">Sport</string>
@@ -1932,7 +1932,7 @@
     <string name="poi_openfire_no">Open vuur niet toegestaan</string>
     <string name="poi_backcountry_yes">Ja</string>
     <string name="poi_backcountry_no">Nee</string>
-    <string name="poi_scout_yes">Padvinderskamp: ja</string>
+    <string name="poi_scout_yes">Ja</string>
     <string name="poi_scout_no">Padvinderskamp: nee</string>
     <string name="poi_group_only_yes">Alleen groepen: ja</string>
     <string name="poi_group_only_no">Alleen groepen: nee</string>
@@ -2090,7 +2090,7 @@
     <string name="poi_payment_mtsmoney_no">MTS-Money niet geaccepteerd</string>
     <string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
     <string name="poi_payment_yandexmoney_no">Yandex.Money niet geaccepteerd</string>
-    <string name="poi_description_payment">Betaling beschrijving</string>
+    <string name="poi_description_payment">Beschrijving betaling</string>
     <string name="poi_memorial_plaque">Gedenkplaat</string>
     <string name="poi_resource_dimension_stone">Natuursteen</string>
     <string name="poi_wetland_fen">Laagveen</string>
@@ -2098,7 +2098,7 @@
     <string name="poi_beach_shingle">Grind</string>
     <string name="poi_shelter_type_lean_to">Aanbouw</string>
     <string name="poi_shelter_type_field_shelter">Veldhut</string>
-    <string name="poi_shelter_type_tent">Onderdaktype: tent</string>
+    <string name="poi_shelter_type_tent">Schuilplaatstype: tent</string>
     <string name="poi_shelter_type_abandoned">Onderdaktype: verlaten</string>
     <string name="poi_internet_access_type_terminal">Terminal</string>
     <string name="poi_internet_access_type_public">Type internettoegang: openbaar</string>
@@ -2128,7 +2128,7 @@
     <string name="poi_building_type_synagogue">Type gebouw: synagoge</string>
     <string name="poi_building_type_shrine">Type gebouw: schrijn</string>
     <string name="poi_cross">Kruis</string>
-    <string name="poi_summit_cross">Kruis op de top: ja</string>
+    <string name="poi_summit_cross">Kruis op bergtop: ja</string>
     <string name="poi_prison_camp">Voormalig gevangenenkamp</string>
     <string name="poi_concentration_camp">Type: concentratiekamp</string>
     <string name="poi_pow_camp">Type: krijgsgevangenenkamp</string>
@@ -2138,9 +2138,9 @@
     <string name="poi_bathing_yes">Zwemmen: ja</string>
     <string name="poi_bathing_no">Zwemmen: nee</string>
     <string name="poi_boat_storage">Boot-opslag</string>
-    <string name="poi_bridge_ref">Brug Nr.</string>
-    <string name="poi_tunnel_ref">Tunnel Nr.</string>
-    <string name="poi_ref">Nr.</string>
+    <string name="poi_bridge_ref">Brug referentie</string>
+    <string name="poi_tunnel_ref">Tunnel referentie</string>
+    <string name="poi_ref">Referentie</string>
     <string name="poi_cargo_passengers">Passagiers</string>
     <string name="poi_cargo_vehicle">Voertuigen</string>
     <string name="poi_cargo_bicycle">Fietsen</string>
@@ -2166,11 +2166,11 @@
     <string name="poi_health_specialty_trauma_yes">Traumatologie</string>
     <string name="poi_health_specialty_biology_yes">Klinische biologie</string>
     <string name="poi_health_specialty_osteopathy_yes">Osteopathie</string>
-    <string name="poi_health_specialty_pulmonology_yes">Ademhalingsgeneeskunde</string>
+    <string name="poi_health_specialty_pulmonology_yes">Pneumologie</string>
     <string name="poi_health_specialty_dental_oral_maxillo_facial_surgery_yes">Tandheelkundige, orale en maxillofaciale chirurgie</string>
-    <string name="poi_health_specialty_maternity_yes">Moederschap</string>
-    <string name="poi_health_specialty_emergency_medicine_yes">Spoedeisende hulp</string>
-    <string name="poi_health_specialty_emergency_medicine_no">Specialiteit gezondheid: Spoedeisende hulp: nee</string>
+    <string name="poi_health_specialty_maternity_yes">Materniteit</string>
+    <string name="poi_health_specialty_emergency_medicine_yes">Spoeddienst</string>
+    <string name="poi_health_specialty_emergency_medicine_no">Specialiteit gezondheid: Spoeddienst: nee</string>
     <string name="poi_health_specialty_plastic_surgery_yes">Plastische chirurgie</string>
     <string name="poi_health_specialty_orthodontics_yes">Orthodontie</string>
     <string name="poi_health_specialty_physiotherapy_yes">Fysiotherapie</string>
@@ -2196,14 +2196,14 @@
     <string name="poi_dolphin">Dolfijn</string>
     <string name="poi_forestry_compartment">Wegwijzer: bosbouwdivisie</string>
     <string name="poi_forestry_allotment">Wegwijzer: bos-perceel</string>
-    <string name="poi_inscription_n">Opschrift: N</string>
-    <string name="poi_inscription_nw">Opschrift: NW</string>
-    <string name="poi_inscription_w">Opschrift: W</string>
-    <string name="poi_inscription_sw">Opschrift: SW</string>
-    <string name="poi_inscription_s">Opschrift: S</string>
-    <string name="poi_inscription_se">Opschrift: SE</string>
-    <string name="poi_inscription_e">Opschrift: E</string>
-    <string name="poi_inscription_ne">Opschrift: NE</string>
+    <string name="poi_inscription_n">Opschrift:N</string>
+    <string name="poi_inscription_nw">Opschrift:NW</string>
+    <string name="poi_inscription_w">Opschrift:W</string>
+    <string name="poi_inscription_sw">Opschrift:ZW</string>
+    <string name="poi_inscription_s">Opschrift:Z</string>
+    <string name="poi_inscription_se">Opschrift:ZO</string>
+    <string name="poi_inscription_e">Opschrift:O</string>
+    <string name="poi_inscription_ne">Opschrift:NO</string>
     <string name="poi_construction_yes">In aanbouw</string>
     <string name="poi_additional_atm_yes">Geldautomaat: ja</string>
     <string name="poi_atm_no">Geldautomaat: nee</string>
@@ -2213,7 +2213,7 @@
     <string name="poi_fair_trade_no">Fair trade: nee</string>
     <string name="poi_fair_trade_only">Alleen fair trade-producten</string>
     <string name="poi_protected_area">Beschermd gebied</string>
-    <string name="poi_protection_title">Beschermings-title</string>
+    <string name="poi_protection_title">Beschermingstitel</string>
     <string name="poi_nuclear_explosion_warhead">Explosie: kernkop</string>
     <string name="poi_nuclear_explosion_device">Explosie: apparaat</string>
     <string name="poi_addr_housename">Huis naam</string>
@@ -2324,7 +2324,7 @@
     <string name="poi_material_plastic">Materiaal: kunststof</string>
     <string name="poi_material_sandstone">Materiaal: zandsteen</string>
     <string name="poi_material_granite_stone">Materiaal: graniet</string>
-    <string name="poi_material_metal_wood">Materiaal: metaal;hout</string>
+    <string name="poi_material_metal_wood">Materiaal: metaal, hout</string>
     <string name="poi_material_glass">Materiaal: glas</string>
     <string name="poi_material_bronze">Materiaal: brons</string>
     <string name="poi_material_earth">Materiaal: aarde</string>
@@ -2546,7 +2546,7 @@
     <string name="poi_wiki_lang_jv">Javaanse wiki</string>
     <string name="poi_wiki_lang_ky">Kyrgyzische wiki</string>
     <string name="poi_wiki_lang_zhyue">Cantonese wiki</string>
-    <string name="poi_wiki_lang_tg">Tajik wiki</string>
+    <string name="poi_wiki_lang_tg">Tajiki wiki</string>
     <string name="poi_wiki_lang_ba">Bashkir wiki</string>
     <string name="poi_wiki_lang_my">Burmese wiki</string>
     <string name="poi_wiki_lang_an">Aragonese wiki</string>
@@ -2574,7 +2574,7 @@
     <string name="poi_service_vehicle_muffler_yes">Geluiddemper</string>
     <string name="poi_social_facility_assisted_living">Begeleid wonen</string>
     <string name="poi_social_facility_shelter">Opvang</string>
-    <string name="poi_social_facility_workshop">Workshop</string>
+    <string name="poi_social_facility_workshop">Atelier</string>
     <string name="poi_social_facility_day_care">Dagzorg</string>
     <string name="poi_social_facility_for_senior">Senioren</string>
     <string name="poi_social_facility_for_child">Kinderen</string>
@@ -2667,7 +2667,7 @@
     <string name="poi_wiki_lang_ml">Malayalam wiki</string>
     <string name="poi_wiki_lang_mr">Marathi wiki</string>
     <string name="poi_wiki_lang_war">Waray wiki</string>
-    <string name="poi_payment_icsf_yes"/>
+    <string name="poi_payment_icsf_yes">IC Opgeslagen reiskaart</string>
     <string name="poi_shelter_type_sun_shelter">Zonnescherm</string>
     <string name="poi_bridge_structure_truss">Brugstructuur: gebonden hout</string>
     <string name="poi_surface_grass_paver">Wegoppervlak: grasswegdek</string>
@@ -2865,4 +2865,113 @@
     <string name="poi_access_mofa">Toegang motorfietsen</string>
     <string name="poi_access_hgv">Toegang vrachtwagens</string>
     <string name="poi_access_goods">Toegang licht goederenvervoer</string>
+    <string name="poi_payment_icsf_no">IC Opgeslagen reiskaarten niet aanvaard</string>
+    <string name="poi_memorial_blue_plaque">Blue plaque</string>
+    <string name="poi_memorial_jizo">Jizo</string>
+    <string name="poi_wetland_string_bog">Aapa moeras</string>
+    <string name="poi_bridge_structure_humpback">Brugstructuur: bult</string>
+    <string name="poi_bridge_structure_cable_stayed">Brugstructuur: kabel</string>
+    <string name="poi_bridge_movable_transporter">Beweegbare brug type: hangbrug</string>
+    <string name="poi_memorial_stupa">Stupa</string>
+    <string name="poi_memorial_prasat">Prasat</string>
+    <string name="poi_quango">Quango</string>
+    <string name="poi_cooperative">Coöperatie bureau</string>
+    <string name="poi_office_forestry">Bosbouw bureau</string>
+    <string name="poi_social_facility_outreach">Hulpverlening</string>
+    <string name="poi_tomb_rock_cut">Rotskloof</string>
+    <string name="poi_tomb_hypogeum">Type: hypogeum</string>
+    <string name="poi_historic_civilization_dacian">Beschaving: dacisch</string>
+    <string name="poi_historic_civilization_tiahuanacota">Beschaving: tiahuanacota</string>
+    <string name="poi_historic_period_first_intermediate_period">Historische periode: eerste tussenperiode (2181-2055 VC)</string>
+    <string name="poi_historic_period_second_intermediate_period">Historische periode: tweede tussenperiode (1650-1550 VC)</string>
+    <string name="poi_historic_period_third_intermediate_period">Historische periode: derde tussenperiode (1069-664 VC)</string>
+    <string name="poi_historic_period_late_period">Historische periode: late periode (664-332 VC)</string>
+    <string name="poi_historic_period_dominate">Historische periode: domina at (285-476 NC)</string>
+    <string name="poi_historic_period_villager">Historische periode: dorpsbewoner (epoch I, II, 1580 VC - 133 NV)</string>
+    <string name="poi_historic_period_urban">Historische periode: stedelijk (epoch III, 133- 374 NC)</string>
+    <string name="poi_historic_period_classical">Historische periode: klassiek (epoch IV, 374-900 NC)</string>
+    <string name="poi_historic_period_imperial">Historische periode: keizerlijk (epoch V, 900-1200 NC)</string>
+    <string name="poi_fortification_type_sconce">Versterking-type: vesting</string>
+    <string name="poi_fortification_type_ring_ditch">Versterking-type: slotgracht</string>
+    <string name="poi_pa">Pa (verstevigde nederzetting van Maori)</string>
+    <string name="poi_hackerspace">Hackerspace</string>
+    <string name="poi_wiki_lang_kk">Kazachse wiki</string>
+    <string name="poi_wiki_lang_zhminnan">Minnan wiki</string>
+    <string name="poi_wiki_lang_tt">Tataarse wiki</string>
+    <string name="poi_wiki_lang_ast">Astur-Leonese wiki</string>
+    <string name="poi_wiki_lang_cv">Chuvash wiki</string>
+    <string name="poi_wiki_lang_yo">Yoruba wiki</string>
+    <string name="poi_wiki_lang_gu">Gujarati wiki</string>
+    <string name="poi_wiki_lang_nap">Neapolitaanse wiki</string>
+    <string name="poi_health_specialty_tropical_medicine_yes">Tropische geneeskunde</string>
+    <string name="poi_health_specialty_tropical_medicine_no">Gezondheids specialisatie: tropische geneeskunde: nee</string>
+    <string name="poi_health_specialty_obstetrics_postnatal_no">Geneeskunde specialisatie: verloskunde (postnataal): nee</string>
+    <string name="poi_health_specialty_obstetrics_antenatal_yes">Obstetrie (Postnataal)</string>
+    <string name="poi_health_specialty_obstetrics_antenatal_no">Geneeskundige specialisatie: obstetrie (Postnataal): nee</string>
+    <string name="poi_health_specialty_social_paediatrics_yes">Sociale pediatrie</string>
+    <string name="poi_health_specialty_social_paediatrics_no">Geneeskundige specialisatie: sociale pediatrie: nee</string>
+    <string name="poi_health_specialty_obstetrics_caesarean_section_yes">Obstetrie (keizersnede)</string>
+    <string name="poi_health_specialty_obstetrics_caesarean_section_no">Geneeskundige specialisatie: obstetrie (keizersnede): nee</string>
+    <string name="poi_health_specialty_optometry_yes">Optometrie</string>
+    <string name="poi_health_specialty_clinical_pathology_yes">Klinische pathologie</string>
+    <string name="poi_health_specialty_manual_therapy_yes">Manuele therapie</string>
+    <string name="poi_health_specialty_sports_medicine_yes">Sportgeneeskunde</string>
+    <string name="poi_health_specialty_podology_yes">Podologie</string>
+    <string name="poi_health_specialty_adult_psychiatry_yes">Psychiatrie volwassenen</string>
+    <string name="poi_health_specialty_traditional_chinese_medicine_yes">Traditionele Chinese geneeskunde</string>
+    <string name="poi_health_specialty_reiki_yes">Reiki</string>
+    <string name="poi_health_specialty_herbalism_yes">Kruidengeneeskunde</string>
+    <string name="poi_health_specialty_chiropractic_yes">Chiropractie</string>
+    <string name="poi_fitness_centre">Fitness centrum</string>
+    <string name="poi_dojo">Dojo</string>
+    <string name="poi_gaelic_games">Keltische spelen</string>
+    <string name="poi_netball">Netbal</string>
+    <string name="poi_futsal">Zaalvoetbal</string>
+    <string name="poi_shuffleboard">Shuffleboard</string>
+    <string name="poi_lacrosse">Lacrosse</string>
+    <string name="poi_bandy">Bandy</string>
+    <string name="poi_protection_object_historic">Beschermd object: historisch</string>
+    <string name="poi_protection_object_nature">Beschermd object: natuur</string>
+    <string name="poi_protection_object_habitat">Beschermd object: leefruimte</string>
+    <string name="poi_protection_object_water">Beschermd object: water</string>
+    <string name="poi_nuclear_explosion_country">Explosie: land</string>
+    <string name="poi_nuclear_explosion_site">Explosie: plaats</string>
+    <string name="poi_nuclear_explosion_type_underground_shaft">Explosie type: ondergronds, schacht</string>
+    <string name="poi_nuclear_explosion_type_underground_tunnel">Explosie type: ondergronds, tunnel</string>
+    <string name="poi_nuclear_explosion_type_atmospheric">Explosie type: atmosferisch</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_airdrop">Explosie type: atmosferisch, afgeworpen</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_surface_tower">Explosie type: atmosferisch, grondniveau, toren</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_balloon">Explosie type: atmosferisch, ballon</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_atmospheric_surface">Explosie type: atmosferisch, grondniveau</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_water_surface_barge">Explosie type: atmosferisch, water, grondniveau, schuit</string>
+    <string name="poi_nuclear_explosion_type_underground">Explosie type: ondergronds</string>
+    <string name="poi_nuclear_explosion_type_cratering_burst">Explosie type: kratermakend splijten (ondiep ondergronds)</string>
+    <string name="poi_nuclear_explosion_type_atmospheric_rocket_or_missile">Explosie type: atmosferisch, raket of projectiel</string>
+    <string name="poi_nuclear_explosion_type_space">Explosie type: ruimte (hoogte boven 80km)</string>
+    <string name="poi_nuclear_explosion_type_underwater">Explosie type: onder water</string>
+    <string name="poi_nuclear_explosion_date_utc">Explosie datum (UTC)</string>
+    <string name="poi_nuclear_explosion_shot_name_en">Schot-naam (en)</string>
+    <string name="poi_nuclear_explosion_series">Explosie série</string>
+    <string name="poi_nuclear_explosion_purpose_nuclear_weapons_related">Explosie doelstelling: gerelateerd aan nucleare wapens</string>
+    <string name="poi_nuclear_explosion_purpose_weapons_effects">Explosie doelstelling: wapeneffecten</string>
+    <string name="poi_nuclear_explosion_purpose_safety_experiment">Explosie doelstelling: veiligheidsexperiment</string>
+    <string name="poi_nuclear_explosion_purpose_research_for_peaceful_applications">Explosie doelstelling: onderzoek voor burgerlijke doeleinden</string>
+    <string name="poi_nuclear_explosion_purpose_fundamental_science">Explosie doelstelling: fundamenteel onderzoek</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_cavity_excavation">Explosie doelstelling: industriële toepassing, kuil uitgraving</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_seismic_sounding">Explosie doelstelling: industriële toepassing, seismische golven</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_oil_stimulation">Explosie doelstelling: industriële toepassing, olie-stimuleren</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application">Explosie doelstelling: industriële toepassing</string>
+    <string name="poi_nuclear_explosion_purpose_industrial_application_earth_moving">Explosie doelstelling: industriële toepassing, grondverplaatsing</string>
+    <string name="poi_nuclear_explosion_time_utc">Explosie tijd (UTC)</string>
+    <string name="poi_nuclear_explosion_yield">Explosie rendement</string>
+    <string name="poi_nuclear_explosion_hole">Explosie gat</string>
+    <string name="poi_health_specialty_palliative_medicine_yes">Palliatieve zorg</string>
+    <string name="poi_climbing_crag_filter">Klimrots</string>
+    <string name="poi_access_motorhome">Motorhome toegang</string>
+    <string name="poi_atm_yes">Geldautomaat: ja</string>
+    <string name="poi_cash_withdrawal_bank_card">Geld afhalen</string>
+    <string name="poi_bath_type">Type</string>
+    <string name="poi_bath_open_air">Openlucht</string>
+    <string name="poi_volcano_type">Type</string>
+    <string name="poi_volcano_status">Status</string>
 </resources>

OsmAnd/res/values-sc/phrases.xml

@@ -3782,4 +3782,5 @@
     <string name="poi_volcano_status_active">Ativu</string>
     <string name="poi_volcano_status_inactive">Inativu</string>
     <string name="poi_volcano_number_of_eruptions">Nùmeru de erutziones</string>
+    <string name="poi_memorial_ghost_bike">Bitzicleta pantasma</string>
 </resources>

OsmAnd/res/values-sc/strings.xml

@@ -3447,4 +3447,5 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">As a bìdere s\'icona petzi durante sa navigatzione o su movimentu.</string>
     <string name="select_map_icon_descr">S\'icona de sa mapa aparit in sa mapa ebbia, e divenit s\'icona de navigatzione durante sa navigatzione.</string>
+    <string name="logcat_buffer_descr">Inoghe podes pompiare e cumpartzire sos registros de s\'aplicatzione</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -3398,4 +3398,5 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Simgeyi yalnızca navigasyon sırasında veya hareket halindeyken göreceksiniz.</string>
     <string name="select_map_icon_descr">Harita simgesi yalnızca haritada görünür ve navigasyon esnasında navigasyon simgesine dönüşür.</string>
+    <string name="logcat_buffer_descr">Burada uygulamanın log kayıtlarını görebilir ve paylaşabilirsiniz</string>
 </resources>

OsmAnd/res/values-uk/phrases.xml

@@ -3772,4 +3772,5 @@
     <string name="poi_volcano_status_active">Діючий</string>
     <string name="poi_volcano_status_inactive">Недіючий</string>
     <string name="poi_volcano_number_of_eruptions">Кількість вивержень</string>
+    <string name="poi_memorial_ghost_bike">Велосипед Ghost</string>
 </resources>

OsmAnd/res/values-uk/strings.xml

@@ -3438,4 +3438,5 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">Ви побачите значок тільки під час навігації або під час переміщення.</string>
     <string name="select_map_icon_descr">Образок мапи відображається лише на мапі та змінюється під час навігації до образка навігації.</string>
+    <string name="logcat_buffer_descr">Тут ви можете бачити і ділитися часописами додатку</string>
 </resources>

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

@@ -3783,4 +3783,5 @@
     <string name="poi_volcano_status_active">活火山</string>
     <string name="poi_volcano_status_inactive">不活躍火山</string>
     <string name="poi_volcano_number_of_eruptions">噴發次數</string>
+    <string name="poi_memorial_ghost_bike">幽靈單車</string>
 </resources>

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

@@ -3435,4 +3435,5 @@
     <string name="app_mode_osm">OSM</string>
     <string name="select_nav_icon_descr">僅在導航或移動時，您才會看到該圖示。</string>
     <string name="select_map_icon_descr">地圖圖示只會顯示在地圖上，並會在導航時換成導航圖示。</string>
+    <string name="logcat_buffer_descr">在這裡您可以檢視及分享應用程式的紀錄檔</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -11,9 +11,9 @@
 	Thx - Hardy
 
 -->
-    <string name="logcat_buffer_descr">Here you can see and share logs of the application</string>
-    <string name="file_does_not_contain_routing_rules">\'%1$s\' file doesn\'t contain routing rules, please choose another file.</string>
-    <string name="not_support_file_type_with_ext">Not supported file type. You need to select a file with %1$s extension.</string>
+    <string name="logcat_buffer_descr">Check and share detailed logs of the application</string>
+    <string name="file_does_not_contain_routing_rules">No routing rules in \'%1$s\'. Please choose another file.</string>
+    <string name="not_support_file_type_with_ext">Select a supported %1$s extension file instead.</string>
     <string name="import_from_file">Import from file</string>
     <string name="import_routing_file">Import routing file</string>
     <string name="import_profile">Import profile</string>
@@ -21,94 +21,94 @@
     <string name="multimedia_notes_prefs_descr">Picture size, audio and video quality</string>
     <string name="osm_editing_prefs_descr">Login, password, offline editing</string>
     <string name="accessibility_prefs_descr">Choose icon, color and name</string>
-    <string name="live_monitoring_descr">Allow you to share current location using trip recording.</string>
+    <string name="live_monitoring_descr">Allows sharing current location using trip recording.</string>
     <string name="live_monitoring">Online tracking</string>
     <string name="save_track_logging_accuracy">Logging accuracy</string>
-    <string name="tracks_view_descr">You can find all your recorded tracks in Menu — My place — Tracks or in OsmAd folder using file manager.</string>
-    <string name="multimedia_notes_view_descr">You can find all your notes in Menu — My places — Notes</string>
+    <string name="tracks_view_descr">Your recorded tracks are in \'Menu\' → \'My place\' → \'Tracks\', or the OsmAnd folder.</string>
+    <string name="multimedia_notes_view_descr">Your OSM notes are in \'Menu\' → \'My places\' → \'OSM edits\'.</string>
     <string name="video_notes">Video notes</string>
     <string name="photo_notes">Photo notes</string>
     <string name="route_recalculation">Route recalculation</string>
     <string name="accessibility_announce">Announce</string>
     <string name="login_and_pass">Username and password</string>
-    <string name="plugin_global_prefs_info">This plugin settings are global, and apply to all profiles.</string>
-    <string name="osm_editing">OpenStreetMap Editing</string>
-    <string name="osm_edits_view_descr">You can view all your unuploaded edits or osm bugs in Menu — My places — OSM Edits. Uploaded points don’t show in OsmAnd.</string>
+    <string name="plugin_global_prefs_info">These settings apply to all profiles.</string>
+    <string name="osm_editing">OSM editing</string>
+    <string name="osm_edits_view_descr">View your edits or OSM bugs not yet uploaded in \'Menu\' → \'My places\' — \'OSM edits\'. Uploaded points will not show any more.</string>
     <string name="app_mode_osm">OSM</string>
-    <string name="select_nav_icon_descr">You will see the icon only while navigation or while moving.</string>
-    <string name="select_map_icon_descr">Map icon appears only on the map, and changing while navigation to navigation icon.</string>
+    <string name="select_nav_icon_descr">Icon only shown while navigating or moving.</string>
+    <string name="select_map_icon_descr">Map icon only shown on the map.</string>
     <string name="ltr_or_rtl_combine_via_space">%1$s %2$s</string>
     <string name="ltr_or_rtl_combine_via_colon">%1$s: %2$s</string>
-    <string name="reset_confirmation_descr">By clicking %1$s, you will lose all your changes.</string>
-    <string name="reset_all_profile_settings_descr">All profile settings will be reset to the state after installation.</string>
-    <string name="reset_all_profile_settings">Reset all profile settings to default?</string>
-    <string name="select_navigation_icon">Select navigation icon</string>
-    <string name="select_map_icon">Select map icon</string>
-    <string name="delete_profiles_descr">After you tap Apply, deleted profiles will be lost completely.</string>
+    <string name="reset_confirmation_descr">Tapping %1$s will discard all your changes.</string>
+    <string name="reset_all_profile_settings_descr">Reset all profile settings to installation defaults.</string>
+    <string name="reset_all_profile_settings">Reset all profile settings?</string>
+    <string name="select_navigation_icon">Navigation icon</string>
+    <string name="select_map_icon">Map icon</string>
+    <string name="delete_profiles_descr">Tapping \'Apply\' deletes removed profiles permanently.</string>
     <string name="master_profile">Master profile</string>
     <string name="select_color">Select color</string>
     <string name="rendering_value_thick_name">Thick</string>
-    <string name="desert_render_descr">For deserts and other sparsely populated areas. Displays more detail on a viewing scale.</string>
+    <string name="desert_render_descr">For deserts and other sparsely populated areas. More detailed.</string>
     <string name="shared_string_downloading_formatted">Downloading %s</string>
-    <string name="edit_profiles_descr">You can’t delete default OsmAnd profiles, but you can disable them in previous screen, or move them to the bottom.</string>
+    <string name="edit_profiles_descr">OsmAnd default profiles cannot be deleted, but disabled (on the previous screen), or be sorted to the bottom.</string>
     <string name="edit_profiles">Edit profiles</string>
-    <string name="select_nav_profile_dialog_message">Navigation type affects the rules for route calculations.</string>
+    <string name="select_nav_profile_dialog_message">The \'Navigation type\' governs how routes are calculated.</string>
     <string name="distance_and_address">%1$s • %2$s</string>
     <string name="street_city">%1$s, %2$s</string>
     <string name="personal_category_name">Personal</string>
-    <string name="add_new_profile_q">Add new profile \'%1$s\'?</string>
+    <string name="add_new_profile_q">Add the new profile \'%1$s\'?</string>
     <string name="save_heading">Include heading</string>
-    <string name="save_heading_descr">Save heading to each trackpoint while recording.</string>
+    <string name="save_heading_descr">Save heading to each track point while recording.</string>
     <string name="profile_appearance">Profile appearance</string>
-    <string name="choose_icon_color_name">Choose icon, color and name</string>
-    <string name="reorder_profiles">Edit profiles list</string>
+    <string name="choose_icon_color_name">Icon, color and name</string>
+    <string name="reorder_profiles">Edit profile list</string>
     <string name="selected_profile">Selected profile</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Node networks</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Show node network cycle routes</string>
     <string name="join_segments">Join segments</string>
     <string name="download_map_dialog">Download map dialog</string>
     <string name="dialogs_and_notifications_title">Dialogs and notifications</string>
-    <string name="dialogs_and_notifications_descr">Control popups, dialogs and notifications that OsmAnd show during usage.</string>
+    <string name="dialogs_and_notifications_descr">Control popups, dialogs and notifications.</string>
     <string name="suggested_maps">Suggested maps</string>
-    <string name="suggested_maps_descr">Those maps are required to use with plugin</string>
+    <string name="suggested_maps_descr">These maps are required for the plugin.</string>
     <string name="added_profiles">Added profiles</string>
-    <string name="added_profiles_descr">Plugin adds new profile to OsmAnd</string>
+    <string name="added_profiles_descr">Profiles added by plugin</string>
     <string name="shared_string_turn_off">Turn off</string>
     <string name="new_plugin_added">New plugin added</string>
     <string name="clear_confirmation_msg">Clear %1$s?</string>
     <string name="shared_string_revert">Revert</string>
     <string name="track_saved">Track saved</string>
     <string name="empty_filename">File name is empty</string>
-    <string name="default_speed_dialog_msg">Used to estimate arrival time for unknown type of roads and to limit speed for all roads (could change the route)</string>
+    <string name="default_speed_dialog_msg">Estimates arrival time for unknown road types, and limits speed for all roads (may affect routing)</string>
     <string name="rendering_value_white_name">White</string>
     <string name="swap_two_places">Swap %1$s and %2$s</string>
     <string name="route_start_point">Starting point</string>
     <string name="export_profile">Export profile</string>
     <string name="exported_osmand_profile">OsmAnd profile: %1$s</string>
-    <string name="overwrite_profile_q">Profile \'%1$s\' already exists. Overwrite?</string>
+    <string name="overwrite_profile_q">\'%1$s\' already exists. Overwrite?</string>
     <string name="export_profile_failed">Could not export profile.</string>
-    <string name="profile_import">Profile import</string>
-    <string name="profile_import_descr">To import a profile, select its file on the device and open it with OsmAnd.</string>
+    <string name="profile_import">Import profile</string>
+    <string name="profile_import_descr">Add a profile by opening its file with OsmAnd.</string>
     <string name="file_import_error">%1$s import error: %2$s</string>
-    <string name="file_imported_successfully">%1$s successfully imported.</string>
-    <string name="tts_initialization_error">Cannot start text-to-speech engine</string>
-    <string name="layer_osm_edits">OSM Edits</string>
-    <string name="quick_action_contour_lines_descr">A toggle to show or hide contour lines on the map.</string>
+    <string name="file_imported_successfully">%1$s imported.</string>
+    <string name="tts_initialization_error">Cannot start text-to-speech engine.</string>
+    <string name="layer_osm_edits">OSM edits</string>
+    <string name="quick_action_contour_lines_descr">Button showing or hiding contour lines on the map.</string>
     <string name="quick_action_contour_lines_show">Show contour lines</string>
     <string name="quick_action_contour_lines_hide">Hide contour lines</string>
     <string name="quick_action_show_hide_contour_lines">Show/hide contour lines</string>
-    <string name="quick_action_hillshade_descr">A toggle to show or hide hillshade on the map.</string>
+    <string name="quick_action_hillshade_descr">A button to show or hide hillshades on the map.</string>
     <string name="quick_action_hillshade_show">Show hillshade</string>
     <string name="quick_action_hillshade_hide">Hide hillshade</string>
     <string name="quick_action_show_hide_hillshade">Show/hide hillshade</string>
-    <string name="apply_preference_to_all_profiles">You can apply this change to all profiles or only to the currently selected one.</string>
+    <string name="apply_preference_to_all_profiles">You can apply this change to all or only the selected profile.</string>
     <string name="shared_preference">Shared</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer unpaved roads</string>
-    <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer unpaved roads.</string>
+    <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer unpaved over paved roads for routing.</string>
     <string name="release_3_5">
     • Updated app and profile settings: Settings are now arranged by type. Each profile can be customized separately.\n\n
     • New map download dialog suggesting a map to download while browsing\n\n
-    • Night theme fixes\n\n
+    • Dark theme fixes\n\n
     • Fixed several routing issues around the world\n\n
     • Updated basemap with more detailed road network\n\n
     • Fixed flooded areas around the world\n\n
@@ -149,8 +149,8 @@
     <string name="paste_Osmand_data_folder_path">Paste path to the folder with OsmAnd data</string>
     <string name="change_osmand_data_folder_question">Change OsmAnd data folder?</string>
     <string name="move_maps_to_new_destination">Move to the new destination</string>
-    <string name="internal_app_storage_description">Internal storage, hidden from user and other apps, exclusively accessible to OsmAnd</string>
-    <string name="change_data_storage_folder">Change data storage folder</string>
+    <string name="internal_app_storage_description">Internal storage for OsmAnd, (hidden from users and other apps).</string>
+    <string name="change_data_storage_folder">Change storage folder</string>
     <string name="rendering_attr_piste_type_snow_park_name">Terrain park</string>
     <string name="rendering_attr_piste_type_sleigh_name">Sleigh</string>
     <string name="rendering_attr_piste_type_sled_name">Sled</string>
@@ -199,7 +199,7 @@
     <string name="list_of_installed_plugins">Installed plugins</string>
     <string name="configure_navigation">Configure navigation</string>
     <string name="general_settings_profile_descr">App theme, units, region</string>
-    <string name="screen_alerts_descr">Alerts are shown in the bottom left during navigation.</string>
+    <string name="screen_alerts_descr">Alerts shown bottom left during navigation.</string>
     <string name="language_and_output">Language and output</string>
     <string name="reset_to_default">Reset to default</string>
     <string name="manage_profiles_descr">Create, import, edit profiles</string>
@@ -213,7 +213,7 @@
     <string name="shared_string_other">Other</string>
     <string name="vehicle_parameters_descr">Weight, height, speed</string>
     <string name="vehicle_parameters">Vehicle parameters</string>
-    <string name="voice_announces_info">Voice announcements only happen during navigation.</string>
+    <string name="voice_announces_info">Voice announcements only occur during navigation.</string>
     <string name="voice_announces_descr">Navigation instructions and announcements</string>
     <string name="voice_announces">Voice prompts</string>
     <string name="screen_alerts">Screen alerts</string>
@@ -275,16 +275,16 @@
     <string name="routing_attr_max_num_changes_name">Number of changes</string>
     <string name="app_mode_ufo">UFO</string>
     <string name="release_3_4">
-        • App profiles: Create a custom profile for your own needs, with a custom icon and color\n\n
-        • Now customize any profile\'s default and min/max speeds\n\n
-        • Added a widget for the current coordinates\n\n
-        • Added options to show the compass and a radius ruler on the map\n\n
-        • Fix background track logging\n\n
-        • Improved background map downloads\n\n
-        • Returned \'Turn screen on\' option\n\n
-        • Fixed Wikipedia language selection\n\n
-        • Fixed compass button behavior during navigation\n\n
-        • Other bugfixes\n\n
+    • App profiles: Create a custom profile for your own needs, with a custom icon and color\n\n
+    • Now customize any profile\'s default and min/max speeds\n\n
+    • Added a widget for the current coordinates\n\n
+    • Added options to show the compass and a radius ruler on the map\n\n
+    • Fix background track logging\n\n
+    • Improved background map downloads\n\n
+    • Returned \'Turn screen on\' option\n\n
+    • Fixed Wikipedia language selection\n\n
+    • Fixed compass button behavior during navigation\n\n
+    • Other bugfixes\n\n
     </string>
     <string name="precision_hdop_and_vdop">Horizontal precision: %1$s, vertical: %2$s</string>
     <string name="precision_hdop">Horizontal precision: %s</string>
@@ -355,7 +355,7 @@
     <string name="base_profile_descr_car">Car, truck, motorcycle</string>
     <string name="base_profile_descr_bicycle">Mountain bike, moped, horse</string>
     <string name="base_profile_descr_pedestrian">Walking, hiking, running</string>
-    <string name="base_profile_descr_public_transport">All PT types</string>
+    <string name="base_profile_descr_public_transport">Public transport types</string>
     <string name="base_profile_descr_boat">Ship, rowing, sailing</string>
     <string name="base_profile_descr_aircraft">Airplane, gliding</string>
     <string name="routing_profile_geocoding">Geocoding</string>
@@ -382,7 +382,6 @@
     <string name="public_transport_calc_pedestrian">Calculate route on foot</string>
     <string name="public_transport_type">Transport type</string>
     <string name="send_log">Send log</string>
-
     <string name="routing_attr_avoid_tram_name">No trams</string>
     <string name="routing_attr_avoid_tram_description">Avoids trams</string>
     <string name="routing_attr_avoid_bus_name">No buses</string>
@@ -396,10 +395,10 @@
     <string name="routing_attr_avoid_ferry_name">No ferries</string>
     <string name="routing_attr_avoid_ferry_description">Avoids ferries</string>
     <!-- string name="release_3_3_7">
-        • Display the time between transfers in public transport\n\n
-        • Corrected UI for the Route Details\n\n
-        • Fixed dark theme in the \'Direction menu\' and \'Route Details\'\n\n
-        • Display azimuth in \'Measure Distance\'\n\n
+    • Display the time between transfers in public transport\n\n
+    • Corrected UI for the Route Details\n\n
+    • Fixed dark theme in the \'Direction menu\' and \'Route Details\'\n\n
+    • Display azimuth in \'Measure Distance\'\n\n
     </string -->
     <string name="shared_string_degrees">Degrees</string>
     <string name="shared_string_milliradians">Milliradians</string>
@@ -467,14 +466,14 @@
 	<string name="rendering_attr_highway_class_track_grade4_name">Grade 4</string>
 	<string name="rendering_attr_highway_class_track_grade5_name">Grade 5</string>
     <!-- string name="release_3_3">
-        • New \'Directions\' screen: Displays Home and Work destination buttons, \'previous route\' shortcut, list of active GPX tracks and markers, search history\n\n
-        • Additional info under \'Route details\': road types, surface, steepness, smoothness\n\n
-        • Public transport navigation supporting all kinds of transportation: metro, bus, tram, etc.\n\n
-        • New Quick action for show/hide tracks and day/night modes\n\n
-        • Fixed areas displayed as flooded in Germany, South Africa, Quebec\n\n
-        • Additional support for KML and KMZ import\n\n
-        • Fixed crashes on opening some public transport stops\n\n
-        • Removed Facebook and Firebase analytics from the free version (OsmAnd+ doesn\'t include it)\n\n
+    • New \'Directions\' screen: Displays Home and Work destination buttons, \'previous route\' shortcut, list of active GPX tracks and markers, search history\n\n
+    • Additional info under \'Route details\': road types, surface, steepness, smoothness\n\n
+    • Public transport navigation supporting all kinds of transportation: metro, bus, tram, etc.\n\n
+    • New Quick action for show/hide tracks and day/night modes\n\n
+    • Fixed areas displayed as flooded in Germany, South Africa, Quebec\n\n
+    • Additional support for KML and KMZ import\n\n
+    • Fixed crashes on opening some public transport stops\n\n
+    • Removed Facebook and Firebase analytics from the free version (OsmAnd+ doesn\'t include it)\n\n
     </string -->
     <string name="use_osm_live_public_transport_description">Enable public transport for OsmAnd Live changes.</string>
     <string name="use_osm_live_public_transport">OsmAnd Live public transport</string>
@@ -488,7 +487,7 @@
     <string name="show_more">Show more</string>
     <string name="tracks_on_map">Displayed tracks</string>
     <string name="quick_action_show_hide_gpx_tracks">Show/hide GPX tracks</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">A toggle to show or hide selected GPX tracks on the map.</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">A button to show or hide selected GPX tracks on the map.</string>
     <string name="quick_action_gpx_tracks_hide">Hide GPX Tracks</string>
     <string name="quick_action_gpx_tracks_show">Show GPX Tracks</string>
     <string name="add_destination_query">Please set the destination first</string>
@@ -533,7 +532,7 @@
     <string name="osm_live_payment_renews_annually">Renews annually</string>
     <string name="default_price_currency_format">%1$.2f %2$s</string>
     <string name="osm_live_payment_header">Payment interval:</string>
-    <string name="osm_live_payment_contribute_descr">Donations help fund OpenStreetMap cartography.</string>
+    <string name="osm_live_payment_contribute_descr">Donations help fund OSM cartography.</string>
     <string name="markers_remove_dialog_msg">Delete map marker \'%s\'?</string>
     <string name="edit_map_marker">Edit map marker</string>
     <string name="third_party_application">Third-party app</string>
@@ -600,7 +599,6 @@
     <string name="show_images">Show images</string>
     <string name="purchase_cancelled_dialog_title">You have canceled your OsmAnd Live subscription</string>
     <string name="purchase_cancelled_dialog_descr">Renew subscription to continue using all the features:</string>
-
     <string name="maps_you_need_descr">Based on the articles you bookmarked, the following maps are recommended for you to download:</string>
     <string name="maps_you_need">Maps you need</string>
     <string name="osmand_team">OsmAnd team</string>
@@ -692,13 +690,13 @@
     <string name="show_closed_notes">Show closed notes</string>
     <string name="switch_osm_notes_visibility_desc">Show/hide OSM notes on the map.</string>
     <string name="gpx_file_desc">GPX - suitable for export to JOSM or other OSM editors.</string>
-    <string name="osc_file_desc">OSC - suitable for export to OpenStreetMap.</string>
+    <string name="osc_file_desc">OSC - suitable for export to OSM.</string>
     <string name="shared_string_gpx_file">GPX file</string>
     <string name="osc_file">OSC file</string>
     <string name="choose_file_type">Select filetype</string>
-    <string name="osm_edits_export_desc">Select the export type: OSM notes, POIs, or both.</string>
+    <string name="osm_edits_export_desc">Export as OSM notes, POIs, or both.</string>
     <string name="all_data">All data</string>
-    <string name="osm_notes">OSM Notes</string>
+    <string name="osm_notes">OSM notes</string>
     <string name="will_open_tomorrow_at">Opens tomorrow at</string>
     <string name="rendering_attr_hidePOILabels_name">POI labels</string>
     <string name="shared_string_without_name">Without name</string>
@@ -728,16 +726,16 @@
     <string name="shared_string_actions">Actions</string>
     <string name="shared_string_marker">Marker</string>
     <string name="empty_state_osm_edits">Create or modify OSM objects</string>
-    <string name="empty_state_osm_edits_descr">Create or modify OSM POIs, open or comment OSM Notes, and contribute recorded GPX files.</string>
+    <string name="empty_state_osm_edits_descr">Create or modify OSM POIs, open or comment OSM notes, and contribute recorded GPX files.</string>
     <string name="shared_string_deleted">Deleted</string>
     <string name="shared_string_edited">Edited</string>
     <string name="shared_string_added">Added</string>
     <string name="marker_activated">Marker %s activated.</string>
     <string name="one_tap_active_descr">Tap a marker on the map to move it to the top of the active markers without opening the context menu.</string>
     <string name="one_tap_active">\'One tap\' active</string>
-    <string name="empty_state_av_notes">Take notes!</string>
+    <string name="empty_state_av_notes">Make notes!</string>
     <string name="empty_state_av_notes_desc">Add audio, video or photo note to every point on the map, using widget or context menu.</string>
-    <string name="notes_by_date">Notes by date</string>
+    <string name="notes_by_date">OSM notes by date</string>
     <string name="by_date">By date</string>
     <string name="by_type">By type</string>
     <string name="looking_for_tracks_with_waypoints">Looking for tracks with waypoints</string>
@@ -818,7 +816,7 @@
     <string name="ascendingly">A-Z</string>
     <string name="date_added">Added</string>
     <string name="order_by">Order by:</string>
-    <string name="marker_show_distance_descr">Select how to indicate distance and direction to map markers on the map screen:</string>
+    <string name="marker_show_distance_descr">Select how to indicate distance and direction to map markers on the map:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Map orientation threshold</string>
     <string name="map_orientation_change_in_accordance_with_speed_descr">Select speed of switching orientation from \'Movement direction\' to \'Compass directon\' below.</string>
     <string name="all_markers_moved_to_history">All map markers moved to history</string>
@@ -838,7 +836,7 @@
     <string name="show_direction">Distance indication</string>
     <string name="sort_by">Sort by</string>
     <string name="do_not_use_animations">No animations</string>
-    <string name="do_not_use_animations_descr">Disables animations in the app.</string>
+    <string name="do_not_use_animations_descr">Turns off map animations.</string>
     <string name="keep_showing_on_map">Keep showing on map</string>
     <string name="exit_without_saving">Exit without saving?</string>
     <string name="line">Line</string>
@@ -858,10 +856,10 @@
     <string name="measurement_tool_action_bar">Browse the map and add points</string>
     <string name="measurement_tool">Measure distance</string>
     <string name="quick_action_resume_pause_navigation">Pause/resume navigation</string>
-    <string name="quick_action_resume_pause_navigation_descr">Tap this button to pause or resume the navigation.</string>
+    <string name="quick_action_resume_pause_navigation_descr">Button to pause or resume navigation.</string>
     <string name="quick_action_show_navigation_finish_dialog">Show \'Navigation finished\' dialog</string>
     <string name="quick_action_start_stop_navigation">Start/stop navigation</string>
-    <string name="quick_action_start_stop_navigation_descr">Tap this button to start or end the navigation.</string>
+    <string name="quick_action_start_stop_navigation_descr">Button to start or end navigation.</string>
     <string name="store_tracks_in_monthly_directories">Store recorded tracks in monthly folders</string>
     <string name="store_tracks_in_monthly_directories_descrp">Store recorded tracks in sub-folders per recording month (like 2018-01).</string>
     <string name="shared_string_reset">Reset</string>
@@ -901,10 +899,10 @@
     <string name="increase_search_radius">Increase search radius</string>
     <string name="nothing_found">Nothing found</string>
     <string name="nothing_found_descr">Change the search or increase its radius.</string>
-    <string name="quick_action_showhide_osmbugs_title">Toggle OSM Notes</string>
-    <string name="quick_action_osmbugs_show">Show OSM Notes</string>
-    <string name="quick_action_osmbugs_hide">Hide OSM Notes</string>
-    <string name="quick_action_showhide_osmbugs_descr">A toggle to show or hide OSM Notes on the map.</string>
+    <string name="quick_action_showhide_osmbugs_title">Show or hide OSM notes</string>
+    <string name="quick_action_osmbugs_show">Show OSM notes</string>
+    <string name="quick_action_osmbugs_hide">Hide OSM notes</string>
+    <string name="quick_action_showhide_osmbugs_descr">Button to show or hide OSM notes on the map.</string>
     <string name="sorted_by_distance">Sorted by distance</string>
     <string name="search_favorites">Search in Favorites</string>
     <string name="hillshade_menu_download_descr">Download the \'Hillshade Overlay\' map to show vertical shading.</string>
@@ -933,15 +931,15 @@
     <string name="select_city">Select city</string>
     <string name="select_postcode">Postcode search</string>
     <string name="quick_action_auto_zoom">Auto zoom map on/off</string>
-    <string name="quick_action_auto_zoom_desc">A toggle to turn on/off auto map zoom according to your speed.</string>
-    <string name="quick_action_auto_zoom_on">Enable auto zoom map</string>
-    <string name="quick_action_auto_zoom_off">Disable auto zoom map</string>
+    <string name="quick_action_auto_zoom_desc">Button to turn speed controlled auto zoom on or off.</string>
+    <string name="quick_action_auto_zoom_on">Turn on auto zooming</string>
+    <string name="quick_action_auto_zoom_off">Turn off auto zooming</string>
     <string name="quick_action_add_destination">Set destination</string>
     <string name="quick_action_replace_destination">Replace destination</string>
     <string name="quick_action_add_first_intermediate">Add first intermediate</string>
-    <string name="quick_action_add_destination_desc">A button to make the screen center the route destination, any previously selected destination becomes the last intermediate destination.</string>
-    <string name="quick_action_directions_from_desc">A button to make the screen center the point of departure and calculate route to the destination or open a dialog to select destination if the destination marker is not on the map.</string>
-    <string name="quick_action_replace_destination_desc">Tapping this action button makes the screen center the new route destination, replacing the previously selected destination (if any).</string>
+    <string name="quick_action_add_destination_desc">A button to make the screen center the route destination, a previously selected destination would become the last intermediate destination.</string>
+    <string name="quick_action_directions_from_desc">A button to make the screen center the point of departure. Will then ask to set destination or trigger the route calculation.</string>
+    <string name="quick_action_replace_destination_desc">A button to make the screen center the new route destination, replacing the previously selected destination (if any).</string>
     <string name="quick_action_add_first_intermediate_desc">A button to make the screen center the first intermediate destination.</string>
     <string name="no_overlay">No overlay</string>
     <string name="no_underlay">No underlay</string>
@@ -1036,7 +1034,7 @@
 	\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
 	\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 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
     \u2022 Detection of stop signs now considers driving direction\n\n
@@ -1056,7 +1054,7 @@
     <string name="rendering_attr_hideWaterPolygons_name">Hide water</string>
     <string name="routing_attr_allow_motorway_name">Use motorways</string>
     <string name="routing_attr_allow_motorway_description">Allows motorways.</string>
-    <string name="upload_osm_note_description">Upload your OSM Note anonymously or by using your OpenStreetMap.org profile.</string>
+    <string name="upload_osm_note_description">Upload your OSM note anonymously or by using your OSM.org profile.</string>
     <string name="wiki_around">Nearby Wikipedia articles</string>
     <string name="search_map_hint">City or region</string>
     <string name="route_roundabout_short">Take %1$d exit and go</string>
@@ -1114,8 +1112,8 @@
     <string name="new_filter">New filter</string>
     <string name="new_filter_desc">Please enter a name for the new filter, this will be added to your \'Categories\' tab.</string>
     <string name="osm_live_payment_desc">Subscription charged per month. Cancel it on Google Play at any time.</string>
-    <string name="donation_to_osm">Donation to OpenStreetMap community</string>
-    <string name="donation_to_osm_desc">Part of your donation is sent to the OSM users who submit changes to OpenStreetMap. The cost of the subscription remains the same.</string>
+    <string name="donation_to_osm">Donation to the OSM community</string>
+    <string name="donation_to_osm_desc">Part of your donation is sent to OSM contributors. The subscription cost remains the same.</string>
     <string name="osm_live_subscription_desc">Subscription enables hourly, daily, weekly updates, and unlimited downloads for all maps globally.</string>
     <string name="get_it">Get it</string>
     <string name="get_for">Get for %1$s</string>
@@ -1221,7 +1219,6 @@
     <string name="no_waypoints_found">No waypoints found</string>
     <string name="anonymous_user_hint">Anonymous users cannot:\n- Create groups;\n- Sync groups and devices with the server;\n- Manage groups and devices in a personal dashboard on the website.</string>
     <string name="report">Report</string>
-    
     <string name="storage_permission_restart_is_required">The app is now allowed to write to external storage, but needs to be started again to do so.</string>
     <!-- string name="release_2_3">
 	\u2022 OSM Live. Support map contributors and developers and get hourly map updates. \n\n
@@ -1235,12 +1232,12 @@
     <string name="shared_string_move_down">Move ↓</string>
     <string name="finish_navigation">Finish navigation</string>
     <string name="avoid_road">Avoid road</string>
-    <string name="storage_directory_readonly_desc">Switched to internal memory since the selected data storage folder is read only. Please select a writable storage directory.</string>
+    <string name="storage_directory_readonly_desc">Switched to internal memory since the selected data storage folder is write-protected. Please select a writable storage directory.</string>
     <string name="storage_directory_shared">Shared memory</string>
     <string name="shared_string_topbar">Top bar</string>
     <string name="full_report">Full report</string>
     <string name="recalculate_route">Recalculate route</string>
-    <string name="open_street_map_login_and_pass">OpenStreetMap username and password</string>
+    <string name="open_street_map_login_and_pass">OSM username and password</string>
     <string name="donations">Donations</string>
     <string name="number_of_recipients">Number of recipients</string>
     <string name="osm_user_stat">Edits %1$s, rank %2$s, total edits %3$s</string>
@@ -1262,20 +1259,20 @@
     <string name="osm_live_region_desc">Part of your donation will be sent to OSM users who submit changes to the map in that region.</string>
     <string name="osm_live_subscription_settings">Subscription settings</string>
     <string name="osm_live_ask_for_purchase">Please purchase a subscription to OsmAnd Live first</string>
-    <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.
-        Part of the income goes back to the OSM community and is paid out for each OSM contribution. 
-        If you love OsmAnd and OSM and want to support and be supported by them, this is the perfect way to do it.</string>
+    <string name="osm_live_header">This subscription enables hourly updates for all maps around the world.\n
+    Part of the income goes back to the OSM community and is paid out for each OSM contribution.\n
+    If you love OsmAnd and OSM and want to support and be supported by them, this is the perfect way to do it.</string>
     <string name="select_map_marker">Select map marker</string>
     <string name="map_markers_other">Other markers</string>
     <string name="upload_anonymously">Upload anonymously</string>
     <string name="show_transparency_seekbar">Show transparency seekbar</string>
-    <string name="download_files_error_not_enough_space">Not enough space!
-        {3} MB is needed temporarily, {1} MB permanently.
-        (Only {2} MB available.)</string>
-    <string name="download_files_question_space_with_temp">Download {0} file(s)?
-        {3} MB is used temporarily, {1} MB permanently. (Of {2} MB.)</string>
-    <string name="download_files_question_space">Download {0} file(s)?
-        {1} MB (of {2} MB) will be used.</string>
+    <string name="download_files_error_not_enough_space">Not enough space!\n
+    {3} MB is needed temporarily, {1} MB permanently.\n
+    (Only {2} MB available.)</string>
+    <string name="download_files_question_space_with_temp">Download {0} file(s)?\n
+    {3} MB is used temporarily, {1} MB permanently. (Of {2} MB.)</string>
+    <string name="download_files_question_space">Download {0} file(s)?\n
+    {1} MB (of {2} MB) will be used.</string>
     <string name="upload_osm_note">Upload OSM Note</string>
     <string name="map_marker_1st">First map marker</string>
     <string name="map_marker_2nd">Second map marker</string>
@@ -1556,7 +1553,7 @@
     <string name="shared_string_search">Search</string>
     <string name="shared_string_show_description">Show description.</string>
     <string name="shared_string_message">Message</string>
-    <string name="agps_data_last_downloaded">A-GPS data downloaded: %1$s</string>
+    <string name="agps_data_last_downloaded">A-GPS data downloaded: %1$s</string><!-- note: LAST is false now in new context -->
     <string name="confirm_usage_speed_cameras">In many countries (Germany, France, Italy, and others) the use of speed camera warnings is illegal. OsmAnd does not assume any liability if you violate the law. Please tap \'Yes\' only if you are eligible to use this feature.</string>
     <string name="welmode_download_maps">Download maps</string>
     <string name="welcome_select_region">To correctly reflect your traffic signs and regulations, please select your driving region:</string>
@@ -1670,18 +1667,18 @@
     <string name="track_segments">Track segments</string>
     <string name="track_points">Track points</string>
     <string name="shared_string_online_maps">Online maps</string>
-    <string name="osmand_rastermaps_plugin_description">With this plugin you can access many types of online (so called tile or raster) maps, from predefined OpenStreetMap tiles (like Mapnik) to satellite images and special purpose layers like weather maps, climate maps, geological maps, hillshade layers, etc.
-		\n\nAny of these maps can either be used as the main (base) map to be displayed on the OsmAnd map, or as an overlay or underlay to another base map (like OsmAnd\'s standard offline maps). In order to make any underlay map more visible, certain elements of the OsmAnd vector maps can easily be hidden via the \'Configure map\' menu as desired.
-		\n\nTile maps can be obtained directly via online sources, or can be prepared for offline use (and manually copied to OsmAnd\'s data folder) as an SQLite database which can be produced by a variety of 3rd party map preparation tools.
+    <string name="osmand_rastermaps_plugin_description">Access many types of online (so called tile or raster) maps, from predefined OSM tiles (like Mapnik) to satellite images, and special purpose layers like weather maps, climate maps, geological maps, hillshade layers, etc.\n\n
+    Any of these maps can either be used as the main (base) map to be displayed, or as an overlay or underlay to another base map (like OsmAnd\'s standard offline maps). Certain elements of the OsmAnd vector maps can be hidden via the \'Configure map\' menu to make any underlay map more visible.\n\n
+    Download tile maps directly online, or prepared them for offline use (manually copied to OsmAnd\'s data folder) as an SQLite database which can be produced by a variety of 3rd party map preparation tools.
 	</string>
     <string name="record_plugin_name">Trip recording</string>
-    <string name="record_plugin_description">This plugin activates the functionality to record and save your tracks by manually touching the GPX logging widget on the map, or also to automatically log all of your navigation routes to a GPX file.
-		\n\nRecorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
+    <string name="record_plugin_description">This plugin activates the functionality to record and save your tracks by manually touching the GPX logging widget on the map, or also to automatically log all of your navigation routes to a GPX file.\n\n
+    Recorded tracks can be shared with your friends or be used for OSM contributions. Athletes can use recorded tracks to monitor their trainings. Some basic track analysis can be performed directly in OsmAnd, like lap times, average speed etc., and tracks can of course also later be analyzed in special 3rd party analysis tools.
 	</string>
     <string name="srtm_paid_version_title">Contour lines plugin</string>
     <string name="osmand_srtm_short_description_80_chars">OsmAnd plugin for offline contour lines</string>
-    <string name="osmand_srtm_long_description_1000_chars">This plugin provides both a contour line overlay and a (relief) hillshade layer to be displayed on top of OsmAnd\'s standard maps. This functionality will be much appreciated by athletes, hikers, trekkers, and anybody interested in the relief structure of a landscape.
-		\n\nThe global data (between 70 ° north and 70 ° south) is based on measurements by SRTM (Shuttle Radar Topography Mission) and ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), an imaging instrument onboard Terra, the flagship satellite of NASA\'s Earth Observing System. ASTER is a cooperative effort between NASA, Japan\'s Ministry of Economy, Trade and Industry (METI), and Japan Space Systems (J-spacesystems).
+    <string name="osmand_srtm_long_description_1000_chars">This plugin provides both a contour line overlay and a (relief) hillshade layer to be displayed on top of OsmAnd\'s standard maps. This functionality will be much appreciated by athletes, hikers, trekkers, and anybody interested in the relief structure of a landscape.\n\n
+    The global data (between 70 ° north and 70 ° south) is based on measurements by SRTM (Shuttle Radar Topography Mission) and ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), an imaging instrument onboard Terra, the flagship satellite of NASA\'s Earth Observing System. ASTER is a cooperative effort between NASA, Japan\'s Ministry of Economy, Trade and Industry (METI), and Japan Space Systems (J-spacesystems).
 	</string>
     <string name="srtm_plugin_name">Contour lines</string>
     <string name="srtm_plugin_description">This plugin provides both a contour line overlay and a (relief) hillshade layer to be displayed on top of OsmAnd\'s standard maps. This functionality will be much appreciated by athletes, hikers, trekkers, and anybody interested in the relief structure of a landscape. (Please note that contour line and/or relief data are separate, additional downloads available after activating the plugin.)
@@ -1705,17 +1702,17 @@
 		\n\nActivating this view changes the map style to \'Winter and ski\', showing all landscape features under wintry conditions. This view can be reverted by either de-activating it again here, or by changing the \'Map style\' under \'Configure map\' as desired.
 	</string>
     <string name="audionotes_plugin_name">Audio/video notes</string>
-    <string name="audionotes_plugin_description">The Audio/video notes plugin provides the functionality to take audio/photography/video notes during a trip, using either a button on the map, or directly the context menu for any position on the map.</string>
+    <string name="audionotes_plugin_description">Make audio/photo/video notes during a trip, using either a map button or location context menu.</string>
     <string name="osmand_parking_plugin_name">Parking position</string>
-    <string name="osmand_parking_plugin_description">The parking position plugin lets you record where your car is parked and how much parking time is left (if there is a time limit).
-	\nBoth the location and time are visible on the OsmAnd dashboard as well as in a widget on the map. An alarm can be added to the Android calendar as a reminder.</string>
-    <string name="osmand_distance_planning_plugin_name">Distance calculator &amp; planning tool</string>
-    <string name="osmand_distance_planning_plugin_description">This plugin provides a map widget allowing creation of paths by tapping the map, or by using or modifying existing GPX files, to plan a trip and measure the distance between points. The results can be saved as a GPX file, which can later be used for guidance.</string>
+    <string name="osmand_parking_plugin_description">Lets you record where your car is parked, including how much parking time remains.\n
+    Both location and time are visible on the dashboard as well as in a map widget. An alarm reminder can be added to the Android calendar.</string>
+    <string name="osmand_distance_planning_plugin_name">Distance calculator and planning tool</string>
+    <string name="osmand_distance_planning_plugin_description">Create paths by tapping the map, or by using or modifying existing GPX files, to plan a trip and measure the distance between points. The result can be saved as a GPX file to use later for guidance.</string>
     <string name="shared_string_accessibility">Accessibility</string>
-    <string name="osmand_accessibility_description">This plugin makes the device\'s accessibility features available directly in OsmAnd. It facilitates e.g. adjusting the speech rate for text-to-speech voices, configuring directional-pad screen navigation, using a trackball for zoom control, or text-to-speech feedback, for example to auto announcing your position.</string>
-    <string name="osm_settings">OpenStreetMap editing</string>
-    <string name="osm_editing_plugin_description">Via this plugin OsmAnd can be used to make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM Notes, and contributing recorded GPX files. OSM is a community driven, global public domain mapping project. For details please refer to https://openstreetmap.org. Active participation is appreciated, and contributions can be made directly from OsmAnd, if you specify your personal OSM credentials in the app.</string>
-    <string name="osmand_development_plugin_description">This plugin displays settings for development and debugging features like to test or simulate routing, the rendering performance, or voice prompting. These settings are intended for developers and are not needed for the general user.</string>
+    <string name="osmand_accessibility_description">Makes the device\'s accessibility features directly available in OsmAnd. It facilitates e.g. adjusting the speech rate for text-to-speech voices, configuring D-pad navigation, using a trackball for zoom control, or text-to-speech feedback, for example to auto announce your position.</string>
+    <string name="osm_settings">OSM editing</string>
+    <string name="osm_editing_plugin_description">Make OSM contributions like creating or modifying OSM POI objects, opening or commenting OSM notes, and contributing recorded GPX files in OsmAnd by supplying your username and password. OSM.org is a community driven, global public domain mapping project.</string>
+    <string name="osmand_development_plugin_description">Settings for development and debugging features, like navigation simulation, rendering performance, or voice prompting. Intended for developers, not needed for normal app use.</string>
     <string name="debugging_and_development">OsmAnd development</string>
     <string name="rename_failed">Renaming failed.</string>
     <string name="days_behind">days behind</string>
@@ -1723,15 +1720,15 @@
     <string name="share_note">Share note</string>
     <string name="location_on_map">Location:\n Lat %1$s\n Lon %2$s</string>
     <string name="watch">Watch</string>
-    <string name="notes">Notes</string>
+    <string name="notes">OSM notes</string>
     <string name="online_map">Online map</string>
     <string name="roads_only">Roads only</string>
     <string name="rendering_attr_pisteRoutes_name">Ski slopes</string>
     <string name="free">Free %1$s </string>
     <string name="device_memory">Device memory</string>
     <string name="rendering_attr_pisteGrooming_name">Piste grooming</string>
-    <string name="world_ski_missing">In order to display ski maps, the special offline map needs to be downloaded</string>
-    <string name="nautical_maps_missing">In order to display nautical maps, the special offline map needs to be downloaded</string>
+    <string name="world_ski_missing">Download the special offline map to display skiing facilities.</string>
+    <string name="nautical_maps_missing">Download the special offline map to display nautical details.</string>
     <string name="edit_group">Edit group</string>
     <string name="parking_place">Parking spot</string>
     <string name="remove_the_tag">REMOVE THE TAG</string>
@@ -1882,8 +1879,6 @@
     <string name="map_preferred_locale_descr">Preferred language for labels on the map (if unavailable, English or local names will be used).</string>
     <string name="map_preferred_locale">Preferred map language</string>
     <string name="local_map_names">Local names</string>
-    <string name="lang_sw">Swahili</string>
-    <string name="lang_he">Hebrew</string>
     <string name="forward">Forward</string>
     <string name="home">Dashboard</string>
     <string name="live_monitoring_m_descr">Send tracking data to a specified web service if GPX logging is on.</string>
@@ -1980,6 +1975,7 @@
     <string name="lang_ka">Georgian</string>
     <string name="lang_de">German</string>
     <string name="lang_el">Greek</string>
+    <string name="lang_he">Hebrew</string>
     <string name="lang_iw">Hebrew</string>
     <string name="lang_hi">Hindi</string>
     <string name="lang_hu">Hungarian</string>
@@ -2001,6 +1997,7 @@
     <string name="lang_sc">Sardinian</string>
     <string name="lang_sr">Serbian (cyrillic)</string>
     <string name="lang_sr_latn">Serbian (latin)</string>
+    <string name="lang_sw">Swahili</string>
     <string name="lang_zh_cn">Chinese (Simplified)</string>
     <string name="lang_zh_hk">Chinese (Hong Kong)</string>
     <string name="lang_sk">Slovak</string>
@@ -2044,9 +2041,9 @@
     <string name="routing_attr_width_description">Specify permitted vehicle width limit on routes.</string>
     <string name="routing_attr_height_name">Height limit</string>
     <string name="routing_attr_height_description">Specify vehicle height to be permitted on routes.</string>
-    <string name="android_19_location_disabled">On Android 4.4 (KitKat) onwards, the old storage folder (%s) is deprecated. Copy all OsmAnd files to new storage location?
-        \n Note 1: Your old files will remain untouched (but can be deleted manually).
-        \n Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
+    <string name="android_19_location_disabled">On Android 4.4 (KitKat) onwards, the old storage folder (%s) is deprecated. Copy all OsmAnd files to new storage location?\n
+    Note 1: Your old files will remain untouched (but can be deleted manually).\n
+    Note 2: In the new storage location it will not be possible to share files between OsmAnd and OsmAnd+.</string>
     <string name="copying_osmand_one_file_descr">Copying file (%s) to the new destination…</string>
     <string name="copying_osmand_files_descr">Copying OsmAnd data files to the new destination (%s)…</string>
     <string name="copying_osmand_files">Copying OsmAnd data files…</string>
@@ -2105,7 +2102,7 @@
     <string name="driving_region_uk">UK, India, &amp; similar</string>
     <string name="driving_region_australia">Australia</string>
     <string name="speak_title">Announce…</string>
-    <string name="speak_descr">Set up announcement of street names, traffic warnings (forced stops, speed bumps), speed camera warnings, speed limits.</string>
+    <string name="speak_descr">Set up announcement of street names, traffic warnings (forced stops, speed bumps), speed camera warnings, and speed limits.</string>
     <string name="speak_street_names">Street names (TTS)</string>
     <string name="speak_speed_limit">Speed limit</string>
     <string name="speak_cameras">Speed cameras</string>
@@ -2144,9 +2141,9 @@
     <string name="gpx_file_name">GPX filename</string>
     <string name="gpx_saved_sucessfully">GPX file saved to {0}</string>
     <string name="use_distance_measurement_help">* Tap to mark a point.\n
-        * Long-tap the map to delete previous point.\n
-        * Long-tap on a point to view and attach description.\n
-        * Tap the measurement widget to see more actions.</string>
+    * Long-tap the map to delete previous point.\n
+    * Long-tap on a point to view and attach description.\n
+    * Tap the measurement widget to see more actions.</string>
     <string name="distance_measurement_start_editing">Start editing</string>
     <string name="distance_measurement_finish_editing">Finish editing</string>
     <string name="distance_measurement_finish_subtrack">Begin a new subtrack</string>
@@ -2206,7 +2203,7 @@
     <string name="recording_photo_description">Photo %1$s %2$s</string>
     <string name="av_def_action_picture">Take a photo</string>
     <string name="recording_context_menu_precord">Take a photo</string>
-    <string name="dropbox_plugin_description">The Dropbox plugin allows you to sync tracks and audio/video notes with your Dropbox account.</string>
+    <string name="dropbox_plugin_description">Sync tracks and audio/video notes with your Dropbox account.</string>
     <string name="dropbox_plugin_name">Dropbox plugin</string>
     <string name="intermediate_points_change_order">Change order</string>
     <string name="srtm_paid_version_msg">Please consider paying for the \'Contour lines\' plugin to support further development.</string>
@@ -2320,7 +2317,7 @@
     <string name="osmand_long_description_1000_chars">
 		OsmAnd (OSM Automated Navigation Directions)\n\n
 
-		OsmAnd is an open source software navigation app with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n
+		OsmAnd is an open source software navigation app with access to a wide variety of global OSM data. All map data (vector or tile maps) can be stored on the phone memory card for offline usage. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n
 
 		Some of the core features:\n
 		- Complete offline functionality (store downloaded vector or tile maps in the device storage)\n
@@ -2342,7 +2339,7 @@
 		OsmAnd is actively being developed and our project and its continued progress relies on financial contributions for development and testing of new functionality. Please consider buying OsmAnd+, or funding specific new features or making a general donation on https://osmand.net.
 	</string>
     <string name="osmand_extended_description_part1">
-    OsmAnd (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data.\n\n
+    OsmAnd (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OSM data.\n\n
 
     Enjoy voice and optical navigator, viewing POIs (points of interest), creating and managing GPX tracks, using contour lines visualization and altitude info (through plugin), a choice between driving, cycling, pedestrian modes, OSM editing and much more.
     </string>
@@ -2416,7 +2413,7 @@
     <string name="osmand_plus_long_description_1000_chars">
 		OsmAnd+ (OSM Automated Navigation Directions)\n\n
 
-		OsmAnd+ is an open source software navigation app with access to a wide variety of global OpenStreetMap (OSM) data. All map data (vector or tile maps) can be stored on the phone memory card for offline use. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n
+		OsmAnd+ is an open source software navigation app with access to a wide variety of global OSM data. All map data (vector or tile maps) can be stored on the phone memory card for offline use. Offline and online routing functionality is also offered, including turn-by-turn voice guidance.\n\n
 
 		OsmAnd+ is the paid app version, by buying it you support the project, fund the development of new features, and receive the latest updates.\n\n
 
@@ -2435,7 +2432,7 @@
 		-  Lane guidance, speed limit display, recorded and text-to-speech voices\n
 	</string>
     <string name="osmand_plus_extended_description_part1">
-        OsmAnd+ (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data.\n
+        OsmAnd+ (OSM Automated Navigation Directions) is a map and navigation app with access to the free, worldwide, and high-quality OSM data.\n
         Enjoy voice and optical navigation, viewing POIs (points of interest), creating and managing GPX tracks, using contour lines visualization and altitude info, a choice between driving, cycling, pedestrian modes, OSM editing and much more.\n\n
 
         OsmAnd+ is the paid app version. By buying it, you support the project, fund the development of new features, and receive the latest updates.\n\n
@@ -2559,8 +2556,8 @@
     <string name="select_animate_speedup">Route simulation speed:</string>
     <string name="global_app_allocated_memory_descr">Allocated memory %1$s MB (Android limit %2$s MB, Dalvik %3$s MB).</string>
     <string name="global_app_allocated_memory">Allocated memory</string>
-    <string name="native_app_allocated_memory_descr">Total native memory allocated by app %1$s MB (Dalvik %2$s MB, other %3$s MB).
-		Proportional memory %4$s MB (Android limit %5$s MB, Dalvik %6$s MB).</string>
+    <string name="native_app_allocated_memory_descr">Total native memory allocated by app %1$s MB (Dalvik %2$s MB, other %3$s MB).\n
+    Proportional memory %4$s MB (Android limit %5$s MB, Dalvik %6$s MB).</string>
     <string name="native_app_allocated_memory">Total native memory</string>
     <string name="starting_point_too_far">Point of departure too far from nearest road.</string>
     <string name="shared_location">Shared location</string>
@@ -2706,13 +2703,13 @@
     <string name="offline_edition_descr">Always use offline editing.</string>
     <string name="update_poi_does_not_change_indexes">POI changes inside app do not affect downloaded map files, changes are saved as a file on your device instead.</string>
     <string name="local_openstreetmap_uploading">Uploading…</string>
-    <string name="local_openstreetmap_were_uploaded">{0} POI/Notes were uploaded</string>
+    <string name="local_openstreetmap_were_uploaded">{0} POI/notes were uploaded</string>
     <string name="local_openstreetmap_uploadall">Upload all</string>
     <string name="local_openstreetmap_upload">Upload edit to OSM</string>
     <string name="local_openstreetmap_delete">Delete edit</string>
     <string name="local_openstreetmap_descr_title">Asynchronous OSM editing:</string>
-    <string name="local_openstreetmap_settings">OSM POIs/Notes saved on device</string>
-    <string name="local_openstreetmap_settings_descr">Show and manage OSM POIs/Notes noted in database on device.</string>
+    <string name="local_openstreetmap_settings">OSM- POIs/-notes saved on device</string>
+    <string name="local_openstreetmap_settings_descr">Show and manage OSM- POIs/-notes in your device database.</string>
     <string name="live_monitoring_interval_descr">Specify the online tracking interval.</string>
     <string name="live_monitoring_interval">Online tracking interval</string>
     <string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}.</string>
@@ -2880,6 +2877,7 @@
     <string name="level_to_switch_vector_raster">Minimum vector zoom level</string>
     <string name="create_poi_link_to_osm_doc"><u>Online OSM</u> map classification with images.</string>
     <string name="error_doing_search">Could not perform offline search.</string>
+    <string name="search_offline_geo_error">Could not parse geo intent \'%s\'.</string>
     <string name="search_osm_offline">Search by geo location</string>
     <string name="system_locale">System</string>
     <string name="preferred_locale_descr">App display language (used after OsmAnd is restarted).</string>
@@ -3013,7 +3011,7 @@
     <string name="thanks_yandex_traffic">Thanks to Yandex for traffic info.</string>
     <string name="layer_yandex_traffic">Yandex traffic</string>
     <string name="layer_route">Route</string>
-    <string name="layer_osm_bugs">OSM Notes (online)</string>
+    <string name="layer_osm_bugs">OSM notes (online)</string>
     <string name="layer_poi">POI overlay…</string>
     <string name="layer_map">Map source…</string>
     <string name="menu_layers">Map layers</string>
@@ -3103,11 +3101,11 @@
     <string name="search_offline_address">Offline search</string>
     <string name="search_online_address">Online search</string>
     <string name="max_level_download_tile">Max. online zoom</string>
-    <string name="max_level_download_tile_descr">Do not browse online map tiles for zoom levels beyond this.</string>
+    <string name="max_level_download_tile_descr">Do not browse online maps for zoom levels beyond this.</string>
     <string name="route_general_information">Total distance %1$s, traveling time %2$d h %3$d min.</string>
     <string name="router_service_descr">Online or offline navigation service.</string>
     <string name="router_service">Navigation service</string>
-    <string name="sd_dir_not_accessible">The data storage folder on the memory card is not accessible!</string>
+    <string name="sd_dir_not_accessible">The storage folder on the memory card is not accessible!</string>
     <string name="download_question">Download {0} - {1} ?</string>
     <string name="download_question_exist">Offline data for {0} already exists ({1}). Update it ({2})?</string>
     <string name="address">Address</string>
@@ -3168,7 +3166,7 @@
     <string name="map_view_3d">Map View 3D</string>
     <string name="show_poi_over_map_description">Show the last used POI overlay.</string>
     <string name="show_poi_over_map">Show POI overlay</string>
-    <string name="map_tile_source_descr">Choose source of online or cached map tiles</string>
+    <string name="map_tile_source_descr">Choose source of online or cached map tiles.</string>
     <string name="map_tile_source">Tile map source</string>
     <string name="map_source">Map source</string>
     <string name="use_internet">Use the Internet</string>
@@ -3190,7 +3188,7 @@
     <string name="app_mode_pedestrian">Walking</string>
     <string name="position_on_map_center">Center</string>
     <string name="position_on_map_bottom">Bottom</string>
-    <string name="navigate_point_top_text">Input latitude &amp; longitude in the selected format (D - degrees, M - minutes, S - seconds)</string>
+    <string name="navigate_point_top_text">Input latitude and longitude in the selected format (D - degrees, M - minutes, S - seconds)</string>
     <string name="navigate_point_latitude">Latitude</string>
     <string name="navigate_point_longitude">Longitude</string>
     <string name="navigate_point_format_D">DDD.DDDDD</string>
@@ -3501,10 +3499,10 @@
     <string name="routing_attr_allow_skating_only_description">Routes groomed for freestyle or skating only without classic tracks.</string>
     <string name="routing_attr_allow_classic_only_name">Allow classic only routes</string>
     <string name="routing_attr_allow_classic_only_description">Routes groomed for classic style only without skating trails. This includes routes groomed by a smaller snowmobile with looser piste and tracks made manually by skiers.</string>
-    <string name="routing_attr_difficulty_preference_name">Prefered difficulty</string>
+    <string name="routing_attr_difficulty_preference_name">Preferred difficulty</string>
     <string name="routing_attr_difficulty_preference_description">Prefer routes of this difficulty, although routing over harder or easier pistes is still possible if shorter.</string>
     <string name="routing_attr_freeride_policy_name">Off-piste</string>
-    <string name="routing_attr_freeride_policy_description">Freeride and offpiste are unofficial routes and passages. Typically ungroomed, unmaintained by the officials and not checked in the evening. Enter at your own risk.</string>
+    <string name="routing_attr_freeride_policy_description">\'Freeride\' and \'Off-piste\' are unofficial routes and passages. Typically ungroomed, unmaintained and not checked in the evening. Enter at your own risk.</string>
 
 
 </resources>

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

@@ -76,7 +76,7 @@ public class PerformLiveUpdateAsyncTask
 		final OsmandApplication application = getMyApplication();
 		final OsmandSettings settings = application.getSettings();
 		if (result.errorMessage != null) {
-			LOG.info(result.errorMessage);
+			LOG.info("Error message: " + result.errorMessage);
 			if (userRequested) {
 				application.showShortToastMessage(result.errorMessage);
 			}
@@ -84,8 +84,8 @@ public class PerformLiveUpdateAsyncTask
 		} else {
 			settings.LIVE_UPDATES_RETRIES.resetToDefault();
 			List<IncrementalChangesManager.IncrementalUpdate> ll = result.getItemsForUpdate();
+			LOG.debug("Updates quantity: " + (ll == null ? "null" : ll.size()));
 			if (ll != null && !ll.isEmpty()) {
-				LOG.debug("Updates quantity: " + ll.size());
 				ArrayList<IndexItem> itemsToDownload = new ArrayList<>(ll.size());
 				for (IncrementalChangesManager.IncrementalUpdate iu : ll) {
 					IndexItem indexItem = new IndexItem(iu.fileName, "Incremental update",

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

@@ -208,6 +208,9 @@ public class MapTileLayer extends BaseMapLayer {
 
 					}
 					if (bmp != null) {
+						if (bmp.getWidth() != tileSize && bmp.getWidth() > 0) {
+							tileSize = bmp.getWidth();
+						}
 						int xZoom = (tileX % div) * tileSize / div;
 						int yZoom = (tileY % div) * tileSize / div;
 						// nice scale
@@ -270,11 +273,7 @@ public class MapTileLayer extends BaseMapLayer {
 		}
 	}
 	
-	public int getSourceTileSize() {
-		return map == null ? 256 : map.getTileSize();
-	}
-	
-	
+
 	@Override
 	public int getMaximumShownMapZoom() {
 		return map == null ? 20 : map.getMaximumZoomSupported() + OVERZOOM_IN;

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

@@ -605,14 +605,15 @@ public class TurnPathHelper {
 				} else {
 					turnResource = null;
 				}
-			} else if (TurnType.isSlightTurn(firstTurnType) && !TurnType.isSlightTurn(secondTurnType)
-					&& !TurnType.isSlightTurn(thirdTurnType)) {
+			} else if (firstTurnType != TurnType.C && TurnType.isSlightTurn(firstTurnType)
+					&& !TurnType.isSlightTurn(secondTurnType) && !TurnType.isSlightTurn(thirdTurnType)) {
 				if (TurnType.isLeftTurn(firstTurnType) && TurnType.isRightTurn(secondTurnType)
 						&& TurnType.isLeftTurn(thirdTurnType)){
 					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
 				} else if (TurnType.isRightTurn(firstTurnType) && TurnType.isLeftTurn(secondTurnType)
 						&& TurnType.isRightTurn(thirdTurnType)) {
-					turnResource = new TurnResource(secondTurnType, true, false, leftSide); }
+					turnResource = new TurnResource(secondTurnType, true, false, leftSide);
+				}
 			} else if (firstTurnType == TurnType.C || thirdTurnType == TurnType.C) {
 				// get the small one
 				turnResource = new TurnResource(secondTurnType, true, false, leftSide);