diff --git a/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png
new file mode 100644
index 0000000000..053d6cec0e
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_groped_by_type.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_shield_marker_point_color.png b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_color.png
new file mode 100644
index 0000000000..d450f26b27
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_color.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_shield_marker_point_shadow.png b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_shadow.png
new file mode 100644
index 0000000000..5a532cf41c
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_shadow.png differ
diff --git a/OsmAnd/res/drawable-hdpi/map_shield_marker_point_stroke.png b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_stroke.png
new file mode 100644
index 0000000000..5398836fea
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/map_shield_marker_point_stroke.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png
new file mode 100644
index 0000000000..ba27a4d5f7
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_groped_by_type.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_shield_marker_point_color.png b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_color.png
new file mode 100644
index 0000000000..a1064e4a72
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_color.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_shield_marker_point_shadow.png b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_shadow.png
new file mode 100644
index 0000000000..d0f07acc69
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_shadow.png differ
diff --git a/OsmAnd/res/drawable-mdpi/map_shield_marker_point_stroke.png b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_stroke.png
new file mode 100644
index 0000000000..cb183db658
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/map_shield_marker_point_stroke.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png
new file mode 100644
index 0000000000..316829aef0
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_groped_by_type.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_color.png b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_color.png
new file mode 100644
index 0000000000..c16e77acfa
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_color.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_shadow.png b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_shadow.png
new file mode 100644
index 0000000000..03c2ac4cb8
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_shadow.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_stroke.png b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_stroke.png
new file mode 100644
index 0000000000..a580882ce0
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/map_shield_marker_point_stroke.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png b/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png
new file mode 100644
index 0000000000..1a8867bb24
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_groped_by_type.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_color.png b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_color.png
new file mode 100644
index 0000000000..fd1834ef5d
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_color.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_shadow.png b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_shadow.png
new file mode 100644
index 0000000000..63fe9aca4a
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_shadow.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_stroke.png b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_stroke.png
new file mode 100644
index 0000000000..aa7810c72c
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/map_shield_marker_point_stroke.png differ
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 451e65fc90..8a27f3e6e8 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -947,7 +947,7 @@ Miesca parkoŭkі і čas vіdać na paneli kіravańnia OsmAnd і na vіdžecie
 	<string name="gpx_visibility_txt">Bačnaść</string>
 	<string name="gpx_tags_txt">Cetlikі</string>
 	<string name="gpx_description_txt">Apіsańnie</string>
-	<string name="validate_gpx_upload_name_pwd">Kali łaska, paznačcie іmia j parol karystalnіka OSM kab adsyłać fajły GPX.</string>
+	<string name="validate_gpx_upload_name_pwd">Kali laska, paznačcie imia i paroĺ karystaĺnika OSM, kab adsylać GPX-fajly.</string>
     	<string name="default_buttons_support">Padtrymka</string>
 	<string name="support_new_features">Padtrymka novych ułaścіvaściaŭ</string>
 	<string name="support_new_features_descr">Achviaravać, kab ubačyć novyja mahčymasci, realizavanyja ŭ dastasavanni.</string>
@@ -1063,7 +1063,7 @@ Miesca parkoŭkі і čas vіdać na paneli kіravańnia OsmAnd і na vіdžecie
 	<string name="general_settings">Ahulnyja</string>
 	<string name="general_settings_descr">Nalady ekranu i ahuĺnyja nalady dastasavannia.</string>
 	<string name="global_app_settings">Ahulnyja nałady prahramy</string>
-	<string name="user_name">Vašaje іmia karystalnіka OSM</string>
+	<string name="user_name">Vaša imia karystaĺnika OSM</string>
 	<string name="open_street_map_login_descr">Patrebna dlia pradstaŭliennia ŭ openstreetmap.org.</string>
 	<string name="user_password">Vaš parol OSM</string>
 	
@@ -2731,10 +2731,10 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="wrong_user_name">Niapraviĺnaje imia karystaĺnika!</string>
     <string name="shared_string_to">Da</string>
     <string name="mapillary_menu_date_from">Ad</string>
-    <string name="mapillary_menu_descr_dates">Pahliadzieć vyjavy dadanyja ŭ peŭny pieryjad.</string>
-    <string name="mapillary_menu_title_dates">Daty</string>
+    <string name="mapillary_menu_descr_dates">Pahliadzieć toĺki dadanyja vyjavy</string>
+    <string name="mapillary_menu_title_dates">Data</string>
     <string name="mapillary_menu_edit_text_hint">Uviadzicie imia karystaĺnika</string>
-    <string name="mapillary_menu_descr_username">Pahliadzieć vyjavy dadanyja peŭnym karystaĺnikam.</string>
+    <string name="mapillary_menu_descr_username">Pahliadzieć toĺki vyjavy dadanyja</string>
     <string name="mapillary_menu_title_username">Imia karystaĺnika</string>
     <string name="mapillary_menu_filter_description">Vy možacie filtravać vyjavy pa adpraŭniku ci dacie. Filtry ŭžyvajucca tolki dla bujnoha pavieličeńnia.</string>
     <string name="shared_string_reload">Abnavić</string>
@@ -2915,4 +2915,9 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="coordinate_input_accuracy">%1$d ličbaŭ</string>
     <string name="go_to_next_field">Parajsci ŭ nastupnaje polie</string>
     <string name="rename_marker">Pierajmienavać markier</string>
+    <string name="appearance_on_the_map">Z\'jaŭliennie na mapie</string>
+    <string name="add_track_to_markers_descr">Abrać slied šliachavych kropak, jakija OsmAnd dadasć u markiery</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
+    <string name="shared_string_right">Naprava</string>
+    <string name="shared_string_left">Nalieva</string>
     </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 92e397939e..cdda322ca7 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -477,7 +477,7 @@
 	<string name="gpx_visibility_txt">Бачнасьць</string>
 	<string name="gpx_tags_txt">Цэтлікі</string>
 	<string name="gpx_description_txt">Апісаньне</string>
-	<string name="validate_gpx_upload_name_pwd">Калі ласка, пазначце імя й пароль карыстальніка OSM каб адсылаць файлы GPX.</string>
+	<string name="validate_gpx_upload_name_pwd">Калі ласка, пазначце імя і пароль карыстальніка OSM, каб адсылаць GPX-файлы.</string>
     	<string name="default_buttons_support">Падтрымка</string>
 	<string name="support_new_features">Падтрымка новых уласьцівасьцяў</string>
 	<string name="support_new_features_descr">Ахвяраваць, каб убачыць новыя магчымасці, рэалізаваныя ў дастасаванні.</string>
@@ -586,7 +586,7 @@
 	<string name="general_settings">Агульныя</string>
 	<string name="general_settings_descr">Налады экрану і агульныя налады дастасавання.</string>
 	<string name="global_app_settings">Агульныя налады праграмы</string>
-	<string name="user_name">Вашае імя карыстальніка OSM</string>
+	<string name="user_name">Ваша імя карыстальніка OSM</string>
 	<string name="open_street_map_login_descr">Патрэбна для прадстаўлення ў openstreetmap.org.</string>
 	<string name="user_password">Ваш пароль OSM</string>
 	
@@ -2780,10 +2780,10 @@
     <string name="wrong_user_name">Няправільнае імя карыстальніка!</string>
     <string name="shared_string_to">Да</string>
     <string name="mapillary_menu_date_from">Ад</string>
-    <string name="mapillary_menu_descr_dates">Паглядзець выявы даданыя ў пэўны перыяд.</string>
-    <string name="mapillary_menu_title_dates">Даты</string>
+    <string name="mapillary_menu_descr_dates">Паглядзець толькі даданыя выявы</string>
+    <string name="mapillary_menu_title_dates">Дата</string>
     <string name="mapillary_menu_edit_text_hint">Увядзіце імя карыстальніка</string>
-    <string name="mapillary_menu_descr_username">Паглядзець выявы даданыя пэўным карыстальнікам.</string>
+    <string name="mapillary_menu_descr_username">Паглядзець толькі выявы даданыя</string>
     <string name="mapillary_menu_title_username">Імя карыстальніка</string>
     <string name="mapillary_menu_filter_description">Вы можаце фільтраваць выявы па адпраўніку ці даце. Фільтры ўжываюцца толькі для буйнога павелічэння.</string>
     <string name="shared_string_reload">Абнавіць</string>
@@ -2964,4 +2964,9 @@
     <string name="show_arrows_descr">Адна ці дзве стрэлкі, якія паказваюць кірунак да актыўных маркераў, будуць паказаная на мапе.</string>
     <string name="distance_indication_descr">Выберыце, як вы хочаце, каб выглядала адлегласць да актыўных маркераў.</string>
     <string name="active_markers_descr">Выберыце, колькі накірункаў індыкатараў вы хацелі б бачыць.</string>
+    <string name="appearance_on_the_map">З\'яўленне на мапе</string>
+    <string name="add_track_to_markers_descr">Абраць след шляхавых кропак, якія OsmAnd дадасць у маркеры</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
+    <string name="shared_string_right">Направа</string>
+    <string name="shared_string_left">Налева</string>
     </resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index fcd3563634..f269478f26 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -99,7 +99,7 @@
     <string name="gpx_visibility_txt">Visibilitat</string>
     <string name="gpx_tags_txt">Etiquetes</string>
     <string name="gpx_description_txt">Descripció</string>
-    <string name="validate_gpx_upload_name_pwd">Especifiqueu el nom d\'usuari a OSM i la contrasenya per penjar els fitxers GPX.</string>
+    <string name="validate_gpx_upload_name_pwd">Especifiqueu el nom d\'usuari i la contrasenya d\'OSM per pujar fitxers GPX.</string>
     <string name="default_buttons_support">Suport</string>
     <string name="show_ruler_level">Mostra el regle</string>
     <string name="info_button">Informació</string>
@@ -174,7 +174,7 @@
     <string name="index_settings">Gestió de fitxers de mapes</string>
     <string name="general_settings">Paràmetres generals</string>
     <string name="general_settings_descr">Configureu els paràmetres generals i de visualització de l\'aplicació.</string>
-    <string name="user_name">El vostre nom d\'usuari a OSM</string>
+    <string name="user_name">El vostre nom d\'usuari d\'OSM</string>
     <string name="user_password">La vostra contrasenya a OSM</string>
     <string name="download_files_not_enough_space">No hi ha prou espai lliure per baixar %1$s MB (lliure: %2$s).</string>
     <string name="download_files_question_space">"Voleu baixar {0} fitxer(s)?  
@@ -2536,10 +2536,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="wrong_user_name">Nom d\'usuari incorrecte!</string>
     <string name="shared_string_to">Fins</string>
     <string name="mapillary_menu_date_from">Des de</string>
-    <string name="mapillary_menu_descr_dates">Mostra les imatges afegides en un període determinat.</string>
-    <string name="mapillary_menu_title_dates">Dates</string>
+    <string name="mapillary_menu_descr_dates">Mostra només les imatges afegides</string>
+    <string name="mapillary_menu_title_dates">Data</string>
     <string name="mapillary_menu_edit_text_hint">Indiqueu el nom d\'usuari</string>
-    <string name="mapillary_menu_descr_username">Mostra les imatges afegides per un usuari determinat.</string>
+    <string name="mapillary_menu_descr_username">Mostra només les imatges afegides per</string>
     <string name="mapillary_menu_title_username">Nom d\'usuari</string>
     <string name="mapillary_menu_filter_description">Podeu filtrar per remitent o per data. El filtres només s\'apliquen en apropar-se.</string>
     <string name="shared_string_reset">Restableix</string>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index 376a2c91ee..b6ba321adc 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -620,7 +620,7 @@
 	<string name="poi_bar">Bar</string>
 	<string name="poi_pub">Pub</string>
 	<string name="poi_food_court">Patio de comidas</string>
-	<string name="poi_drinking_water">Agua potable</string>
+	<string name="poi_drinking_water">Bebedero de agua potable</string>
 	<string name="poi_barbecue">Parrillero</string>
 
 	<string name="poi_craft_agricultural_engines">Motores agrícolas</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index f904a6a6aa..d3f568938e 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -586,7 +586,7 @@
 	<string name="poi_bar">Bar</string>
 	<string name="poi_pub">Pub</string>
 	<string name="poi_food_court">Patio de comidas</string>
-	<string name="poi_drinking_water">Agua potable</string>
+	<string name="poi_drinking_water">Bebedero de agua potable</string>
 	<string name="poi_barbecue">Barbacoa/Parrillero</string>
 	<string name="poi_craft_agricultural_engines">Motores agrícolas</string>
 	<string name="poi_craft_basket_maker">Mimbrería</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index ba0b3b17b8..f973c8a092 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -604,7 +604,7 @@
 	<string name="poi_village_green">Zona verde</string>
 
 	<string name="poi_food_court">Patio de comidas</string>
-	<string name="poi_drinking_water">Agua potable</string>
+	<string name="poi_drinking_water">Fuente de agua potable</string>
 	<string name="poi_craft_agricultural_engines">Motores agrícolas</string>
 	<string name="poi_craft_basket_maker">Mimbrería</string>
 	<string name="poi_craft_beekeeper">Apicultor</string>
diff --git a/OsmAnd/res/values-fa/phrases.xml b/OsmAnd/res/values-fa/phrases.xml
index b6e340c39d..bcc9877ad5 100644
--- a/OsmAnd/res/values-fa/phrases.xml
+++ b/OsmAnd/res/values-fa/phrases.xml
@@ -646,19 +646,19 @@
 
 <string name="poi_shop">مغازه</string>
 		<string name="poi_shop_food">اغذیه فروشی</string>
-	<string name="poi_fuel_avia_type">نوع</string>
+	<string name="poi_fuel_avia_type">نوع جایگاه</string>
 	<string name="poi_payment_type">نوع پرداخت</string>
 	<string name="poi_payment_fuel_type">کارت سوخت</string>
 	<string name="poi_additional_type">اضافی</string>
 	<string name="poi_internet_access_type">نوع دسترسی اینترنت</string>
-	<string name="poi_vending_type">نوع داد و ستد</string>
-	<string name="poi_bicycle_service">خدمات دوچرخه</string>
-	<string name="poi_clothes_type">نوع</string>
-	<string name="poi_shoes_type">نوع</string>
-	<string name="poi_fire_hydrant_position">موقعیت</string>
-	<string name="poi_fire_hydrant_water_source">منبع آب</string>
-	<string name="poi_payment_toll_type">نوع پرداخت</string>
-	<string name="poi_traffic_signals_sound">صدا</string>
+	<string name="poi_vending_type">نوع فروش</string>
+	<string name="poi_bicycle_service">تعمیرگاه دوچرخه</string>
+	<string name="poi_clothes_type">مدل لباس</string>
+	<string name="poi_shoes_type">مدل کفش</string>
+	<string name="poi_fire_hydrant_position">موقعیت شیر آتش نشانی</string>
+	<string name="poi_fire_hydrant_water_source">منبع آب شیر اتش نشانی</string>
+	<string name="poi_payment_toll_type">نوع عوارض پرداختی</string>
+	<string name="poi_traffic_signals_sound">صدای ترافیک</string>
 	<string name="poi_wheelchair_accessibility">دسترسی ویلچر</string>
 	<string name="poi_wheelchair_yes">بله</string>
 	<string name="poi_wheelchair_no">خیر</string>
@@ -669,35 +669,54 @@
 	<string name="poi_wheelchair_designated">ویژه</string>
 	<string name="poi_artwork_type_fountain">نوع اثر هنری: فواره</string>
 
-	<string name="poi_fuel_type">نوع</string>
-	<string name="poi_fire_hydrant_type">نوع</string>
-	<string name="poi_highway_crossing_type">نوع</string>
+	<string name="poi_fuel_type">نوع جایگاه سوخت</string>
+	<string name="poi_fire_hydrant_type">نوع شیر آتش نشانی</string>
+	<string name="poi_highway_crossing_type">‫روش عبور از بزرگراه</string>
 	<string name="poi_tactile_paving">کفپوش برجسته</string>
 	<string name="poi_automated">خودکار</string>
-	<string name="poi_parking_type">نوع</string>
+	<string name="poi_parking_type">نوع پارکینگ</string>
 	<string name="poi_covered">سرپوشیده</string>
-	<string name="poi_bicycle_parking_type">نوع</string>
-	<string name="poi_service_car">خدمات خودرو</string>
-	<string name="poi_brushless">بدون برس</string>
+	<string name="poi_bicycle_parking_type">نوع پارکینگ دوچرخه</string>
+	<string name="poi_service_car">میکانیکی</string>
+	<string name="poi_brushless">کارواش</string>
 	<string name="poi_self_service">سلف سرویس</string>
 	<string name="poi_subway_station_filter">ایستگاه مترو</string>
-	<string name="poi_ferry_terminal_cargo">باری</string>
-	<string name="poi_telescope_type">نوع</string>
-	<string name="poi_animal_training_type">نوع</string>
-	<string name="poi_embassy_type">نوع</string>
+	<string name="poi_ferry_terminal_cargo">ترمینال باربری</string>
+	<string name="poi_telescope_type">نوع تلسکوپ</string>
+	<string name="poi_animal_training_type">مر کز تربیت حیوان</string>
+	<string name="poi_embassy_type">نوع سفارت</string>
 	<string name="poi_city_capital">پایتخت</string>
-	<string name="poi_healthcare_alternative_types">تخصص</string>
-	<string name="poi_free_flying_characteristics">مشخصات</string>
-	<string name="poi_archaeological_site_type">نوع</string>
+	<string name="poi_healthcare_alternative_types">نوع درمانگاه تخصصی</string>
+	<string name="poi_free_flying_characteristics">مشخصات منطقه پروازی</string>
+	<string name="poi_archaeological_site_type">مرکز باستان شناسی</string>
 	<string name="poi_religion_type">دین</string>
 	<string name="poi_denomination">مذهب</string>
-	<string name="poi_information_type">نوع</string>
+	<string name="poi_information_type">مشخصات</string>
 	<string name="poi_information_contents">محتوا</string>
-	<string name="poi_resort_type">نوع</string>
-	<string name="poi_piste_difficulty">دشواری پیست</string>
-	<string name="poi_theatre_genre">ژانر</string>
-	<string name="poi_fee">بها</string>
+	<string name="poi_resort_type">نوع بازدید</string>
+	<string name="poi_piste_difficulty">سختی پیست</string>
+	<string name="poi_theatre_genre">ژانر تئاتر</string>
+	<string name="poi_fee">قیمت</string>
 	<string name="poi_recycling_type">نوع</string>
 	<string name="poi_shelter_type">نوع</string>
 	<string name="poi_religion_voodoo">وودو</string>
+	<string name="poi_aerialway_bicycle">ایستگاه دوچرخه</string>
+	<string name="poi_aerialway_heating">‫سیستم گرمایشی</string>
+	<string name="poi_pump">پنجرگیری دوچرخه</string>
+	<string name="poi_observatory_designation">رصدخانه</string>
+	<string name="poi_pharmacy_dispensing">داروخانه</string>
+	<string name="poi_star_rating">ستاره دار</string>
+	<string name="poi_clock_option">تنظیمات ساعت</string>
+	<string name="poi_scout_camp">کمپ گردشگری</string>
+	<string name="poi_backcountry">پشت صحنه</string>
+	<string name="poi_piste_grooming">مراقبت از پیست</string>
+	<string name="poi_outdoor_seating">تئاتر روباز</string>
+	<string name="poi_smoking">دخانیات</string>
+	<string name="poi_delivery">تحویل</string>
+	<string name="poi_drive_in">رانندگی در</string>
+	<string name="poi_drive_through">‎روش رانندگی</string>
+	<string name="poi_takeaway">‌بیرونی</string>
+	<string name="poi_cocktails">کوکتل</string>
+	<string name="poi_microbrewery">میکروبیچر</string>
+	<string name="poi_beauty_salon_service">آرایشگاه</string>
 	</resources>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index cbc16ef559..fe7012aaef 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1011,7 +1011,7 @@
 	<string name="poi_context_menu_website">نشان‌دادن وبسایت این مکان</string>
 	<string name="poi_context_menu_call">نشان‌دادن تلفن این مکان</string>
 	<string name="use_high_res_maps">نمایش با تفکیک‌پذیری بالا</string>
-	<string name="use_high_res_maps_descr">کاشی‌های نقشه را در صفحه‌نمایش‌های تراکم‌بالا نکِش و محو یا کدر نکن.</string>
+	<string name="use_high_res_maps_descr">کاشی‌های نقشه را در نمایشگرهای با تراکمِ بالا نکِش و محو یا کدر نکن.</string>
 	
 	<string name="context_menu_item_search_transport">جست‌وجو در حمل‌ونقل عمومی</string>
 	<string name="transport_searching_transport">نتایج حمل‌ونقل (بدون مقصد):</string>
@@ -1157,7 +1157,7 @@
 	<string name="vector_data_missing">داده‌های آفلاین نقشه روی کارت حافظه وجود ندارد. لطفاً برای استفاده از نقشه‌های آفلاین، آن را دانلود کنید.</string>
 	<string name="local_index_gpx_info_show">"
 \n
-\nبرای دسترسی به گزینه‌ها چند لحظه انگشت خود را بر روی صفحه‌نمایش نگه دارید"</string>
+\nبرای دسترسی به گزینه‌ها چند لحظه انگشت خود را روی نمایشگر نگه دارید"</string>
 	
 	
 	
@@ -1700,7 +1700,7 @@
 	<string name="shared_string_show_all">نمایش همه</string>
 	<string name="coordinates">مختصات</string>
 	<string name="rendering_attr_tramTrainRoutes_name">مسیرهای تراموا و قطار</string>
-	<string name="wake_on_voice">روشن‌کردن صفحه‌نمایش</string>
+	<string name="wake_on_voice">روشن‌کردن نمایشگر</string>
     <string name="dash_download_manage">مدیریت</string>
     <string name="dash_download_new_one">دانلود نقشهٔ جدید</string>
     <string name="dash_download_msg">شما %1$s نقشه دانلود کرده‌اید</string>
@@ -1759,8 +1759,8 @@
     <string name="shared_string_dismiss">نپذیرفتن</string>
     <string name="use_opengl_render">استفاده از رندرینگ OpenGL</string>
     <string name="use_opengl_render_descr">از رندرینگ سرعت‌یافتهٔ OpenGL استفاده کن (روی برخی دستگاه‌ها کار نمی‌کند).</string>
-    <string name="lock_screen_request_explanation">%1$s به این مجوز نیاز دارد تا برای صرفه‌جویی انرژی، صفحه‌نمایش را خاموش کند.</string>
-    <string name="wake_on_voice_descr">قبل از رسیدن به پیچ، صفحه‌نمایش روشن شود (اگر خاموش است).</string>
+    <string name="lock_screen_request_explanation">%1$s به این مجوز نیاز دارد تا برای صرفه‌جویی در انرژی، بتواند نمایشگر را خاموش کند.</string>
+    <string name="wake_on_voice_descr">قبل از رسیدن به پیچ، نمایشگر روشن شود (اگر خاموش است).</string>
     <string name="shared_string_never">هرگز</string>
     <string name="rendering_attr_trolleybusRoutes_name">مسیرهای اتوبوس برقی</string>
     <string name="rendering_attr_busRoutes_name">مسیرهای اتوبوس</string>
diff --git a/OsmAnd/res/values-gl/strings.xml b/OsmAnd/res/values-gl/strings.xml
index 72d7bc6b1d..4a9e3052ca 100644
--- a/OsmAnd/res/values-gl/strings.xml
+++ b/OsmAnd/res/values-gl/strings.xml
@@ -1995,7 +1995,7 @@ Lon %2$s</string>
     <string name="feedback">Opinións</string>
     <string name="contact_us">Contacte connosco</string>
     <string name="map_legend">Lenda do mapa</string>
-    <string name="hillshade_layer_disabled">Capa de sombreado desactivada</string>
+    <string name="hillshade_layer_disabled">A capa de curvas de nivel está desactivada</string>
     <string name="av_locations_descr">Ficheiro GPX con posicións das notas</string>
     <string name="plugin_touringview_name">Vista de mapa turístico</string>
 	<string name="plugin_touringview_descr">"Ao activar esta vista cámbiase o estilo do mapa de OsmAnd a «Vista turística», que é unha vista especial moi detallada para viaxeiros e condutores profesionais.
@@ -2296,7 +2296,7 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="map_widget_magnetic_bearing">Rumbo magnético</string>
     <string name="map_widget_bearing">Rumbo relativo</string>
     <string name="rendering_attr_surfaceIntegrity_name">Estado do pavimento</string>
-    <string name="translit_name_if_miss">Transliterar cando falte o nome en %1$s</string>
+    <string name="translit_name_if_miss">Transliterar se falta o nome en %1$s</string>
     <string name="osm_live_banner_desc">Obteña descargas de mapas sen límites e actualizacións de mapas máis de unha vez ao mes: cada semana, día ou hora.</string>
     <string name="no_inet_connection_desc_map">Obrigatorio para descargar mapas.</string>
     <string name="search_location">A buscar o sitio…</string>
@@ -2445,7 +2445,7 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="quick_action_add_destination">Engadir destino</string>
     <string name="quick_action_replace_destination">Substituír destino</string>
     <string name="quick_action_add_destination_desc">Ao tocar no botón de acción engádese un destino na posición central da pantalla. O destino estabelecido anteriormente convértese no último punto intermedio.</string>
-    <string name="quick_action_replace_destination_desc">Ao tocar no botón de acción substitúese o destino pola posición central da pantalla</string>
+    <string name="quick_action_replace_destination_desc">Ao tocar no botón de acción substitúese o destino pola posición central da pantalla.</string>
     <string name="quick_action_add_first_intermediate_desc">Ao tocar no botón de acción engádese un primeiro punto intermedio na posición central da pantalla.</string>
     <string name="no_overlay">Sen capas superpostas</string>
     <string name="subscribe_email_error">Erro</string>
@@ -2617,4 +2617,33 @@ Pódese pechar esta vista desactivándoa aquí ou cambiando o «Estilo de mapa»
     <string name="enter_gpx_name">Nome do ficheiro GPX:</string>
     <string name="show_on_map_after_saving">Mostrar no mapa despois de gardar</string>
     <string name="measurement_tool">Medir distancia</string>
+    <string name="appearance_on_the_map">Aparencia no mapa</string>
+    <string name="add_track_to_markers_descr">"Seleccione os puntos de pasaxe da pista que quere que OsmAnd  engada aos marcadores"</string>
+    <string name="add_group">Engadir grupo</string>
+    <string name="empty_state_markers_active_desc">Marcar lugares no mapa tocando.</string>
+    <string name="empty_state_markers_groups">Importar grupos</string>
+    <string name="shared_string_two">Dous</string>
+    <string name="shared_string_one">Un</string>
+    <string name="show_guide_line_descr">No mapa aparece unha liña que conecta a súa posición coas posicións dos marcadores activos.</string>
+    <string name="show_arrows_descr">No mapa aparecen unha ou dúas frechas que indican a dirección aos marcadores activos.</string>
+    <string name="distance_indication_descr">Escolla como lle gustaría ver a distancia aos marcadores activos.</string>
+    <string name="active_markers_descr">Escolla o número de indicadores de dirección que desexa ver.</string>
+    <string name="digits_quantity">Cantidade de díxitos</string>
+    <string name="shared_string_right">Dereita</string>
+    <string name="shared_string_left">Esquerda</string>
+    <string name="show_number_pad">Mostrar o teclado numérico</string>
+    <string name="shared_string_paste">Pegar</string>
+    <string name="coordinate_input_accuracy_description">Pasar automaticamente ao campo seguinte logo de introducir %1$d díxitos despois da coma decimal</string>
+    <string name="coordinate_input_accuracy">%1$d díxitos</string>
+    <string name="go_to_next_field">Ir ao campo seguinte</string>
+    <string name="rename_marker">Renomear o marcador</string>
+    <string name="tap_on_map_to_hide_interface">Modo de pantalla completa</string>
+    <string name="show_on_top_bar">Mostrar na barra superior</string>
+    <string name="import_as_gpx">Importar como ficheiro GPX</string>
+    <string name="import_as_favorites">Importar como Favoritos</string>
+    <string name="import_file">Importar ficheiro</string>
+	<string name="enter_new_name">Introduza o novo nome</string>
+	<string name="shared_string_back">Atrás</string>
+	<string name="view">Ver</string>
+	<string name="wrong_format">Formato erróneo</string>
     </resources>
diff --git a/OsmAnd/res/values-he/phrases.xml b/OsmAnd/res/values-he/phrases.xml
index eb018f1fff..b121d45ad5 100644
--- a/OsmAnd/res/values-he/phrases.xml
+++ b/OsmAnd/res/values-he/phrases.xml
@@ -1005,4 +1005,5 @@
 	<string name="poi_cuisine_sub">כריך באגט</string>
 	<string name="poi_cuisine_pita">פיתה</string>
 	<string name="poi_mdf">רכזת</string>
+	<string name="poi_cuisine_buschenschank">בושנשנק (טברנה אוסטרית עממית)</string>
 	</resources>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 1b7cfd424b..925ab3f0e6 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -326,20 +326,20 @@
 	<string name="amenity_type_user_defined">בהגדרת המשתמש</string>
 	<string name="fav_export_confirmation">קיים קובץ עם מועדפים שיוצאו בעבר. האם ברצונך להחליפו?</string>
 	<string name="profile_settings">הגדרות יעודיות לפרופיל</string>
-	<string name="settings_preset">פרופיל משתמש</string>
+	<string name="settings_preset">פרופיל בררת מחדל</string>
 	<string name="settings_preset_descr">נא לבחור בפרופיל משתמש עם מפה וניווט מותאמים אישית.</string>
 	<string name="routing_settings">ניווט</string>
-	<string name="routing_settings_descr">נא לציין אפשרויות ניווט</string>
+	<string name="routing_settings_descr">נא לציין אפשרויות ניווט.</string>
 	<string name="global_settings">הגדרות כלליות</string>
-	<string name="index_settings">נתונים בלתי מקוונים (הורדה)</string>
-	<string name="general_settings">הגדרות כלליות</string>
+	<string name="index_settings">ניהול קובצי מפה</string>
+	<string name="general_settings">כללי</string>
 	<string name="general_settings_descr">הגדרת תצורה כללית</string>
 	<string name="global_app_settings">הגדרות יישומים כלליות</string>
 	<string name="user_name">שם המשתמש שלך ב־OSM</string>
-	<string name="open_street_map_login_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org</string>
+	<string name="open_street_map_login_descr">נדרש לטובת שליחת נתונים אל openstreetmap.org.</string>
 	
 	<string name="user_password">הססמה שלך ב־OSM</string>
-	<string name="osmand_service">תכונת מצב השינה</string>
+	<string name="osmand_service">מצב רקע</string>
 	<string name="osmand_service_descr">יש להשתמש כדי להריץ את OsmAnd כאשר המסך כבוי</string>
 	
 	
@@ -828,11 +828,11 @@
 	<string name="osm_settings">עריכה ב־OSM</string>
 	<string name="additional_settings">הגדרות נוספות</string>
 	<string name="shared_string_settings">הגדרות</string>
-	<string name="save_current_track_descr">שמירת הדרך הנוכחית לכרטיס ה־SD כעת</string>
-	<string name="save_current_track">שמירת דרך ה־GPX הנוכחית</string>
+	<string name="save_current_track_descr">שמירת המסלול הנוכחי לכרטיס ה־SD כעת.</string>
+	<string name="save_current_track">שמירת מסלול ה־GPX הנוכחי</string>
 	<string name="save_track_interval">מרווח בין השמירות ליומן</string>
 	<string name="save_track_interval_descr">נא לבחור את הפרש בין הצבת המיקום בטוויית דרכים</string>
-	<string name="save_track_to_gpx_descrp">מסלול GPX יישמר אוטומטית לתיקיית המסלולים במהלך הניווט</string>
+	<string name="save_track_to_gpx_descrp">מסלול GPX יישמר אוטומטית לתיקיית המסלולים במהלך הניווט.</string>
 	<string name="save_track_to_gpx">הקלטת המסלול אוטומטית במהלך הניווט</string>
 	<string name="update_tile">עדכון המפה</string>
 	<string name="reload_tile">רעניון האריח</string>
@@ -878,7 +878,7 @@
 	<string name="choose_available_region">נא לבחור באזור מהרשימה</string>
 	<string name="choose_intersected_street">נא לבחור רחוב חוצה</string>
 	<string name="Closest_Amenities">נותני שירות קרובים</string>
-	<string name="app_mode_default">בררת מחדל</string>
+	<string name="app_mode_default">עיון במפה</string>
 	<string name="app_mode_car">רכב</string>
 	<string name="app_mode_bicycle">אופניים</string>
 	<string name="app_mode_pedestrian">הליכה ברגל</string>
@@ -1073,8 +1073,8 @@
     <string name="street_name">שם רחוב</string>
 	<string name="hno">מספר הבית</string>
     
-    <string name="monitoring_settings">שירותי רישום ומצב שינה</string>
-    <string name="monitoring_settings_descr">ניתן להגדיר כיצד לשמור מסלולים ולאפשר מצב שינה</string>
+    <string name="monitoring_settings">הקלטת טיולים</string>
+    <string name="monitoring_settings_descr">ניתן להגדיר כיצד לשמור את הטיולים שלך.</string>
     
     
     <string name="choose_osmand_theme_descr">בחירת ערכת העיצוב של היישום</string>
@@ -1422,13 +1422,13 @@
     <string name="routing_attr_avoid_ferries_name">הימנעות ממעבורות</string>
     <string name="routing_attr_avoid_ferries_description">הימנעות ממעבורות</string>
     <string name="routing_attr_avoid_stairs_name">הימנעות ממדרגות</string>
-    <string name="routing_attr_avoid_stairs_description">הימנעות ממדרגות</string>
+    <string name="routing_attr_avoid_stairs_description">הימנעות ממדרגות.</string>
     <string name="routing_attr_avoid_borders_name">הימנעות ממעברי גבול</string>
-    <string name="routing_attr_avoid_borders_description">הימנעות ממעבר גבול למדינה אחרת</string>
+    <string name="routing_attr_avoid_borders_description">הימנעות ממעבר גבול למדינה אחרת.</string>
     <string name="routing_attr_weight_name">הגבלת משקל</string>
-    <string name="routing_attr_weight_description">ציון משקל רכב מורשה בנתיבים</string>
+    <string name="routing_attr_weight_description">ציון משקל רכב מורשה בנתיבים.</string>
     <string name="routing_attr_height_name">מגבלת גובה</string>
-    <string name="routing_attr_height_description">ציון גובה רכב מורשה בנתיבים</string>
+    <string name="routing_attr_height_description">ציון גובה רכב מורשה בנתיבים.</string>
     <string name="copying_osmand_one_file_descr">הקובץ (%s) מועתק ליעד החדש…</string>
     <string name="copying_osmand_files_descr">קובצי הנתונים של OsmAnd מועתקים ליעד החדש (%s)…</string>
     <string name="copying_osmand_files">קובצי הנתונים של OsmAnd מועתקים…</string>
@@ -1436,7 +1436,7 @@
     <string name="app_mode_truck">משאית</string>
     <string name="guidance_preferences_descr">העדפות ניווט</string>
     <string name="routing_preferences_descr">העדפות ניתוב</string>
-    <string name="speech_rate_descr">ציון מהירות דיבור להקראה</string>
+    <string name="speech_rate_descr">ציון מהירות דיבור להקראה.</string>
     <string name="speech_rate">מהירות דיבור</string>
     <string name="complex_route_calculation_failed">חישוב נתיב במהירות נכשלה (%s), כעת יתבצע ניסיון לחישוב אטי.</string>
     <string name="disable_complex_routing">השבתת ניתוב מורכב</string>
@@ -1453,7 +1453,7 @@
     <string name="shared_string_sort">מיון</string>
     <string name="marker_save_as_track">שמירה כמסלול</string>
     <string name="move_to_history">העברה להיסטוריה</string>
-    <string name="disable_complex_routing_descr">השבתת ניתוב דו־שלבי לניווט הרכב</string>
+    <string name="disable_complex_routing_descr">השבתת ניתוב דו־שלבי לניווט הרכב.</string>
     <string name="tap_on_map_to_hide_interface">מצב מסך מלא</string>
     <string name="show_on_top_bar">הצגה בסרגל העליון</string>
     <string name="import_gpx_file_description">ניתן לייבא כנקודות מועדפות או כקובץ מסלול.</string>
@@ -1476,4 +1476,318 @@
     <string name="coordinates_format">תבנית נקודות הציון</string>
     <string name="rename_marker">שינוי שם סמן</string>
     <string name="tap_on_map_to_hide_interface_descr">נגיעה במפה מחליפה את תצוגת הכפתורים והווידג׳טים.</string>
+    <string name="appearance_on_the_map">הופעה על המפה</string>
+    <string name="add_track_to_markers_descr">נא לבחור נקודות דרך במסלול שאותן OsmAnd יצרף לסמנים</string>
+    <string name="add_favourites_group_to_markers_descr">נא לבחור איזו קבוצת מועדפים ברצונך להוסיף לסמנים</string>
+    <string name="track_waypoints">נקודות דרך במסלול</string>
+    <string name="favourites_group">קבוצת מועדפים</string>
+    <string name="add_group">הוספת קבוצה</string>
+    <string name="add_group_descr">ניתן להוסיף קבוצת מועדפים או נקודות דרך של מסלול.</string>
+    <string name="empty_state_markers_active">סמנים במפה!</string>
+    <string name="empty_state_markers_active_desc">ניתן לסמן מקומות במפה בנגיעה.</string>
+    <string name="empty_state_markers_groups">ייבוא קבוצות</string>
+    <string name="empty_state_markers_groups_desc">ניתן לייבא קבוצות מועדפים או נקודות דרך במסלול כסמנים.</string>
+    <string name="shared_string_two">שניים</string>
+    <string name="shared_string_one">אחד</string>
+    <string name="show_guide_line_descr">על המפה יופיע קו שמחבר בין המיקום שלך למיקומים של הסמנים הפעילים.</string>
+    <string name="show_arrows_descr">על המפה יופיעו חץ או שניים המציינים את כיוון הסמנים הפעילים.</string>
+    <string name="distance_indication_descr">ניתן לבחור איך ברצונך להציג את המרחק עד לסמנים הפעילים.</string>
+    <string name="active_markers_descr">נא לבחור כמה מחווני כיוון ברצונך לראות.</string>
+    <string name="digits_quantity">כמות הספרות</string>
+    <string name="shared_string_right">ימין</string>
+    <string name="shared_string_left">שמאל</string>
+    <string name="show_number_pad">הצגת מקלדת ספרות</string>
+    <string name="shared_string_paste">הדבקה</string>
+    <string name="coordinate_input_accuracy_description">מעבר אוטומטי לשדה הבא לאחר הזנת %1$d ספרות אחרי הנקודה העשרונית</string>
+    <string name="coordinate_input_accuracy">%1$d ספרות</string>
+    <string name="go_to_next_field">מעבר לשדה הבא</string>
+    <string name="waypoints_added_to_map_markers">נוספו נקודות דרך לסמני המפה</string>
+	<string name="plan_route_no_markers_toast">יש להוסיף לפחות סמן אחד כדי להשתמש בפונקציה הזאת.</string>
+    <string name="fast_coordinates_input_descr">נא לבחור תבנית קלט נקודות ציון. תמיד ניתן לשנות אותה על ידי נגיעה באפשרויות.</string>
+    <string name="fast_coordinates_input">קלט נקודות ציון מהיר</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">הימנעות מכבישי קרח, מעברי מים</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">הימנעות מכבישי קרח וממעברים על מים זורמים.</string>
+    <string name="add_location_as_first_point_descr">ניתן להוסיף המיקום שלך כנקודה ראשונה כדי לתכנן מסלול מושלם.</string>
+    <string name="coordinate_input">קלט נקודות ציון</string>
+    <string name="marker_save_as_track_descr">ייצוא הסמנים שלך לקובץ שניתן לציין כאן:</string>
+    <string name="group_will_be_removed_after_restart">הקבוצה תוסר לאחר הפעלה מחדש</string>
+    <string name="show_guide_line">הצגת קווים מנחים</string>
+    <string name="use_osm_live_routing">ניווט חי של OsmAnd</string>
+    <string name="access_no_destination">לא הוגדר יעד</string>
+    <string name="shared_string_widgets">וידג׳טים</string>
+    <string name="add_points_to_map_markers_q">להוסיף את כל הנקודות לסמני מפה?</string>
+    <string name="shared_string_add_to_map_markers">הוספת לסמני מפה</string>
+    <string name="select_map_markers">בחירת סמני מפה</string>
+    <string name="shared_string_reverse_order">היפוך הסדר</string>
+    <string name="show_map_markers_description">הפעלת תכונת סמני המפה.</string>
+    <string name="clear_active_markers_q">להסיר את כל הסמנים הפעילים?</string>
+    <string name="clear_markers_history_q">למחוק את היסטוריית סמני המפה?</string>
+    <string name="active_markers">סמנים פעילים</string>
+    <string name="map_markers">סמני מפה</string>
+    <string name="map_marker">סמן מפה</string>
+    <string name="consider_turning_polygons_off">מומלץ לכבות עיבוד מצולעים.</string>
+    <string name="rendering_attr_showMtbRoutes_name">הצגת מסלולי אופני הרים</string>
+    <string name="show_polygons">הצגת מצולעים</string>
+    <string name="find_parking">חיפוש חנייה</string>
+    <string name="shared_string_status">מצב</string>
+    <string name="shared_string_save_changes">שמירת השינויים</string>
+    <string name="shared_string_email_address">כתובת דוא״ל</string>
+    <string name="rendering_attr_hideUnderground_name">עצמים תת־קרקעיים</string>
+    <string name="data_is_not_available">הנתונים אינם זמינים</string>
+    <string name="shared_string_remove">הסרה</string>
+    <string name="shared_string_read_more">מידע נוסף</string>
+    <string name="clear_updates_proposition_message">ניתן להסיר עדכונים שהתקבלו ולחזור למהדורת המפה המקורית</string>
+    <string name="road_blocked">דרך חסומה</string>
+    <string name="shared_string_select">בחירה</string>
+    <string name="switch_start_finish">היפוך בין נקודות ההתחלה והיעד</string>
+    <string name="rendering_attr_hideIcons_name">סמלי נקודות עניין</string>
+    <string name="av_locations">מיקומים</string>
+    <string name="plugin_settings">תוספים</string>
+    <string name="traffic_warning_hazard">סכנה</string>
+    <string name="no_updates_available">אין עדכונים זמינים</string>
+    <string name="download_live_updates">עדכונים חיים</string>
+    <string name="rendering_value_default13_name">בררת מחדל (13)</string>
+    <string name="rendering_value_defaultTranslucentCyan_name">בררת מחדל (ציאן שקוף למחצה)</string>
+    <string name="rendering_attr_currentTrackColor_name">צבע GPX</string>
+    <string name="rendering_attr_currentTrackColor_description">צבע GPX</string>
+    <string name="rendering_attr_currentTrackWidth_name">רוחב GPX</string>
+    <string name="rendering_attr_currentTrackWidth_description">רוחב GPX</string>
+    <string name="rendering_value_darkyellow_name">צהוב כהה</string>
+    <string name="rendering_value_red_name">אדום</string>
+    <string name="rendering_value_translucent_red_name">אדום שקוף למחצה</string>
+    <string name="rendering_value_orange_name">כתום</string>
+    <string name="rendering_value_translucent_orange_name">כתום שקוף למחצה</string>
+    <string name="rendering_value_yellow_name">צהוב</string>
+    <string name="rendering_value_translucent_yellow_name">צהוב שקוף למחצה</string>
+    <string name="rendering_value_lightgreen_name">ירוק בהיר</string>
+    <string name="rendering_value_translucent_lightgreen_name">ירוק בהיר שקוף למחצה</string>
+    <string name="rendering_value_green_name">ירוק</string>
+    <string name="rendering_value_translucent_green_name">ירוק שקוף למחצה</string>
+    <string name="rendering_value_lightblue_name">כחול בהיר</string>
+    <string name="rendering_value_translucent_lightblue_name">כחול בהיר שקוף למחצה</string>
+    <string name="rendering_value_blue_name">כחול</string>
+    <string name="rendering_value_translucent_blue_name">כחול שקוף למחצה</string>
+    <string name="rendering_value_purple_name">חציל</string>
+    <string name="rendering_value_pink_name">ורוד</string>
+    <string name="rendering_value_translucent_pink_name">ורוד שקוף למחצה</string>
+    <string name="rendering_value_brown_name">חום</string>
+    <string name="rendering_value_translucent_purple_name">חציל שקוף למחצה</string>
+    <string name="restart_is_required">כדי להחיל את השינויים במלואם, נדרשת הפעלה ידנית מחדש של היישומון.</string>
+    <string name="light_theme">בהיר</string>
+    <string name="dark_theme">כהה</string>
+    <string name="lang_pms">פיימונטית</string>
+    <string name="lang_bn">בנגלית</string>
+    <string name="lang_tl">טאגאלוג</string>
+    <string name="lang_sh">סרבו־קרואטית</string>
+    <string name="lang_az">אזרית</string>
+    <string name="lang_br">ברטונית</string>
+    <string name="lang_sq">אלבנית</string>
+    <string name="lang_is">איסלנדית</string>
+    <string name="lang_bpy">בישנופריה</string>
+    <string name="lang_nv">נאוואחו</string>
+    <string name="lang_ga">אירית</string>
+    <string name="lang_la">לטינית</string>
+    <string name="lang_ku">כורדית</string>
+    <string name="lang_ta">טמילית</string>
+    <string name="lang_ml">מלאיאלאם</string>
+    <string name="lang_lb">לוקסמבורגית</string>
+    <string name="lang_os">אוסטית</string>
+    <string name="lang_eo">אספרנטו</string>
+    <string name="lang_es_us">ספרדית אמריקאית</string>
+    <string name="lang_es_ar">ספרדית ארגנטינאית</string>
+    <string name="lang_nb">נורבגית בוקמול</string>
+    <string name="lang_vo">וולאפיק</string>
+    <string name="lang_th">תאית</string>
+    <string name="lang_te">טלוגו</string>
+    <string name="lang_nn">נורבגית נינורשק</string>
+    <string name="lang_ms">מלזית</string>
+    <string name="lang_ht">האיטית</string>
+    <string name="lang_gl">גליסית</string>
+    <string name="lang_et">אסטונית</string>
+    <string name="lang_ceb">סבואנו</string>
+    <string name="lang_ast">אסטורית</string>
+    <string name="lang_hsb">סורבית צפונית</string>
+    <string name="lang_kab">קביליה</string>
+    <string name="lang_ber">ברברית</string>
+    <string name="rename_failed">שינוי השם נכשל.</string>
+    <string name="days_behind">ימים אחורה</string>
+    <string name="back_to_map">חזרה למפה</string>
+    <string name="location_on_map">מיקום:
+\n רוחב %1$s
+\n אורך %2$s</string>
+    <string name="notes">הערות</string>
+    <string name="online_map">מפה מקוונת</string>
+    <string name="roads_only">דרכים בלבד</string>
+    <string name="rendering_attr_pisteRoutes_name">מדרוני סקי</string>
+    <string name="free">%1$s פנויים</string>
+    <string name="device_memory">זיכרון המכשיר</string>
+    <string name="rendering_attr_pisteGrooming_name">פילוס שלג</string>
+    <string name="edit_group">עריכת קבוצה</string>
+    <string name="parking_place">מקום חניה</string>
+    <string name="remove_the_tag">הסרת התגית</string>
+    <string name="gps_status">מצב GPS</string>
+    <string name="version_settings_descr">הורדת גרסאות נייטלי.</string>
+    <string name="version_settings">בניות</string>
+    <string name="rendering_attr_streetLighting_name">תאורת רחוב</string>
+    <string name="proxy_pref_title">מתווך</string>
+    <string name="proxy_pref_descr">ציון מתווך רשת.</string>
+    <string name="settings_privacy">פרטיות</string>
+    <string name="points">נקודות</string>
+    <string name="navigation_over_track">להתחיל ניווט לאורך המסלול?</string>
+    <string name="speak_pedestrian">מעברי חציה</string>
+    <string name="rendering_attr_roadStyle_name">סגנון דרך</string>
+    <string name="rendering_attr_roadStyle_description">סגנון דרך</string>
+    <string name="rendering_value__name">בררת מחדל</string>
+    <string name="rendering_value_default_name">בררת מחדל</string>
+    <string name="rendering_value_germanRoadAtlas_name">אטלס דרכים גרמני</string>
+    <string name="rendering_value_highContrastRoads_name">דרכים בניגודיות גבוהה</string>
+    <string name="traffic_warning_railways">מפגש רכבת</string>
+    <string name="traffic_warning_pedestrian">מעבר חציה</string>
+    <string name="show_railway_warnings">מפגשי רכבת</string>
+    <string name="show_pedestrian_warnings">מעברי חציה</string>
+    <string name="rendering_value_americanRoadAtlas_name">אטלס דרכים אמריקאי</string>
+    <string name="dash_download_new_one">הורדת מפה חדשה</string>
+    <string name="dash_download_manage">ניהול</string>
+    <string name="map_locale">שפת המפה</string>
+    <string name="rendering_attr_transportStops_name">תחנות תחבורה ציבורית</string>
+    <string name="download_tab_downloads">כל ההורדות</string>
+    <string name="download_tab_updates">עדכונים</string>
+    <string name="download_tab_local">מקומי</string>
+    <string name="no_internet_connection">לא ניתן להוריד, נא לבדוק את החיבור שלך לאינטרנט.</string>
+    <string name="everything_up_to_date">כל הקבצים עדכניים</string>
+    <string name="use_opengl_render">שימוש בעיבוד OpenGL</string>
+    <string name="search_for">חיפוש אחר</string>
+    <string name="coordinates">נקודות ציון</string>
+    <string name="rendering_attr_subwayMode_name">נתיבי רכבת תחתית</string>
+    <string name="wake_on_voice">הפעלת המסך</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">נתיבי רכבת</string>
+    <string name="rendering_attr_busRoutes_name">נתיבי אוטובוס</string>
+    <string name="rendering_category_hide">הסתרה</string>
+    <string name="rendering_category_routes">נתיבים</string>
+    <string name="rendering_category_details">פרטים</string>
+    <string name="rendering_category_transport">תחבורה ציבורית</string>
+    <string name="rendering_category_others">תכונות מפה נוספות</string>
+    <string name="map_widget_appearance_rem">רכיבים שנותרו</string>
+    <string name="map_widget_top">פס מצב</string>
+    <string name="map_widget_right">חלונית ימנית</string>
+    <string name="map_widget_left">חלונית שמאלית</string>
+    <string name="configure_map">הגדרת מפה</string>
+    <string name="search_radius_proximity">בטווח של</string>
+    <string name="osmo_device_not_found">לא נמצא התקן</string>
+    <string name="anonymous_user">משתמש אלמוני</string>
+    <string name="logged_as">נכנסת בשם %1$s</string>
+    <string name="speed_limit_exceed">סיבולת למגבלת מהירות</string>
+    <string name="print_route">הדפסת נתיב</string>
+    <string name="text_size">גודל טקסט</string>
+    <string name="traffic_warning_speed_limit">מגבלת מהירות</string>
+    <string name="traffic_warning_border_control">ביקורת גבולות</string>
+    <string name="traffic_warning_payment">עמדת תשלום</string>
+    <string name="traffic_warning_stop">סימן עצור</string>
+    <string name="traffic_warning_calming">מיתון תנועה</string>
+    <string name="traffic_warning_speed_camera">מצלמת מהירות</string>
+    <string name="traffic_warning">אזהרת תנועה</string>
+    <string name="speak_favorites">מועדפים בסביבה</string>
+    <string name="speak_poi">נקודות עניין בסביבה</string>
+    <string name="way_alarms">אזהרות תנועה</string>
+    <string name="sleep_mode_stop_dialog">לבטל את מצב הרקע של ה־GPS?</string>
+    <string name="stop_navigation_service">עצירה</string>
+    <string name="confirm_every_run">לשאול תמיד</string>
+    <string name="enable_sleep_mode">הפעלת מצב רקע ל־GPS</string>
+    <string name="save_track_to_gpx_globally">רישום המסלול לקובץ GPX</string>
+    <string name="save_track_to_gpx_globally_headline">רישום מסלולים לפי דרישה</string>
+    <string name="enable_proxy_title">הפעלת מתווך HTTP</string>
+    <string name="enable_proxy_descr">הגדרת מתווך HTTP לכל בקשות הרשת.</string>
+    <string name="proxy_host_title">מארח מתווך</string>
+    <string name="proxy_host_descr">הגדרת שם המארח של המתווך שלך (למשל 127.0.0.1).</string>
+    <string name="proxy_port_title">פתחת מתווך</string>
+    <string name="proxy_port_descr">הגדרת מספר הפתחה של המתווך שלך (למשל 8118).</string>
+    <string name="int_hour">שע׳</string>
+    <string name="duration">משך</string>
+    <string name="distance">מרחק</string>
+    <string name="average">ממוצע</string>
+    <string name="of">%1$d מתוך %2$d</string>
+    <string name="moving_time">זמן תנועה</string>
+    <string name="max_min">מרבי/מזערי</string>
+    <string name="min_max">מזערי/מרבי</string>
+    <string name="index_tours">סיורים</string>
+    <string name="shared_string_all">הכול</string>
+    <string name="waypoints">נקודות דרך</string>
+    <string name="targets">יעדים</string>
+    <string name="announce_gpx_waypoints">נקודות דרך GPX</string>
+    <string name="download_additional_maps">להוריד את המפות החסרות %1$s ‏(%2$d מ״ב)?</string>
+    <string name="rendering_value_browse_map_name">עיון במפה</string>
+    <string name="rendering_value_car_name">מכונית</string>
+    <string name="rendering_value_pedestrian_name">הולך רגל</string>
+    <string name="rendering_attr_coloredBuildings_name">צביעת בניינים לפי סוג</string>
+    <string name="osmo_invite">הזמנה…</string>
+    <string name="osmo_leave_confirmation_msg">לעזוב את הקבוצה %1$s?</string>
+    <string name="continue_navigation">להמשיך בניווט</string>
+    <string name="pause_navigation">להשהות את הניווט</string>
+    <string name="keep_navigation_service">להשאיר</string>
+    <string name="lang_sw">סווהילי</string>
+    <string name="lang_he">עברית</string>
+    <string name="forward">קדימה</string>
+    <string name="home">לוח מחוונים</string>
+    <string name="live_monitoring_m_descr">שליחת נתוני מעקב לשירות רשת מסוים אם רישום GPX פעיל.</string>
+    <string name="live_monitoring_m">מעקב מקוון (נדרש GPX)</string>
+    <string name="live_monitoring_start">הפעלת מעקב מקוון</string>
+    <string name="live_monitoring_stop">עצירת מעקב מקוון</string>
+    <string name="gpx_monitoring_start">התחלת רישום GPX</string>
+    <string name="gpx_monitoring_stop">עצירת רישום GPX</string>
+    <string name="gpx_start_new_segment">התחלת מקטע חדש</string>
+    <string name="rendering_attr_hideBuildings_name">בניינים</string>
+    <string name="rendering_attr_hideNonVehicleHighways_name">דרכים מהירות שלא מיועדות למכוניות</string>
+    <string name="rendering_attr_hideText_name">טקסט</string>
+    <string name="rendering_attr_buildings15zoom_name">בניינים בתקריב 15</string>
+    <string name="rendering_attr_moreDetailed_name">פרטים נוספים</string>
+    <string name="rendering_attr_lessDetailed_name">פחות פרטים</string>
+    <string name="rendering_attr_hideAccess_name">הגבלות גישה</string>
+    <string name="rendering_attr_showAccess_name">הצגת הגבלות גישה ומחיר</string>
+    <string name="rendering_attr_showSurfaceGrade_name">הצגת איכות הדרך</string>
+    <string name="rendering_attr_showSurfaces_name">הצגת משטח הדרך</string>
+    <string name="rendering_attr_showCycleRoutes_name">הצגת נתיבי אופניים</string>
+    <string name="osmo_auth_error_short">האימות נכשל</string>
+    <string name="osmo_group_by_invite">כניסה לפי הזמנה</string>
+    <string name="osmo_group_information">נא לקרוא בטרם יצירת קבוצה!</string>
+    <string name="osmo_not_signed_in">הכניסה ל־OsMo נכשלה</string>
+    <string name="osmo_auto_connect_descr">התחברות אוטומטית לשירות לאחר הפעלת היישומון מחדש.</string>
+    <string name="osmo_auto_connect">התחברות אוטומטית</string>
+    <string name="osmo_start_service">שירות OsMo</string>
+    <string name="no_index_file_to_download">לא נמצאו הורדות, נא לבדוק את החיבור לאינטרנט.</string>
+    <string name="amenity_type_seamark">ציון דרך ימי</string>
+    <string name="app_mode_motorcycle">אופנוע</string>
+    <string name="app_mode_boat">סירה</string>
+    <string name="app_mode_aircraft">כלי טיס</string>
+    <string name="auto_zoom_none">אין תקריב אוטומטי</string>
+    <string name="about_version">גרסה :</string>
+    <string name="shared_string_about">על אודות</string>
+    <string name="edit_tilesource_maxzoom">תקריב מרבי</string>
+    <string name="edit_tilesource_expiration_time">תפוגה (דקות)</string>
+    <string name="edit_tilesource_minzoom">תקריב מזערי</string>
+    <string name="edit_tilesource_url_to_load">כתובת</string>
+    <string name="edit_tilesource_choose_existing">בחירה בקיים…</string>
+    <string name="maps_define_edit">הגדרה/עריכה…</string>
+    <string name="driving_region">אזור נהיגה</string>
+    <string name="driving_region_japan">יפן</string>
+    <string name="driving_region_us">ארצות הברית</string>
+    <string name="driving_region_canada">קנדה</string>
+    <string name="driving_region_europe_asia">ישראל, אירופה, אסיה, דרום אמריקה ודומיהן</string>
+    <string name="driving_region_uk">אנגליה, הודו ודומיהן</string>
+    <string name="driving_region_australia">אוסטרליה</string>
+    <string name="speak_title">הכרזה…</string>
+    <string name="speak_street_names">שמות רחובות (הקראה)</string>
+    <string name="speak_speed_limit">מגבלת מהירות</string>
+    <string name="speak_cameras">מצלמות מהירות</string>
+    <string name="speak_traffic_warnings">אזהרות תנועה</string>
+    <string name="osb_author_or_password_not_specified">נא לציין שם משתמש וססמה של OSM בהגדרות</string>
+    <string name="clear_intermediate_points">מחיקת יעדי ביניים</string>
+    <string name="keep_intermediate_points">שמירה על יעדי הביניים</string>
+    <string name="new_directions_point_dialog">כבר הוגדרו יעדי ביניים.</string>
+    <string name="context_menu_item_directions_to">הנחיות אל</string>
+    <string name="context_menu_item_directions_from">הנחיות מ־</string>
+    <string name="route_descr_map_location">מפה:</string>
+    <string name="route_descr_destination">יעד</string>
+    <string name="route_to">אל:</string>
+    <string name="route_via">דרך:</string>
+    <string name="route_from">מ־:</string>
     </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index f283e38a1f..07e9bdf9dd 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -989,9 +989,9 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
 
     <string name="av_def_action_video">Registra video</string>
     <string name="av_def_action_audio">Registra audio</string>
-    <string name="av_widget_action_descr">Seleziona l\'azione predefinita del widget</string>
+    <string name="av_widget_action_descr">Seleziona l\'azione predefinita del widget.</string>
     <string name="av_widget_action">Azione predefinita del widget</string>
-    <string name="av_video_format_descr">Seleziona il formato di uscita video</string>
+    <string name="av_video_format_descr">Seleziona il formato di uscita video.</string>
     <string name="av_video_format">Formato di uscita video</string>
     <string name="av_use_external_recorder_descr">Utilizza il registratore di sistema per il video</string>
     <string name="av_use_external_recorder">Utilizza il registratore di sistema</string>
@@ -1039,7 +1039,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="av_use_external_camera">Usa l\'app fotocamera</string>
 
     <string name="max_speed_none">nessuno</string>
-    <string name="prefer_in_routing_descr">Preferisci autostrade</string>
+    <string name="prefer_in_routing_descr">Preferisci autostrade.</string>
     <string name="prefer_motorways">Preferisci le autostrade</string>
     <string name="prefer_in_routing_title">Preferisci…</string>
     <string name="av_def_action_choose">Seleziona su richiesta</string>
@@ -1061,7 +1061,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="monitoring_settings_descr">Configura come registrare i tuoi viaggi.</string>
 
 
-    <string name="choose_osmand_theme_descr">Scegli il tema dell\'applicazione</string>
+    <string name="choose_osmand_theme_descr">Scegli il tema dell\'applicazione.</string>
     <string name="choose_osmand_theme">Tema dell\'app</string>
     <string name="accessibility_options">Opzioni di accessibilità</string>
     <string name="select_address_activity">Seleziona l\'indirizzo</string>
@@ -1075,7 +1075,7 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="files_limit">hai ancora %1$d file</string>
     <string name="available_downloads_left">Disponibili %1$d file da scaricare</string>
     <string name="install_paid">Versione completa</string>
-    <string name="use_magnetic_sensor_descr">Per per determinare il valore della bussola invece del sensore di orientamento utilizza il utilizza il sensore magnetico</string>
+    <string name="use_magnetic_sensor_descr">Per per determinare il valore della bussola invece del sensore di orientamento utilizza il utilizza il sensore magnetico.</string>
     <string name="use_magnetic_sensor">Utilizza il sensore magnetico (bussola)</string>
     <string name="local_indexes_cat_srtm">Linee isoipse</string>
     <string name="use_kalman_filter_compass_descr">Riduce il rumore delle letture della bussola ma introduce dell\'inerzia</string>
@@ -1140,12 +1140,12 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="route_from">Da:</string>
     <string name="osb_author_dialog_password">Password di OSM (opzionale)</string>
     <string name="speak_title">Annuncia…</string>
-    <string name="speak_descr">Configura per annunciare i nomi delle strade, gli avvertimenti di traffico (fermate forzate, dossi), gli avvisi autovelox, i limiti di velocità</string>
+    <string name="speak_descr">Configura per annunciare i nomi delle strade, gli avvertimenti di traffico (fermate forzate, dossi), gli avvisi autovelox, i limiti di velocità.</string>
     <string name="speak_street_names">Nomi delle strade (TTS)</string>
     <string name="announce_gpx_waypoints">Punti GPX di passaggio</string>
 
 
-    <string name="driving_region_descr">Scegliete la regione di guida: USA, Europa, UK, Asia o altre</string>
+    <string name="driving_region_descr">Scegliete la regione di guida: USA, Europa, UK, Asia o altre.</string>
     <string name="driving_region">Regione di guida</string>
     <string name="driving_region_japan">Giappone</string>
     <string name="driving_region_us">Stati Uniti</string>
@@ -1195,13 +1195,13 @@ Memoria in proporzione %4$s MB (limite di Android %5$s MB, Dalvik %6$s MB).</str
     <string name="app_mode_boat">Barca</string>
     <string name="app_mode_aircraft">Aereo</string>
     <string name="map_widget_map_rendering">Disegno della mappa</string>
-    <string name="app_modes_choose_descr">Scegli i profili d\'uso del l\'applicazione da rendere visibili</string>
+    <string name="app_modes_choose_descr">Scegli i profili d\'uso dell\'applicazione da rendere visibili.</string>
     <string name="app_modes_choose">Profili applicazione</string>
     <string name="amenity_type_seamark">Mare</string>
 
 
     <string name="complex_route_calculation_failed">Calcolo veloce del percorso fallita (%s), rinvio al calcolo lento.</string>
-    <string name="disable_complex_routing_descr">Disabilita il calcolo del percorso in due fasi per l\'uso in automobile</string>
+    <string name="disable_complex_routing_descr">Disabilita il calcolo del percorso in due fasi per l\'uso in automobile.</string>
     <string name="disable_complex_routing">Disabilita il calcolo complesso del percorso</string>
     <string name="speech_rate_descr">Imposta la velocità della sintesi vocale TTS.</string>
     <string name="speech_rate">Velocità di lettura</string>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index ae3f9319d0..b4a92bbae1 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -719,7 +719,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">Snelweg-parkeerplaats</string>
+	<string name="poi_rest_area">Verzorgingsplaats</string>
 
 	<string name="poi_observation_tower">Uitkijktoren</string>
 	<string name="poi_bell_tower">Kerktoren</string>
@@ -1487,7 +1487,7 @@
 	<string name="poi_payment_others_no">Andere betalingsvormen NIET mogelijk</string>
 	<string name="poi_length">Lengte</string>
 
-<string name="poi_fuel_type">Type</string>
+<string name="poi_fuel_type">Brandstoftype</string>
 	<string name="poi_payment_type">Betaaltype</string>
 	<string name="poi_additional_type">Bijkomstig</string>
 <string name="poi_solarium_yes">Solarium</string>
@@ -1498,7 +1498,7 @@
 	<string name="poi_dish">Keuken/soort gerechten</string>
 	<string name="poi_vending_ice_cream">IJs</string>
 	<string name="poi_cuisine_ice_cream">IJs</string>
-	<string name="poi_fuel_avia_type">Type</string>
+	<string name="poi_fuel_avia_type">Brandstoftype (avia)</string>
 	<string name="poi_internet_access_type">Internet</string>
 	<string name="poi_vending_type">Verkoop</string>
 	<string name="poi_bicycle_service">Fietsreparatie</string>
@@ -1559,7 +1559,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">Soort water</string>
+	<string name="poi_water_characteristic">Waterpartij</string>
 	<string name="poi_beach_surface_type">Oppervlak</string>
 	<string name="poi_nudism">Nudisme</string>
 	<string name="poi_diet">Dieet</string>
@@ -2285,4 +2285,207 @@
 	<string name="poi_maxwidth">Maximale breedte</string>
 	<string name="poi_iata">IATA-code</string>
 	<string name="poi_icao">ICAO-code</string>
+	<string name="poi_operational_status">Bedrijfsstatus</string>
+	<string name="poi_wiki_lang_bpy"></string>
+	<string name="poi_historic_farm">Historische boerderij</string>
+	<string name="poi_historic_railway_station">Historisch treinstation</string>
+
+	<string name="poi_historic_threshing_floor">Historische dorsvloer</string>
+	<string name="poi_historic_gallows">Historische galg</string>
+	<string name="poi_historic_railway">Historische spoorlijn</string>
+
+	<string name="poi_square">Plein</string>
+	<string name="poi_artist_name">Kunstenaar</string>
+	<string name="poi_sculptor">Beeldhouwer</string>
+
+	<string name="poi_building_type_church">Type gebouw: kerk</string>
+	<string name="poi_building_type_chapel">Type gebouw: Kapel</string>
+	<string name="poi_building_type_mosque">Type gebouw: moskee</string>
+	<string name="poi_building_type_temple">Type gebouw: tempel</string>
+	<string name="poi_building_type_cathedral">Type gebouw: kathedraal</string>
+	<string name="poi_building_type_monastery">Type gebouw: klooster</string>
+	<string name="poi_building_type_basilica">Type gebouw: Basiliek</string>
+	<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_prison_camp">Voormalig gevangeniskamp</string>
+	<string name="poi_concentration_camp">Type: concentratiekamp</string>
+	<string name="poi_pow_camp">Type: krijgsgevangenenkamp</string>
+	<string name="poi_labor_camp">Type: werkkamp</string>
+	<string name="poi_concentration_camp_nazism">Type: nazi</string>
+	<string name="poi_temperature">Temperatuur</string>
+	<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_cargo_passengers">Passagiers</string>
+	<string name="poi_cargo_vehicle">Voertuigen</string>
+	<string name="poi_cargo_bicycle">Fietsen</string>
+	<string name="poi_cargo_container">Containers</string>
+	<string name="poi_cargo_hgv">Vrachtwagen</string>
+
+	<string name="poi_craft_electronics_repair">Elektronica-reparatie</string>
+	<string name="poi_fireworks">Vuurwerk winkel</string>
+
+	<string name="poi_aerialway_length">Lengte</string>
+
+	<string name="poi_health_specialty_general_yes">Huisarts</string>
+	<string name="poi_health_specialty_ophthalmology_yes">Oogheelkunde</string>
+	<string name="poi_health_specialty_gynaecology_yes">Gynaecologie</string>
+	<string name="poi_health_specialty_orthopaedics_yes">Orthopedie</string>
+	<string name="poi_health_specialty_otolaryngology_yes">Keel-, neus- en oorheelkunde</string>
+	<string name="poi_health_specialty_paediatrics_yes">Kindergeneeskunde</string>
+	<string name="poi_health_specialty_paediatrics_no">Gezondheidsspecialiteit: kindergeneeskunde: nee</string>
+	<string name="poi_health_specialty_dermatology_yes">Dermatologie</string>
+	<string name="poi_health_specialty_urology_yes">Urologie</string>
+	<string name="poi_health_specialty_surgery_yes">Algemene chirurgie</string>
+	<string name="poi_health_specialty_radiology_yes">Radiologie</string>
+	<string name="poi_health_specialty_psychiatry_yes">Psychiatrie</string>
+	<string name="poi_health_specialty_neurology_yes">Neurologie</string>
+	<string name="poi_health_specialty_cardiology_yes">Cardiologie</string>
+	<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_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_plastic_surgery_yes">Plastische chirurgie</string>
+	<string name="poi_health_specialty_orthodontics_yes">Orthodontie</string>
+	<string name="poi_health_specialty_physiotherapy_yes">Fysiotherapie</string>
+	<string name="poi_health_specialty_biochemistry_yes">Biochemie</string>
+	<string name="poi_health_specialty_occupational_yes">Ergotherapie</string>
+	<string name="poi_health_specialty_child_psychiatry_yes">Kinderpsychiatrie</string>
+	<string name="poi_health_specialty_physiatry_yes">Fysische geneeskunde en revalidatie</string>
+	<string name="poi_health_specialty_maxillofacial_surgery_yes">Maxillo-faciale chirurgie</string>
+	<string name="poi_health_specialty_diagnostic_radiology_yes">Diagnostische Radiologie</string>
+	<string name="poi_health_specialty_dentistry_yes">Tandheelkunde</string>
+	<string name="poi_health_specialty_nephrology_yes">Nefrologie (nierziekten)</string>
+	<string name="poi_health_specialty_neurosurgery_yes">Neurochirurgie</string>
+	<string name="poi_health_specialty_neuropsychiatry_yes">Neuropsychiatrie</string>
+	<string name="poi_health_specialty_endocrinology_yes">Endocrinologie</string>
+	<string name="poi_health_specialty_nuclear_medicine_yes">Nucleaire geneeskunde</string>
+	<string name="poi_health_specialty_naturopathy_yes">Natuurgeneeskunde</string>
+	<string name="poi_health_specialty_depth_psychology_yes">Dieptepsychologie</string>
+	<string name="poi_health_specialty_behavior_yes">Gedragstherapie</string>
+	<string name="poi_disc_golf">Diskgolf</string>
+	<string name="poi_rc_car">Radiogestuurde autorace</string>
+	<string name="poi_boxing">Boksen</string>
+
+	<string name="poi_official_name">Officiële naam</string>
+
+	<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_construction_yes">In aanbouw</string>
+	<string name="poi_additional_atm_yes">Geldautomaat: ja</string>
+	<string name="poi_atm_no">Geldautomaat: nee</string>
+
+	<string name="poi_firepit">Vuurplaats</string>
+	<string name="poi_street_cabinet">Verdeelkast</string>
+
+	<string name="poi_fair_trade_yes">Fair trade: ja</string>
+	<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_nuclear_explosion_warhead">Explosie: kernkop</string>
+	<string name="poi_nuclear_explosion_device">Explosie: apparaat</string>
+
+	<string name="poi_addr_housename">Huis naam</string>
+
+
+	<string name="poi_plant_nursery">Plantenkwekerij</string>
+
+	<string name="poi_compressed_air_yes">Ja</string>
+	<string name="poi_compressed_air_no">Perslucht: nee</string>
+
+	<string name="poi_car_wash_yes">Ja</string>
+
+	<string name="poi_vacuum_cleaner_yes">Ja</string>
+	<string name="poi_vacuum_cleaner_no">Stofzuiger: nee</string>
+	<string name="poi_amenity_vacuum_cleaner">Stofzuiger</string>
+
+	<string name="poi_sport_free_flying">Vrij vliegen (sport)</string>
+
+	<string name="poi_water_tap">Waterkraan</string>
+	<string name="poi_button_operated_yes">Knop bediend: Ja</string>
+	<string name="poi_button_operated_no">Knop bediend: nee</string>
+
+	<string name="poi_free_flying_site_takeoff">Lanceerplaats</string>
+	<string name="poi_free_flying_site_landing">Landingsbaan</string>
+	<string name="poi_free_flying_site_towing">Slepen</string>
+	<string name="poi_free_flying_site_training">Opleiding</string>
+	<string name="poi_free_flying_official_yes">Officieel: ja</string>
+	<string name="poi_free_flying_official_no">Officieel: nee</string>
+	<string name="poi_free_flying_paragliding_no">Paragliding: nee</string>
+	<string name="poi_free_flying_hanggliding_yes">Delta vliegen</string>
+	<string name="poi_free_flying_hanggliding_no">Delta vliegen: nee</string>
+	<string name="poi_health_service_counselling_no">Gezondheid service: begeleiding: nee</string>
+	<string name="poi_health_service_examination_yes">Gezondheidszorg: onderzoek: ja</string>
+	<string name="poi_health_service_examination_no">Gezondheidszorg: onderzoek: nee</string>
+	<string name="poi_health_service_child_care_yes">Gezondheidszorg: kinderopvang: ja</string>
+	<string name="poi_health_service_child_care_no">Gezondheidszorg: kinderopvang: nee</string>
+	<string name="poi_health_service_prevention_yes">Gezondheidszorg: preventie: ja</string>
+	<string name="poi_health_service_prevention_no">Gezondheidszorg: preventie: nee</string>
+	<string name="poi_health_service_prevention_vaccination_yes">Gezondheidszorg: vaccinatie: ja</string>
+	<string name="poi_health_service_prevention_vaccination_no">Gezondheidszorg: vaccinatie: nee</string>
+	<string name="poi_health_service_support_yes">Gezondheidszorg: ondersteuning: ja</string>
+	<string name="poi_health_service_support_no">Gezondheidszorg: ondersteuning: nee</string>
+	<string name="poi_health_service_test_yes">Gezondheidszorg: test: ja</string>
+	<string name="poi_health_service_test_no">Gezondheidszorg: test: nee</string>
+
+	<string name="poi_health_facility_type_office">Medische kantoor</string>
+	<string name="poi_health_facility_type_field_hospital">Type medische faciliteit: veldhospitaal</string>
+	<string name="poi_health_facility_type_counselling_centre">Type medische faciliteit: adviescentrum</string>
+	<string name="poi_health_facility_type_laboratory">Type medische faciliteit: laboratorium</string>
+	<string name="poi_health_facility_type_therapy">Type medische faciliteit: therapie</string>
+	<string name="poi_health_facility_type_department">Type medische faciliteit: afdeling</string>
+	<string name="poi_health_facility_type_dispensary">Type medische faciliteit: apotheek</string>
+	<string name="poi_health_facility_type_first_aid">Type medische faciliteit: EHBO</string>
+	<string name="poi_health_facility_type_nursing_home">Type medische faciliteit: verpleeghuis</string>
+	<string name="poi_health_facility_type_support_group_home">Type medische faciliteit: steungroep</string>
+
+	<string name="poi_suction_point">Zuigpunt</string>
+
+	<string name="poi_fire_hydrant_type_underground">Ondergrond</string>
+	<string name="poi_fire_hydrant_type_pillar">Pilaar</string>
+	<string name="poi_fire_hydrant_type_pond">Vijver</string>
+	<string name="poi_fire_hydrant_type_wall">Muur</string>
+
+	<string name="poi_health_amenity_type_first_aid_kit">EHBO doos</string>
+	<string name="poi_health_amenity_type_scales">Openbare Weegschaal</string>
+
+	<string name="poi_emergency_yes">Noodgeval: ja</string>
+	<string name="poi_emergency_no">Noodgeval: nee</string>
+	<string name="poi_home_visit_yes">Ja</string>
+	<string name="poi_home_visit_no">Huisbezoek: nee</string>
+
+	<string name="poi_disease_malaria_yes">Malaria: ja</string>
+	<string name="poi_disease_malaria_no">Malaria: nee</string>
+	<string name="poi_disease_autism_yes">Autisme: ja</string>
+	<string name="poi_disease_autism_no">Autisme: nee</string>
+	<string name="poi_office_physician">Arts kantoor</string>
 	</resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index b46e0cd7b0..7b132ff220 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2561,4 +2561,29 @@
     <string name="wrong_format">Неправильный формат</string>
     <string name="enter_new_name">Введите новое имя</string>
 	<string name="shared_string_back">Назад</string>
-	</resources>
+	<string name="appearance_on_the_map">Внешний вид на карте</string>
+    <string name="add_favourites_group_to_markers_descr">Выберите какой группы избранных вы хотите добавить маркеры</string>
+    <string name="favourites_group">Группа избранных</string>
+    <string name="add_group">Добавить группу</string>
+    <string name="add_group_descr">Вы можете добавить группу из избранных или путевых точек.</string>
+    <string name="empty_state_markers_active">Маркеры на карте!</string>
+    <string name="empty_state_markers_active_desc">Отмечайте места на карте нажатием.</string>
+    <string name="empty_state_markers_groups">Импорт групп</string>
+    <string name="empty_state_markers_groups_desc">Вы можете импортировать группы избранных или путевых точек как маркеры.</string>
+    <string name="empty_state_markers_history_desc">На этом экране появятся маркеры, отмеченные как пройденные.</string>
+    <string name="shared_string_two">Два</string>
+    <string name="shared_string_one">Один</string>
+    <string name="show_guide_line_descr">На карте будет показана линия, соединяющая ваше местоположение с местоположениями активных маркеров.</string>
+    <string name="show_arrows_descr">На карте будут показаны одна или две стрелки, указывающие направление на активные маркеры.</string>
+    <string name="distance_indication_descr">Выберите способ просмотра расстояния до активных маркеров.</string>
+    <string name="active_markers_descr">Выберите сколько индикаторов направления вы хотели бы видеть.</string>
+    <string name="digits_quantity">Количество цифр</string>
+    <string name="shared_string_paste">Вставить</string>
+    <string name="coordinate_input_accuracy_description">Автоматически переключаться на следующее поле после ввода %1$d цифр после десятичной точки</string>
+    <string name="coordinate_input_accuracy">%1$d цифр</string>
+    <string name="go_to_next_field">Перейти к следующему полю</string>
+    <string name="rename_marker">Переименовать маркер</string>
+    <string name="tap_on_map_to_hide_interface">Полноэкранный режим</string>
+    <string name="mark_passed">Отметить пройденным</string>
+    <string name="import_track_desc">Файл %1$s не содержит путевых точек, импортировать его как трек?</string>
+    </resources>
diff --git a/OsmAnd/res/values-sc/phrases.xml b/OsmAnd/res/values-sc/phrases.xml
index 4cebf06dc5..9587c7ddfc 100644
--- a/OsmAnd/res/values-sc/phrases.xml
+++ b/OsmAnd/res/values-sc/phrases.xml
@@ -1904,8 +1904,8 @@
 	<string name="poi_payment_icsf_no">No atzetat cartas IC Stored Fare</string>
 	<string name="poi_spices">Butega de ispètzias</string>
 
-<string name="poi_fuel_type">Casta</string>
-	<string name="poi_fuel_avia_type">Casta</string>
+<string name="poi_fuel_type">Casta de carburante</string>
+	<string name="poi_fuel_avia_type">Casta de carburante (avia)</string>
 	<string name="poi_payment_type">Casta de pagamentu</string>
 	<string name="poi_payment_fuel_type">Cartas carburante</string>
 	<string name="poi_additional_type">Additzionales</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index 6ef3a8383f..aa24a4aae0 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -491,7 +491,7 @@ Boles protzèdere cun una registratzione noa?</string>
     <string name="show_zoom_buttons_navigation">Ammustra sos pursantes de s\'ismanniamentu</string>
     <string name="save_as_favorites_points">Sarva comente grupu de preferidos</string>
     <string name="select_destination_and_intermediate_points">Ischerta sas tapas</string>
-    <string name="layer_amenity_label">Etichetas de sos puntos</string>
+    <string name="layer_amenity_label">Etichetas de s\'istratu de sos PDI</string>
     <string name="loading_smth">Carrigamentu de %1$s…</string>
     <string name="map_widget_plain_time">Oràriu atuale</string>
     <string name="gpx_wpt">Puntu de coladòrgiu</string>
@@ -638,7 +638,7 @@ Boles protzèdere cun una registratzione noa?</string>
     <string name="local_index_poi_data">Datos PDI</string>
     <string name="local_indexes_cat_poi">Datos PDI</string>
     <string name="poi_context_menu_modify">Muda PDI</string>
-    <string name="layer_poi">PDI…</string>
+    <string name="layer_poi">Istratu superiore de sos PDI…</string>
     <string name="context_menu_item_search_poi">Chirca PDI</string>
     <string name="context_menu_item_update_poi">Agiorna PDI</string>
     <string name="loading_poi_obj">Carrigamentu PDI…</string>
@@ -754,7 +754,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="gpx_visibility_txt">Visibilidade</string>
     <string name="gpx_tags_txt">Etichetas</string>
     <string name="gpx_description_txt">Descritzione</string>
-    <string name="validate_gpx_upload_name_pwd">Imposta impitadore e crae (password) de OSM pro carrigare documentos GPX.</string>
+    <string name="validate_gpx_upload_name_pwd">Dislinda su nùmene impreadore e sa crae (password) de OSM pro carrigare documentos GPX.</string>
     <string name="default_buttons_support">Sustènne</string>
     <string name="support_new_features">Sustènne caraterìsticas noas</string>
     <string name="show_ruler_level">Ammustra su righellu</string>
@@ -821,7 +821,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="general_settings">Impostatziones generales</string>
     <string name="general_settings_descr">Cunfigura sas impostatziones globales.</string>
     <string name="global_app_settings">Impostatziones globales de s’aplicu</string>
-    <string name="user_name">Nùmene impitadore in OSM</string>
+    <string name="user_name">Nùmene impreadore in OSM</string>
     <string name="user_password">Crae (password) in OSM</string>
 
 
@@ -1401,8 +1401,8 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
     <string name="ChooseCountry">Issèbera s’istadu</string>
     <string name="map_view_3d_descr">Abìlita sa bisura 3D de sa mapa.</string>
     <string name="map_view_3d">Bisura mapa 3D</string>
-    <string name="show_poi_over_map_description">Ammustra PDI in sa mapa (imprea s’ùrtimu filtru isseberadu).</string>
-    <string name="show_poi_over_map">Ammustra PDI</string>
+    <string name="show_poi_over_map_description">Ammustra s\'ùrtimu istratu superiore de sos PDI isseberadu in sa mapa.</string>
+    <string name="show_poi_over_map">Ammustra s\'istratu de sos PDI</string>
     <string name="map_tile_source_descr">Issèbera sa mitza pro sos tasseddos in lìnia o in cache.</string>
     <string name="map_tile_source">Mitza de sos tasseddos in lìnia</string>
     <string name="map_source">Mitza mapa</string>
@@ -2686,10 +2686,10 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="wrong_user_name">Nùmene impreadore isballiadu!</string>
     <string name="shared_string_to">A</string>
     <string name="mapillary_menu_date_from">Dae</string>
-    <string name="mapillary_menu_descr_dates">Abbista sas immàgines annantas in unu tzertu perìodu.</string>
-    <string name="mapillary_menu_title_dates">Datas</string>
-    <string name="mapillary_menu_edit_text_hint">Iscrie su nùmene impreadore</string>
-    <string name="mapillary_menu_descr_username">Abbista sas immàgines annantas dae unu impreadore isseberadu.</string>
+    <string name="mapillary_menu_descr_dates">Abbista petzi sas immàgines annantas</string>
+    <string name="mapillary_menu_title_dates">Data</string>
+    <string name="mapillary_menu_edit_text_hint">Iscrie su nùmene de s\'impreadore</string>
+    <string name="mapillary_menu_descr_username">Ammustra petzi sas immàgines annantas dae su</string>
     <string name="mapillary_menu_title_username">Nùmene impreadore</string>
     <string name="mapillary_menu_filter_description">Podes filtrare sas immàgines pro impreadore o data. Sos filtros s\'aplicat a pustis de ismanniamentu.</string>
     <string name="shared_string_reset">Reimposta</string>
@@ -2850,4 +2850,23 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="coordinate_input_accuracy">%1$d tzifras</string>
     <string name="go_to_next_field">Cola a su campu imbeniente</string>
     <string name="rename_marker">Torra a numenare su marcadore</string>
+    <string name="appearance_on_the_map">Visualizatzione in sa mapa</string>
+    <string name="add_track_to_markers_descr">Issèbera sos puntos de coladòrgiu chi OsmAnd at a annànghere a sos marcadores</string>
+    <string name="add_favourites_group_to_markers_descr">Issèbera cale de sos grupos de preferidos cheres annànghere a sos marcadores</string>
+    <string name="track_waypoints">Puntos de coladòrgiu</string>
+    <string name="favourites_group">Grupu de preferidos</string>
+    <string name="add_group">Annanghe grupu</string>
+    <string name="add_group_descr">Podes annànghere unu grupu de preferidos o puntos de coladòrgiu de una rasta.</string>
+    <string name="empty_state_markers_active">Marcadores in sa mapa!</string>
+    <string name="empty_state_markers_active_desc">Marca logos in sa mapa cun un\'incarcu.</string>
+    <string name="empty_state_markers_groups">Importa grupos</string>
+    <string name="empty_state_markers_groups_desc">Podes importare grupos de preferidos o puntos de coladòrgiu de una rasta comente marcadores.</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history</string>
+    <string name="empty_state_markers_history_desc">Sos marcadores sinnados comente colados ant a aparire in custu ischermu.</string>
+    <string name="shared_string_two">Duos</string>
+    <string name="shared_string_one">Unu</string>
+    <string name="show_guide_line_descr">Una lìnia de collegamentu intre sa positzione tua e sas de sos marcadores ativos ant a aparire in sa mapa.</string>
+    <string name="show_arrows_descr">Una o duas fritzas chi indicant sa diretzione cara a sos marcadores ativos ant a èssere ammustradas in sa mapa.</string>
+    <string name="distance_indication_descr">Issèbera comente dias bòlere visualizare sa distàntzia cun sos marcadores ativos.</string>
+    <string name="active_markers_descr">Issèbera cantos indicadores de diretzione ti diat agradare a bìdere.</string>
     </resources>
diff --git a/OsmAnd/res/values-sk/phrases.xml b/OsmAnd/res/values-sk/phrases.xml
index 95e45791d1..7047178bd7 100644
--- a/OsmAnd/res/values-sk/phrases.xml
+++ b/OsmAnd/res/values-sk/phrases.xml
@@ -1989,7 +1989,7 @@
 	<string name="poi_memorial_plaque">Pamätná doska</string>
 	<string name="poi_memorial_stone">Pamätný kameň</string>
 	<string name="poi_memorial_stele">Stéla</string>
-	<string name="poi_fuel_type">Typ</string>
+	<string name="poi_fuel_type">Typ paliva</string>
 	<string name="poi_payment_type">Spôsob platby</string>
 	<string name="poi_additional_type">Doplňujúce</string>
 <string name="poi_denomination_pentecostal">Letničné</string>
@@ -2100,7 +2100,7 @@
 	<string name="poi_home_visit_no">Návštevy doma: nie</string>
 
 	<string name="poi_ford_stepping_stones">Rad kameňov pre chodcov</string>
-	<string name="poi_fuel_avia_type">Typ</string>
+	<string name="poi_fuel_avia_type">Typ paliva (letecké)</string>
 	<string name="poi_payment_fuel_type">Palivové karty</string>
 	<string name="poi_internet_access_type">Spôsob prístupu na Internet</string>
 	<string name="poi_bicycle_service">Oprava bicyklov</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 3401369bf6..42b4c3785a 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -943,7 +943,7 @@ Niektoré z hlavných funkcií:
     <string name="max_speed_none">žiadna</string>
     <string name="prefer_motorways">Uprednostniť diaľnice</string>
     <string name="prefer_in_routing_title">Uprednostniť…</string>
-    <string name="prefer_in_routing_descr">Uprednostnenie diaľnic</string>
+    <string name="prefer_in_routing_descr">Uprednostniť diaľnice.</string>
     <string name="item_checked">označené</string>
     <string name="item_unchecked">neoznačené</string>
     <string name="av_def_action_choose">Vybrať pri požiadaní</string>
@@ -957,7 +957,7 @@ Niektoré z hlavných funkcií:
     <string name="hno">Číslo domu</string>
     <string name="monitoring_settings">Zaznamenávanie výletu</string>
     <string name="monitoring_settings_descr">Konfigurovať ako sa majú zaznamenať vaše výlety.</string>
-    <string name="choose_osmand_theme_descr">Výber témy pre aplikáciu</string>
+    <string name="choose_osmand_theme_descr">Vyberte tému pre aplikáciu.</string>
     <string name="choose_osmand_theme">Téma aplikácie</string>
     <string name="accessibility_options">Voľby zjednodušeného prístupu</string>
     <string name="select_address_activity">Vybrať adresu</string>
@@ -971,10 +971,10 @@ Niektoré z hlavných funkcií:
     <string name="files_limit">%1$d súborov zostáva</string>
     <string name="available_downloads_left">Je dostupných %1$d súborov na stiahnutie</string>
     <string name="install_paid">Úplná verzia</string>
-    <string name="use_magnetic_sensor_descr">Použiť magnetický senzor namiesto orientačného na zistenie hodnôt kompasu</string>
+    <string name="use_magnetic_sensor_descr">Použiť magnetický senzor namiesto orientačného na zistenie hodnôt kompasu.</string>
     <string name="use_magnetic_sensor">Použiť magnetický senzor (kompas)</string>
     <string name="wait_current_task_finished">Prosím, čakajte, kým sa dokončí aktuálna úloha</string>
-    <string name="use_kalman_filter_compass_descr">Zníži šum v hodnotách z kompasu, ale spomalí zmeny smeru</string>
+    <string name="use_kalman_filter_compass_descr">Zníži šum v hodnotách z kompasu, ale spomalí zmeny smeru.</string>
     <string name="use_kalman_filter_compass">Použiť Kalmanov filter</string>
     <string name="delete_point">Odstrániť bod</string>
     <string name="plugin_distance_point_time">čas</string>
@@ -1033,7 +1033,7 @@ Niektoré z hlavných funkcií:
     <string name="edit_tilesource_choose_existing">Zvoliť existujúci…</string>
     <string name="maps_define_edit">Určiť/Upraviť…</string>
     <string name="map_widget_fps_info">Ladiace info o FPS</string>
-    <string name="driving_region_descr">Výber jazdnej oblasti: USA, Európa, Spojené kráľovstvo, Ázia a ostatné</string>
+    <string name="driving_region_descr">Vyberte jazdnú oblasť: USA, Európa, Spojené kráľovstvo, Ázia a ostatné.</string>
     <string name="driving_region">Jazdná oblasť</string>
     <string name="driving_region_japan">Japonsko</string>
     <string name="driving_region_us">Spojené štáty</string>
@@ -1042,7 +1042,7 @@ Niektoré z hlavných funkcií:
     <string name="driving_region_uk">UK, India a podobné</string>
     <string name="announce_gpx_waypoints">GPX waypointy</string>
     <string name="speak_title">Ohlásiť…</string>
-    <string name="speak_descr">Konfigurácia ohlásení názvov ulíc, dopravných varovaní (vynútené zastavenia, spomaľovače), upozornení na radary, obmedzení rýchlosti</string>
+    <string name="speak_descr">Konfigurácia ohlásení názvov ulíc, dopravných varovaní (vynútené zastavenia, spomaľovače), upozornení na radary, obmedzení rýchlosti.</string>
     <string name="speak_street_names">Názvy ulíc (TTS)</string>
     <string name="osb_author_or_password_not_specified">Prosím, zadajte používateľa OSM a heslo v nastaveniach</string>
     <string name="clear_intermediate_points">Zmazať prechodné body</string>
@@ -1149,12 +1149,12 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="app_mode_aircraft">Lietadlo</string>
     <string name="app_modes_choose">Profily aplikácie</string>
     <string name="map_widget_map_rendering">Vykresľovanie mapy</string>
-    <string name="app_modes_choose_descr">Zvoľte profily použitia, ktoré majú byť viditeľné v aplikácii</string>
+    <string name="app_modes_choose_descr">Zvoľte profily použitia, ktoré majú byť viditeľné v aplikácii.</string>
     <string name="amenity_type_seamark">Morská značka</string>
     <string name="complex_route_calculation_failed">Rýchly prepočet trasy zlyhal (%s), použije sa pomalý výpočet.</string>
-    <string name="disable_complex_routing_descr">Vypnúť dvojfázovú navigáciu pre režim auta</string>
+    <string name="disable_complex_routing_descr">Vypnúť dvojfázovú navigáciu pre režim auta.</string>
     <string name="disable_complex_routing">Vypnúť komplexnú navigáciu</string>
-    <string name="speech_rate_descr">Zadajte rýchlosť reči TTS</string>
+    <string name="speech_rate_descr">Zadajte rýchlosť reči TTS.</string>
     <string name="speech_rate">Rýchlosť reči</string>
     <string name="guidance_preferences_descr">Nastavenia navigácie</string>
     <string name="routing_preferences_descr">Nastavenia určovania trasy</string>
@@ -1166,19 +1166,19 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="android_19_location_disabled">Od Androidu verzie 4.4 (KitKat) nie je možné sťahovať a aktualizovať mapy v pôvodnom úložnom priečinku (%s). Chcete ho zmeniť na vhodné nové úložisko a skopírovať tam všetky súbory?
 \n Poznámka 1: pôvodné súbory zostanú nedotknuté (môžete ich neskôr vymazať ručne).\n Poznámka 2: v novom úložisku nebude možné zdieľať súbory medzi OsmAnd a OsmAnd+.</string>
     <string name="routing_attr_prefer_motorway_name">Uprednostniť diaľnice</string>
-    <string name="routing_attr_prefer_motorway_description">Uprednostniť diaľnice</string>
+    <string name="routing_attr_prefer_motorway_description">Uprednostniť diaľnice.</string>
     
     
     <string name="routing_attr_avoid_toll_name">Vyhnúť sa spoplatneným cestám</string>
-    <string name="routing_attr_avoid_toll_description">Vyhnúť sa spoplatneným cestám</string>
+    <string name="routing_attr_avoid_toll_description">Vyhnúť sa spoplatneným cestám.</string>
     <string name="routing_attr_avoid_unpaved_name">Vyhnúť sa nespevneným cestám</string>
-    <string name="routing_attr_avoid_unpaved_description">Vyhnúť sa nespevneným cestám</string>
+    <string name="routing_attr_avoid_unpaved_description">Vyhnúť sa nespevneným cestám.</string>
     <string name="routing_attr_avoid_ferries_name">Vyhnúť sa trajektom</string>
-    <string name="routing_attr_avoid_ferries_description">Vyhnúť sa trajektom</string>
+    <string name="routing_attr_avoid_ferries_description">Vyhnúť sa trajektom.</string>
     <string name="routing_attr_avoid_motorway_name">Vyhnúť sa diaľniciam</string>
-    <string name="routing_attr_avoid_motorway_description">Vyhnúť sa diaľniciam</string>
+    <string name="routing_attr_avoid_motorway_description">Vyhnúť sa diaľniciam.</string>
     <string name="routing_attr_weight_name">Hmotnostný limit</string>
-    <string name="routing_attr_weight_description">Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách</string>
+    <string name="routing_attr_weight_description">Zadajte hmotnosť vozidla, ktorá musí byť povolená na cestách.</string>
     <string name="select_gpx">Vybrať GPX…</string>
     <string name="route_descr_select_destination">Vybrať cieľ</string>
     <string name="route_preferences">Predvoľby trasy</string>
@@ -1363,7 +1363,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="gpx_selection_track">%1$s \nStopa %2$s</string>
     <string name="save_as_favorites_points">Uložiť ako skupinu obľúbených</string>
     <string name="select_destination_and_intermediate_points">Vybrať ciele</string>
-    <string name="layer_amenity_label">Popisy bodov</string>
+    <string name="layer_amenity_label">Prekrývacie popisy bodov</string>
     <string name="show_zoom_buttons_navigation_descr">Zobraziť tlačidlá priblíženia počas navigácie.</string>
     <string name="show_zoom_buttons_navigation">Zobraziť tlačidlá priblíženia</string>
     <string name="sort_by_distance">Zoradiť podľa vzdialenosti</string>
@@ -1751,9 +1751,9 @@ Dĺžka %2$s</string>
     <string name="application_dir_change_warning3">Chcete aby OsmAnd skopíroval svoje údaje do nového cieľa?</string>
     <string name="rendering_attr_hideHouseNumbers_name">Čísla domov</string>
     
-    <string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hranice do inej krajiny</string>
+    <string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hranice do inej krajiny.</string>
     <string name="routing_attr_height_name">Výškový limit</string>
-    <string name="routing_attr_height_description">Zadajte výšku vozidla aká musí byť povolená na cestách</string>
+    <string name="routing_attr_height_description">Zadajte výšku vozidla, ktorá musí byť povolená na cestách.</string>
     <string name="use_fast_recalculation">Inteligentné prepočítanie trasy</string>
     <string name="use_fast_recalculation_desc">Pri dlhých výletoch prepočítať iba začiatočný úsek trasy</string>
     <string name="osmo_share_my_location">Odosielať polohu</string>
@@ -2027,7 +2027,7 @@ Dĺžka %2$s</string>
     <string name="use_drawer_btn">Použiť menu</string>
     <string name="please_specify_poi_type_only_from_list">Prosím zadajte správny typ POI alebo ho preskočte.</string>
     <string name="routing_attr_avoid_stairs_name">Vyhnúť sa schodom</string>
-	<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom</string>
+	<string name="routing_attr_avoid_stairs_description">Vyhnúť sa schodom.</string>
 	<string name="routing_attr_avoid_borders_name">Vyhnúť sa hraničným priechodom</string>
 	
 	
@@ -2782,10 +2782,10 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="wrong_user_name">Chybné používateľské meno!</string>
     <string name="shared_string_to">Do</string>
     <string name="mapillary_menu_date_from">Od</string>
-    <string name="mapillary_menu_descr_dates">Zobraziť obrázky pridané v danom období.</string>
-    <string name="mapillary_menu_title_dates">Dátumy</string>
+    <string name="mapillary_menu_descr_dates">Zobraziť iba obrázky pridané</string>
+    <string name="mapillary_menu_title_dates">Dátum</string>
     <string name="mapillary_menu_edit_text_hint">Zadajte meno používateľa</string>
-    <string name="mapillary_menu_descr_username">Zobraziť obrázky pridané daným používateľom.</string>
+    <string name="mapillary_menu_descr_username">Zobraziť iba obrázky pridané</string>
     <string name="mapillary_menu_title_username">Meno používateľa</string>
     <string name="mapillary_menu_filter_description">Môžete filtrovať obrázky podľa odosielateľa alebo dátumu. Filtre sa aplikujú len pri vysokom priblížení.</string>
     <string name="store_tracks_in_monthly_directories">Ukladať zaznamenané stopy v priečinkoch po mesiacoch</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index 21473cd9ea..a4a099f762 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2896,4 +2896,10 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="shared_string_navigate">Začni z navigacijo</string>
     <string name="marker_save_as_track_descr">Izvozi oznake v datoteko:</string>
     <string name="make_active">Označi kot dejavno</string>
+    <string name="appearance_on_the_map">Videz na zemljevidu</string>
+    <string name="track_waypoints">Vmesne točke sledi</string>
+    <string name="favourites_group">Skupina priljubljenih</string>
+    <string name="add_group">Dodaj skupino</string>
+    <string name="empty_state_markers_groups">Uvozi skupine</string>
+    <string name="shared_string_paste">Prilepi</string>
     </resources>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index b9df5609cc..138041194f 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,29 +12,29 @@
     <string name="looking_for_tracks_with_waypoints">Looking for tracks with waypoints</string>
     <string name="appearance_on_the_map">Appearance on the map</string>
     <string name="add_track_to_markers_descr">Select track waypoints of which OsmAnd will add to markers</string>
-    <string name="add_favourites_group_to_markers_descr">Select which favourite group you want to add to markers. We show only tracks with waypoints</string>
+    <string name="add_favourites_group_to_markers_descr">Select favorite group you want to add to markers. We show only tracks with waypoints</string>
     <string name="track_waypoints">Track waypoints</string>
-    <string name="favourites_group">Favourites group</string>
+    <string name="favourites_group">Favorites group</string>
     <string name="add_group">Add group</string>
-    <string name="add_group_descr">You can add group of favourites or track waypoints.</string>
+    <string name="add_group_descr">You can add a group of favorites or track waypoints.</string>
     <string name="empty_state_markers_active">Markers on map!</string>
-    <string name="empty_state_markers_active_desc">Mark places on map by tap.</string>
+    <string name="empty_state_markers_active_desc">Mark places on the map by a tap.</string>
     <string name="empty_state_markers_groups">Import groups</string>
-    <string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
+    <string name="empty_state_markers_groups_desc">You can import favorite groups or track waypoints as markers.</string>
     <string name="empty_state_markers_history">@string/shared_string_history</string>
     <string name="empty_state_markers_history_desc">Markers marked as passed will appear on this screen.</string>
     <string name="shared_string_two">Two</string>
     <string name="shared_string_one">One</string>
-    <string name="show_guide_line_descr">A line connecting your location to locations of the active markers will be shown on the map.</string>
-    <string name="show_arrows_descr">One or two arrows indicating the direction to the active markers will be shown on the map.</string>
-    <string name="distance_indication_descr">Choose how you\'d like to view the distance to the active markers.</string>
-    <string name="active_markers_descr">Choose how many direction indicators you\'d like to see.</string>
+    <string name="show_guide_line_descr">Display guidelines from your position to the active marker locations.</string>
+    <string name="show_arrows_descr">Display one or two arrows indicating the direction to the active markers.</string>
+    <string name="distance_indication_descr">Choose how to display the distance to active markers.</string>
+    <string name="active_markers_descr">Choose how many direction indicators are displayed.</string>
     <string name="digits_quantity">Digits quantity</string>
     <string name="shared_string_right">Right</string>
     <string name="shared_string_left">Left</string>
     <string name="show_number_pad">Show number pad</string>
     <string name="shared_string_paste">Paste</string>
-    <string name="coordinate_input_accuracy_description">Automatically switch to the next field after entering %1$d digits after the decimal point</string>
+    <string name="coordinate_input_accuracy_description">Automatically switch to the next field after entering %1$d digits after the decimal point.</string>
     <string name="coordinate_input_accuracy">%1$d digits</string>
     <string name="go_to_next_field">Go to next field</string>
     <string name="rename_marker">Rename marker</string>