diff --git a/OsmAnd/res/drawable-hdpi/ic_small_warning.png b/OsmAnd/res/drawable-hdpi/ic_small_warning.png
new file mode 100644
index 0000000000..97c711aa54
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/ic_small_warning.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_small_warning.png b/OsmAnd/res/drawable-mdpi/ic_small_warning.png
new file mode 100644
index 0000000000..37bc1b2fbb
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/ic_small_warning.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xhdpi/ic_small_warning.png
new file mode 100644
index 0000000000..31637b59ed
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/ic_small_warning.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png b/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png
new file mode 100644
index 0000000000..eac498dafa
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_small_warning.png differ
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 741d114d49..2c2b4ae1e5 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -36,7 +36,7 @@
     
     <string name="local_indexes_cat_av">بيانات الصوت / الفيديو</string>
     <string name="stop_routing_confirm">هل أنت متأكد أنك تريد إيقاف الملاحة؟</string>
-    <string name="clear_dest_confirm">هل أنت متأكد أنك تريد مسح نقطة الوجهة (والوجهات الوسيطية) ؟</string>
+    <string name="clear_dest_confirm">هل أنت متأكد أنك تريد مسح نقطة الوجهة (والوجهات المتوسطة) ؟</string>
     <string name="precise_routing_mode">التوجيه الدقيق (ألفا)</string>
     <string name="recording_context_menu_precord">التقاط صورة</string>
     <string name="dropbox_plugin_name">ملحق دروب بوكس</string>
@@ -76,7 +76,7 @@
 	<string name="map_widget_show_destination_arrow">أظهر إتجاه المقصد</string>
     <string name="map_widget_monitoring_services">خدمات التسجيل</string>
 	<string name="no_route">لا طريق</string>
-	<string name="delete_target_point">إزالة وجهة</string>
+	<string name="delete_target_point">إزالة الوجهة</string>
     <string name="new_destination_point_dialog">لقد حددت نقطة وجهة سابقا:</string>
     <string name="target_points">الوجهات</string>
     <string name="btn_advanced_mode">الوضع المتقدم…</string>
@@ -103,7 +103,7 @@
 	<string name="avoid_in_routing_descr">تجنب الطرق ذات الرسوم، وغير المعبدة، والعبارات</string>
 	
 	
-	<string name="gps_wakeup_interval">GPS إيقاظ الفاصل الزمني: %s</string>
+	<string name="gps_wakeup_interval">الفاصل الزمني لإستيقاظ نظام تحديد المواقع: %s</string>
 	<string name="int_continuosly">متواصل</string>
 	<string name="screen_is_locked">لفتح قفل الشاشة اضغط على أيقونة القفل</string>
 	<string name="map_widget_top_text">اسم الشارع</string>
@@ -322,7 +322,7 @@
     <string name="local_index_tile_data_downloadable">قابل للتنزيل: %1$s</string>
     <string name="local_index_tile_data_maxzoom">أقصى تكبير: %1$s</string>
     <string name="local_index_tile_data_minzoom">أدنى تكبير: %1$s</string>
-    <string name="maps_define_edit">تعريف/تحرير…</string>
+    <string name="maps_define_edit">تعريف/تعديل…</string>
 	    
     
     <string name="speak_descr">ضبط إعدادات نطق أسماء الشوارع، وتحذيرات المرور (توقيفات الإجبارية، ومطبات السرعة)، و تحذيرات كاميرات السرعة، و السرعة القصوى</string>
@@ -370,7 +370,7 @@
     <string name="rendering_attr_roadColors_description">اختر نظام ألوان الطريق:</string>
 	<string name="rendering_attr_roadColors_name">نظام ألوان الطريق</string>
     <string name="target_point">الوجهة %1$s</string>
-    <string name="intermediate_point">الوجهة الوسيطة %1$s</string>
+    <string name="intermediate_point">الوجهة المتوسطة %1$s</string>
     <string name="context_menu_item_last_intermediate_point">أضف كآخر وجهة وسيطة</string>
     <string name="context_menu_item_first_intermediate_point">أضف كأول وجهة وسيطة</string>
     
@@ -404,7 +404,7 @@
     <string name="add_tag">أضف وسما</string>
     <string name="show_warnings_descr">ضبط تحذيرات المرور ( حدود السرعة، والتوقف القسري، والمطبات الصناعية ) ، وتحذيرات كاميرا السرعة ، ومعلومات الممرات</string>
 	
-    <string name="local_index_tile_data_zooms">التقريبات المُنزّلة: %1$s</string>
+    <string name="local_index_tile_data_zooms">التكبيرات المُنزّلة: %1$s</string>
     <string name="local_index_tile_data_name">معلومات التّجانب: %1$s</string>
     <string name="edit_tilesource_successfully">حُفِظ المصدر التّجانبي %1$s بنجاح</string>
     <string name="use_compass_navigation_descr">استخدم البوصلة عندما لا تكون هناك أي وجهة محددة</string>
@@ -445,7 +445,7 @@
 	
 	<string name="map_widget_next_turn_small">المنعطف التالي (صغير)</string>
 	<string name="map_widget_next_next_turn">المنعطف الثاني</string>
-	<string name="map_widget_mini_route">خريطة الطريق مصغرة</string>
+	<string name="map_widget_mini_route">خريطة طريق مصغرة</string>
 	<string name="bg_service_interval">تعيين الفاصل الزمني للتنبيه:</string>
 	<string name="continue_follow_previous_route_auto">المسار السابق لم يكتمل. هل تريد متابعته؟ (%1$s ثانية)</string>
 	<string name="route_updated_loc_found">سيعاد احتساب المسار حالما يتم العثور على الموقع</string>
@@ -469,7 +469,7 @@
 	<string name="av_photo_play_sound_descr">فعّل هذا في حال رغبتك بسماع نغمة التقاط الصّور</string>
 <string name="edit_tilesource_elliptic_tile">نموذج مركتور البيضوي</string>
     
-    <string name="route_descr_lat_lon">خط عرض %1$.3f، طول %2$.3f</string>
+    <string name="route_descr_lat_lon">خط عرض %1$.3f، خط طول %2$.3f</string>
     
 	
 	
@@ -550,7 +550,7 @@
 	<string name="index_settings">إدارة بيانات الخرائط</string>
 	<string name="general_settings">عام</string>
 	<string name="general_settings_descr">ضبط العرض والإعدادات العامة للتطبيق</string>
-	<string name="open_street_map_login_descr">مطلوب للمساهمة في openstreetmap.org</string>
+	<string name="open_street_map_login_descr">مطلوب لطلبات openstreetmap.org</string>
 	
 	<string name="local_openstreetmap_uploading">يرفع …</string>
 	<string name="local_openstreetmap_uploadall">رفع الكل</string>
@@ -629,18 +629,8 @@
     <string name="animate_routing_route">حاكي باستخدام المسار المحتسب </string>
     <string name="animate_routing_gpx">حاكي باستخدام مسار GPX</string>
     <string name="shared_string_remember_my_choice">تذكر اختياري</string>
-    
-    
-    
-    
-    
-    
-    
-    
-    
 	
-	<string name="native_app_allocated_memory_descr">المساحة المحجوزة من الذّاكرة الأصلية %1$s MB (Dalvik %2$s MB, other %3$s MB).
-		الذّاكرة النّسبية %4$s MB (الأقصى لأندرويد %5$s MB, Dalvik %6$s MB).</string>
+	<string name="native_app_allocated_memory_descr">إجمالي الذاكرة الأصلية المخصصة من قبل التطبيق %1$s ميغابايت (Dalvik %2$s ميغابايت، الأخرى %3$s ميغابايت). الذاكرة النسبية %4$s ميغابايت (حد الجهاز %5$s ميغابايت Dalvik %6$s ميغابايت).</string>
 	<string name="app_mode_hiking">مشي</string>
     <string name="app_mode_motorcycle">دراجة نارية</string>
     <string name="app_mode_boat">قارب</string>
@@ -967,7 +957,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="local_index_mi_backup">عطّل</string>
 	
 	<string name="local_index_mi_reload">حدّث من sdcard</string>
-	<string name="shared_string_download">تنزيل</string>
+	<string name="shared_string_download">تحميل</string>
 	<string name="local_index_poi_data">بيانات POI</string>
 	<string name="local_index_address_data">بيانات العناوين</string>
 	<string name="local_index_transport_data">بيانات وسائل النقل العام</string>
@@ -1086,7 +1076,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="amenity_type_sport">رياضة</string>
 	<string name="amenity_type_sustenance">رزق</string>
 	<string name="amenity_type_tourism">سياحة</string>
-	<string name="indexing_address">يفهرس العنوان…</string>
+	<string name="indexing_address">فهرسة العنوان…</string>
 	<string name="indexing_map">يفهرس الخريطة…</string>
 	<string name="indexing_poi">يفهرس POI…</string>
 	<string name="indexing_transport">جاري فهرسة وسائل النقل…</string>
@@ -1185,7 +1175,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
  ملاحظة 1 : الملفات القديمة ستبقى كما هي دون لمس (ولكن يمكن حذفها يدويا).
 
  ملاحظة 2 : لا يمكن مشاركة الملفات بين OsmAnd و +OsmAnd في مكان التخزين الجديد.</string>
-    <string name="copying_osmand_one_file_descr">ينسخ الملف (%s) إلى مساره الجديد…</string>
+    <string name="copying_osmand_one_file_descr">نسخ الملف (%s) إلى مساره الجديد…</string>
     <string name="arrival_distance">إخطار الوصول</string>
     <string name="arrival_distance_descr">هل تريد أن يعلمك البرنامج عند الوصول إلى مقصدك؟</string>
     <string name="keep_informing_never">أبدًا</string>
@@ -1221,7 +1211,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="shared_string_search">بحث</string>
 	<string name="shared_string_show_description">عرض الوصف</string>
 	<string name="shared_string_message">رسالة</string>
-	<string name="welmode_download_maps">تنزيل الخرائط</string>
+	<string name="welmode_download_maps">تحميل الخرائط</string>
 	<string name="welcome_select_region">لعرض إشارات وقواعد المرور بشكل صحيح، من فضلك اختر منطقة القيادة:</string>
 	<string name="shared_string_add_to_favorites">إضافة إلى المواقع المفضلة</string>
 	<string name="shared_string_my_places">مواقعي</string>
@@ -1251,7 +1241,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="general_settings_2">الإعدادات العامة</string>
 	<string name="shared_string_ellipsis">…</string>
 	<string name="shared_string_ok">موافق</string>
-	<string name="shared_string_dismiss">تجاهل</string>
+	<string name="shared_string_dismiss">انصراف</string>
 	<string name="shared_string_do_not_use">لا تستخدم</string>
 	<string name="shared_string_enable">تفعيل</string>
 	<string name="shared_string_disable">تعطيل</string>
@@ -1325,7 +1315,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 	<string name="no_fav_to_save">لم يتم العثور على نقاط أماكن مفضلة للقيام بالاحتفاظ بها</string>
 	<string name="fav_points_edited">تم تحرير النقطة المفضلة</string>
 	<string name="fav_points_not_exist">لا وجود لأية نقطة مفضلة</string>
-	<string name="favourites_context_menu_edit">تحرير المفضلة</string>
+	<string name="favourites_context_menu_edit">تعديل المفضلة</string>
 	<string name="favourites_context_menu_delete">حذف المفضلة</string>
 	<string name="favourites_remove_dialog_msg">إزالة النقطة المفضلة \'%s\' ؟</string>
 	<string name="favourites_remove_dialog_success">تم بنجاح حذف النقطة المفضلة {0}.</string>
@@ -1408,7 +1398,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="traffic_warning_speed_limit">حد السرعة</string>
     <string name="sleep_mode_stop_dialog">"إيقاف وضع GPS المفعل في الخلفية  ؟"</string>
 	<string name="stop_navigation_service">إيقاف</string>
-	<string name="confirm_every_run">دائماً اسأل</string>
+	<string name="confirm_every_run">إسأل دائماً</string>
 	<string name="save_global_track_interval">الفاصل الزمني العام للتسجيل</string>
 	<string name="background_service_int">الفاصل الزمني لإيقاظ GPS</string>
 	<string name="enable_sleep_mode">تفعيل وضع GPS في الخلفية</string>
@@ -1865,7 +1855,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="osmo_tracker_id_descr">اضغط لمعاينة معرف المتعقب</string>
     <string name="osmo_share_my_location">إرسال الموقع</string>
     <string name="hello">تطبيق الملاحة أوسماند OSMAnd</string>
-    <string name="update_poi_error_loading">خطأ أثناء تحميل البيانات من الخادم</string>
+    <string name="update_poi_error_loading">حدث خطأ أثناء تحميل البيانات من السيرفر</string>
     <string name="context_menu_item_update_map_confirm">تحديث البيانات المحلية عبر الإنترنت ؟</string>
     <string name="search_history_street">الشارع : {0}، {1}</string>
     <string name="search_history_int_streets">تقاطع : {0} x {1} في {2}</string>
@@ -1920,7 +1910,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="features_menu_group">ميزات</string>
     <string name="help_us_to_improve_menu_group">ساعدنا على تحسين أوسماند OSMAnd</string>
     <string name="first_usage_item">أول استخدام</string>
-    <string name="first_usage_item_description">كيفية تحميل الخرائط وتعيين الإعدادات الأساسية</string>
+    <string name="first_usage_item_description">كيفية تحميل الخرائط، تعيين الإعدادات الأساسية</string>
     <string name="planning_trip_item">التخطيط لرحلة</string>
     <string name="faq_item">الأسئلة المتداولة</string>
     <string name="faq_item_description">الأسئلة المتداولة</string>
@@ -2047,7 +2037,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="rendering_attr_hideUnderground_name">أشياء تحت الأرض</string>
     <string name="data_is_not_available">البيانات غير متوفرة</string>
     <string name="shared_string_read_more">إقرأ المزيد</string>
-    <string name="road_blocked">الطريق محظورة</string>
+    <string name="road_blocked">طريق مسدود</string>
     <string name="shared_string_select">حدد</string>
     <string name="switch_start_finish">إعكس نقطة الانطلاق و الوصول</string>
     <string name="rendering_attr_hideIcons_name">أيقونات ال POI</string>
@@ -2161,7 +2151,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
 (المساحة المتوفرة هي {2} مب.)</string>
     <string name="transport_route_distance">مسافة المسلك</string>
     <string name="update_poi_error_local">خطأ تحيين القائمة المحلية للPOI</string>
-    <string name="context_menu_item_update_poi">تحيين الPOI</string>
+    <string name="context_menu_item_update_poi">تحديث POI</string>
     <string name="upload_osm_note_description">يمكنك رفع ملاحظات OSM الخاصة بك بصفة مخفية أو استخدام حسابك على openstreetmap.org .</string>
     <string name="add_points_to_map_markers_q">هل تريد اضافة جميع النقاط الى العلامات الموضعية؟</string>
     <string name="clear_markers_history_q">هل تريد مسح جميع محفوظات العلامات الموضعية؟</string>
@@ -2261,7 +2251,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="route_general_information">المسافة الإجمالية %1$s، مدة السفر %2$d سا و %3$d د.</string>
     <string name="back_to_search">العودة إلى البحث</string>
     <string name="consider_turning_polygons_off">من المستحسن إيقاف عرض المضلعات.</string>
-    <string name="access_from_map_description">يطلق زر القائمة لوحة التحكم و ليس القائمة بحد ذاتها</string>
+    <string name="access_from_map_description">زر القائمة يشغل لوحة التحكم و ليس القائمة بحد ذاتها</string>
     <string name="confirmation_to_delete_history_items">هل تريد حذف العناصر المحددة من السجل؟</string>
     <string name="access_direction_haptic_feedback">توجيه رد فعل الهزاز</string>
     <string name="please_specify_poi_type_only_from_list">يرجى تحديد نوع POI الصحيح أو تخطيه</string>
@@ -2558,7 +2548,7 @@ OsmAnd هو المصدر المفتوح و التي يجري تطويرها بن
     <string name="first_usage_greeting">أحصل على التوجيهات واكتشف أماكن جديدة دون إنترنت</string>
     <string name="search_my_location">البحث في موقعي</string>
     <string name="get_for">تحصل عليه بـ %1$s</string>
-    <string name="get_for_month">تحصل عليه لـ %1$s أشهر</string>
+    <string name="get_for_month">تحصل عليه بـ %1$s في الشهر</string>
     <string name="osm_live_banner_desc">تحصل على عدد غير محدود من تنزيلات الخرائط والتحديثات في الشهر : أسبوعيا، يوميا أو كل ساعة.</string>
     <string name="osmand_plus_banner_desc">نسخة كاملة من تطبيق أواسام آند مع تنزيل غير محدود وتحديثات شهرية للخرائط .</string>
     <string name="si_mi_meters">أميال/أمتار</string>
diff --git a/OsmAnd/res/values-az/phrases.xml b/OsmAnd/res/values-az/phrases.xml
index 3dfa9bf592..2f98302831 100644
--- a/OsmAnd/res/values-az/phrases.xml
+++ b/OsmAnd/res/values-az/phrases.xml
@@ -81,4 +81,10 @@
 	<string name="poi_outdoor">Açıq havada mağaza</string>
 	<string name="poi_paint">Boya mağazası</string>
 	<string name="poi_pet">Ev heyvanı mağazası</string>
+	<string name="poi_resource_diamond">Almaz</string>
+	<string name="poi_resource_gold">Qızıl</string>
+	<string name="poi_resource_graphite">Qrafit</string>
+	<string name="poi_resource_gravel">Çınqıl</string>
+	<string name="poi_resource_gypsum">Gips</string>
+	<string name="poi_resource_iron_ore">Dəmir filizi</string>
 	</resources>
diff --git a/OsmAnd/res/values-az/strings.xml b/OsmAnd/res/values-az/strings.xml
index 587c6486b8..5862e18c31 100644
--- a/OsmAnd/res/values-az/strings.xml
+++ b/OsmAnd/res/values-az/strings.xml
@@ -89,9 +89,7 @@
     <string name="osm_live_enter_email">Zəhmət olmasa düzgün E-poçt ünvanı daxil edin</string>
     <string name="osm_live_subscription_settings">Abunəlik parametrləri</string>
     <string name="upload_anonymously">Anonim olaraq yüklə</string>
-    <string name="download_files_question_space">{0} fayl endirilsin?
-{1} MB yaddaş istifədə olunub.
-({2} MB boş yaddaş var.)</string>
+    <string name="download_files_question_space">{0} fayl endirilsin? {1} MB yaddaş istifadə edir. ({2} MB boş yer var.)</string>
     <string name="upload_osm_note">OSM qeyd yüklə</string>
     <string name="shared_string_toolbar">Alətlər paneli</string>
     <string name="shared_string_widgets">Widget-lər</string>
@@ -200,7 +198,7 @@
     <string name="your_edits">Düzəlişləriniz</string>
     <string name="waypoint_visit_after">Sonra ziyarət et</string>
     <string name="waypoint_visit_before">Öncə ziyarət et</string>
-    <string name="tips_and_tricks_descr">Çox soruşulan suallar, son dəyişikliklər və digərləri</string>
+    <string name="tips_and_tricks_descr">Tez-tez verilən suallar, son dəyişikliklər və digərləri</string>
     <string name="shared_string_ellipsis">…</string>
     <string name="shared_string_ok">OK</string>
     <string name="shared_string_cancel">Ləğv et</string>
@@ -756,7 +754,7 @@
     <string name="features_menu_group">Xüsusiyyətlər</string>
     <string name="other_menu_group">Digər</string>
     <string name="first_usage_item">İlk istifadə</string>
-    <string name="faq_item_description">Çox soruşulan suallar</string>
+    <string name="faq_item_description">Tez-tez verilən suallar</string>
     <string name="versions_item">Versiyalar</string>
     <string name="contact_us">Bizimlə əlaqə</string>
     <string name="use_drawer_btn">Menyu istifadə et</string>
@@ -961,7 +959,7 @@
     <string name="online_photos">Onlayn şəkillər</string>
     <string name="shared_string_add_photos">Şəkillər əlavə et</string>
     <string name="live_updates">Canlı yeniləmələr</string>
-    <string name="access_from_map_description"/>
+    <string name="access_from_map_description">Menyu düyməsi menyunu yox, alət panelini açır</string>
     <string name="lang_als">Albanca (Tosk)</string>
     <string name="regions">Regionlar</string>
     <string name="days_behind">gün əvvəl</string>
@@ -977,7 +975,7 @@
     <string name="subscribe_email_desc">Proqramın endirimləri haqqında e-poçt siyahımıza abunə olun və əlavə 3 xəritə endirməsi əldə edin!</string>
     <string name="sea_depth_thanks">Dəniz dərinliyi konturlarını aldığınız üçün təşəkkürlər!</string>
     <string name="index_item_depth_contours_osmand_ext">Dəniz dərinliyi konturları</string>
-    <string name="index_item_depth_points_southern_hemisphere"/>
+    <string name="index_item_depth_points_southern_hemisphere">Dəniz dərinliyi cənub yarımkürəsində göstərilir</string>
     <string name="download_depth_countours">Dəniz dərinliyi konturları</string>
     <string name="nautical_maps">Dəniz xəritələri</string>
     <string name="do_not_send_anonymous_app_usage">Anonim proqram istifadəsi statistikalarını göndərmə</string>
@@ -1093,7 +1091,7 @@
     <string name="direction_style_clockwise">Saat istiqamətində (12 sektor)</string>
     <string name="settings_direction_style">İstiqamət stili</string>
     <string name="settings_direction_style_descr">Hərəkət zamanı nisbi istiqamətləri ifadə etmək üçün stil seçin</string>
-    <string name="accessibility_preferences_descr"/>
+    <string name="accessibility_preferences_descr">Xüsusi imkanlarla əlaqəli seçimlər</string>
     <string name="rendering_out_of_memory">Seçilən sahəni göstərmək üçün kifayət qədər proses yaddaşı yoxdur</string>
     <string name="free_version_message">Bu pulsuz OsmAnd versiyası %1$s endirmə ilə məhdudlaşır və offlayn Vikipediya məqalələrini dəstəkləmir.</string>
     <string name="index_name_other">Ümumdünya və mövzu xəritələri</string>
@@ -1229,7 +1227,7 @@
     <string name="general_settings_2">Əsas parametrlər</string>
     <string name="shared_string_dismiss">İmtina et</string>
     <string name="shared_string_io_error">I/O səhvi baş verdi</string>
-    <string name="shared_string_collapse"/>
+    <string name="shared_string_collapse">Yığışdır</string>
     <string name="route_points">Marşrut nöqtələri</string>
     <string name="srtm_plugin_name">Kontur xətləri</string>
     <string name="points">Nöqtələr</string>
@@ -1251,7 +1249,7 @@
     <string name="map_downloaded_descr">%1$s xəritəsi endirildi, indi istifadə etməyə başlaya bilərsiniz.</string>
     <string name="go_to_map">Xəritəni göstər</string>
     <string name="favorite_category_dublicate_message">Göstərilən kateqoriya adı artıq mövcuddur. Fərqli ad istifadə edin.</string>
-    <string name="region_maps"/>
+    <string name="region_maps">Region xəritələri</string>
     <string name="srtm_plugin_disabled">Kontur xətləri sönülüdür</string>
     <string name="default_speed_system_descr">Sürət vahidi təyin edin</string>
     <string name="default_speed_system">Sürət vahidi</string>
@@ -1393,7 +1391,7 @@
     <string name="local_indexes_cat_srtm">Kontur xətləri</string>
     <string name="distance_measurement_finish_subtrack">Yeni bir alt iz başlat</string>
     <string name="osmand_background_plugin_description">GPS cihazını vaxtaşırı oyadaraq arxa fon (ekran sönülü) rejimində naviqasiya və izləməni aktivləşdirmək üçün parametrləri göstərir.</string>
-    <string name="dropbox_plugin_description">Dropbox qoşması sizə izləri və səs/video qeydlərini Dropbox hesabınızla sinxorizasiya etməyə imkan verir.</string>
+    <string name="dropbox_plugin_description">Dropbox qoşması sizə izləri və səs/video qeydlərini Dropbox hesabınızla sinxronlaşdırmağa imkan verir.</string>
     <string name="enable_plugin_monitoring_services">Mövqe qeydiyyatı xidmətini (GPX qeydiyyatı, onlayn izləmə) istifadə etmək üçün Səyahət qeydetmə qoşmasını aktivləşdirin</string>
     <string name="gpxup_trackable">İzlənə bilən</string>
     <string name="gpx_monitoring_disabled_warn">GPX widget və ya “Səyahət qeydetmə” parametri ilə izləri qeyd et.</string>
@@ -1430,8 +1428,8 @@
     <string name="routing_attr_avoid_stairs_description">Pilləkənlərdən yayın</string>
     <string name="routing_attr_avoid_borders_name">Sərhəd keçidlərindən yayın</string>
     <string name="routing_attr_avoid_borders_description">Başqa ölkə ilə sərhəd kəsişmələrindən yayın</string>
-    <string name="routing_attr_weight_description">Marşrutlarda icazə veriləcək avtomobil çəkisini təyin edin</string>
-    <string name="routing_attr_height_description">Marşrutlarda icazə veriləcək avtomobil hündürlüyünü təyin edin</string>
+    <string name="routing_attr_weight_description">Marşrutlarda icazə veriləcək nəqliyyat vasitəsinin çəkisini təyin edin</string>
+    <string name="routing_attr_height_description">Marşrutlarda icazə veriləcək nəqliyyat vasitəsinin hündürlüyünü təyin edin</string>
     <string name="calculate_osmand_route_gpx">OsmAnd offlayn marşrut hesabla</string>
     <string name="app_mode_truck">Yük maşını</string>
     <string name="speech_rate_descr">TTS üçün danışıq sürəti təyin edin</string>
@@ -1531,4 +1529,46 @@
     <string name="ttsvoice">TTS səsi</string>
     <string name="internet_connection_required_for_online_route">Onlayn naviqasiya xidməti seçildi, amma internet bağlantısı yoxdur.</string>
     <string name="gpx_option_destination_point">Hazırki təyinat nöqtəsini istifadə et</string>
+    <string name="home">Alət paneli</string>
+    <string name="dahboard_options_dialog_title">Alət panelini tənzimlə</string>
+    <string name="use_dashboard_btn">Alət panelini istifadə et</string>
+    <string name="dashboard_or_drawer_title">Alət paneli va ya menyu idarə etməsi</string>
+    <string name="dashboard_or_drawer_description">Proqramı, əsasən, dəyişkən alət paneli və ya sabit menyu vasitəsilə idarə etmək üçün yeni seçim var. Seçiminizi alət paneli parametrlərində hər zaman dəyişə bilərsiniz.</string>
+    <string name="anonymous_user_hint">Anonim istifadəçi:
+\n- qruplar yarada;
+\n- qrupları və cihazları server ilə sinxronlaşdıra;
+\n- qrupları və cihazları veb-saytdakı şəxsi alət panelində idarə edə bilməz.</string>
+    <string name="access_from_map">Xəritədən giriş</string>
+    <string name="shared_string_accessibility">Xüsusi imkanlar</string>
+    <string name="accessibility_options">Xüsusi imkanlar seçimləri</string>
+    <string name="accessibility_mode">Xüsusi imkanlar rejimi</string>
+    <string name="accessibility_mode_descr">Xüsusi imkanlar xüsusiyyətlərini aktivləşdirir</string>
+    <string name="index_item_depth_points_northern_hemisphere">Dəniz dərinliyi şimal yarımkürəsində göstərilir</string>
+    <string name="no_waypoints_found">Yol nöqtələri tapılmadı</string>
+    <string name="context_menu_item_delete_waypoint">GPX yol nöqtəsi silinsin?</string>
+    <string name="context_menu_item_edit_waypoint">GPX nöqtəsinə düzəliş et</string>
+    <string name="waypoints">Yol nöqtələri</string>
+    <string name="announce_gpx_waypoints">GPX yol nöqtələri</string>
+    <string name="add_waypoint_dialog_added">GPX yol nöqtəsi “{0}” uğurla əlavə edildi</string>
+    <string name="context_menu_item_add_waypoint">GPX yol nöqtəsi əlavə et</string>
+    <string name="import_file_favourites">Məlumatlar GPX faylı olaraq saxlansın yoxsa yol nöqtələri Favoritlərə idxal edilsin?</string>
+    <string name="quick_action_add_gpx">GPX yol nöqtəsi əlavə et</string>
+    <string name="rotate_map_compass_opt">Kompasa görə</string>
+    <string name="rotate_map_bearing_opt">Hərəkət istiqamətində</string>
+    <string name="poi_context_menu_modify">POI-yə düzəliş et</string>
+    <string name="select_map_marker">Xəritə işarələyici seçin</string>
+    <string name="map_markers_other">Digər işarələyicilər</string>
+    <string name="rendering_attr_hideUnderground_name">Yeraltı obyektlər</string>
+    <string name="data_is_not_available">Məlumatlar mövcud deyil</string>
+    <string name="starting_point">Başlanğıc nöqtə</string>
+    <string name="rendering_attr_horseRoutes_name">At marşrutları</string>
+    <string name="show_on_start_description">“Sönülü” birbaşa xəritə ekranını başladır</string>
+    <string name="osm_save_offline">Offlayn saxla</string>
+    <string name="osn_add_dialog_error">Səhv baş verdi: qeyd yaradılmadı</string>
+    <string name="osn_close_dialog_error">Səhv baş verdi: qeyd bağladılmadı</string>
+    <string name="osb_comment_dialog_error">Səhv baş verdi: rəy əlavə edilmədi</string>
+    <string name="share_osm_edits_subject">OSM düzəlişləri OsmAnd ilə paylaşılıb</string>
+    <string name="rendering_attr_hideProposed_name">Təklif olunan obyektlər</string>
+    <string name="local_recordings_delete_all_confirm">%1$d qeydi silmək üzrəsiniz. Əminsiniz?</string>
+    <string name="local_osm_changes_upload_all_confirm">%1$d dəyişikliyi OSM-a yükləmək üzrəsiniz. Əminsiniz?</string>
     </resources>
diff --git a/OsmAnd/res/values-et/strings.xml b/OsmAnd/res/values-et/strings.xml
index 02377aed2b..0dc8094f97 100644
--- a/OsmAnd/res/values-et/strings.xml
+++ b/OsmAnd/res/values-et/strings.xml
@@ -148,4 +148,12 @@
     <string name="increase_search_radius">Suurenda otsingu raadiust</string>
     <string name="nothing_found">Midagi ei leitud :(</string>
     <string name="nothing_found_descr">Muuda otsingu päringut või suurenda otsingu raadiust</string>
+    <string name="map_widget_ruler_control_first_mode">Kahe punkti vaheline kaugus</string>
+    <string name="shared_string_permissions">Load</string>
+    <string name="import_gpx_failed_descr">OsmAnd ei saa faili importida. Palun veendu, et OsmAnd\'il on õigus lugeda faili selle asukohast.</string>
+    <string name="distance_moving">Kaugus parandatud</string>
+    <string name="mapillary_image">Mapillary pilt</string>
+    <string name="open_mapillary">Ava Mapillary</string>
+    <string name="shared_string_install">Paigalda</string>
+    <string name="online_photos">Veebi fotod</string>
     </resources>
diff --git a/OsmAnd/res/values-hu/phrases.xml b/OsmAnd/res/values-hu/phrases.xml
index 6c792887ed..27939af0f2 100644
--- a/OsmAnd/res/values-hu/phrases.xml
+++ b/OsmAnd/res/values-hu/phrases.xml
@@ -3404,4 +3404,6 @@
 	<string name="poi_motorcycle_clothes_yes">Motoros ruha</string>
 	<string name="poi_motorcycle_clothes_no">Motoros ruha: nincs</string>
 	<string name="poi_motorcycle_type_scooter">Robogó</string>
+	<string name="poi_zoo_enclosure">Kifutó</string>
+	<string name="poi_zoo_falconry">Solymászat</string>
 	</resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 54e996e604..f6dd5d54e4 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -126,7 +126,7 @@
     <string name="open_street_map_login_descr">openstreetmap.org felé történő adatküldéshez szükséges</string>
     <string name="user_password">OSM jelszavad</string>
     
-    <string name="osmand_service">Háttér mód</string>
+    <string name="osmand_service">Háttérmód</string>
     <string name="osmand_service_descr">Az OsmAnd háttérben fut, ha ki van kapcsolava a képernyő</string>
 
 
@@ -260,11 +260,11 @@ Ehhez {1} MB helyre van szükség.
     <string name="voice_stream_notification">Üzenetjel hangcsatorna</string>
     <string name="voice_stream_music">Zene hangcsatorna</string>
     <string name="warning_tile_layer_not_downloadable">%1$s térkép réteget nem tudja az alkalmazás letölteni, meg kell próbálni újratelepíteni.</string>
-    <string name="overlay_transparency_descr">Rátét áttetszőség megváltoztatása</string>
-    <string name="overlay_transparency">Rátét áttetszőség</string>
-    <string name="map_transparency_descr">Alaptérkép áttetszőség megváltoztatása</string>
-    <string name="map_transparency">Térkép áttetszőség</string>
-    <string name="modify_transparency">Áttetszőség megváltoztatása (0 - átlátszó, 255 - átlátszatlan)</string>
+    <string name="overlay_transparency_descr">Rátét átlátszóságának módosítása</string>
+    <string name="overlay_transparency">Rátét átlátszósága</string>
+    <string name="map_transparency_descr">Alaptérkép átlátszóságának módosítása</string>
+    <string name="map_transparency">Alaptérkép átlátszósága</string>
+    <string name="modify_transparency">Átlátszóság módosítása (0 - átlátszó, 255 - átlátszatlan)</string>
     <string name="layer_underlay">Alátét térkép…</string>
     <string name="map_underlay">Alátét térkép</string>
     <string name="map_underlay_descr">Alátét térkép kiválasztás</string>
@@ -418,7 +418,7 @@ Ehhez {1} MB helyre van szükség.
     <string name="transport_context_menu">Közlekedés keresése a célnál</string>
 
     
-    <string name="poi_context_menu_modify">POI módosítás</string>
+    <string name="poi_context_menu_modify">POI módosítása</string>
     <string name="poi_context_menu_delete">POI törlés</string>
     <string name="rotate_map_compass_opt">Iránytű alapján</string>
     <string name="rotate_map_bearing_opt">Mozgás alapján</string>
@@ -1115,7 +1115,7 @@ Néhány fontosabb funkció:
     <string name="accessibility_options">Kisegítő lehetőségek</string>
     <string name="select_address_activity">Cím kiválasztása</string>
     <string name="favourites_list_activity">Kedvenc kiválasztása</string>
-    <string name="local_openstreetmap_act_title">OSM módosítások</string>
+    <string name="local_openstreetmap_act_title">OSM-módosítások</string>
     <string name="shared_string_more_actions">További műveletek</string>
     <string name="download_using_mobile_internet">Jelenleg nincs Wi-Fi kapcsolat. Szeretnéd a jelenlegi Internetkapcsolatot használni a letöltéshez?</string>
     <string name="cancel_route">Útvonal elvetése</string>
@@ -1632,7 +1632,7 @@ Néhány fontosabb funkció:
     <string name="local_index_description">Egy meglévő elem adatainak megtekintéséhez kattints rá, a deaktiváláshoz és törléshez nyomd meg hosszan. Jelenlegi adatok az eszközön (%1$s szabad):</string>
     <string name="speed_limit_exceed">Sebességhatár tolerancia</string>
     <string name="speed_limit_exceed_message">Válaszd ki a sebességkorlát toleranciájának határát, amely fölött hangos figyelmeztetést fogsz kapni.</string>
-    <string name="fav_point_emoticons_message">A kedvenc hely neve módosítva lett erre: %1$s, lehetővé téve a hangulatjeleket tartalmazó szöveg fájlba mentését.</string>
+    <string name="fav_point_emoticons_message">A kedvenc hely neve erre módosult: %1$s, hogy lehetővé váljék a hangulatjeleket tartalmazó szöveg fájlba mentése.</string>
     <string name="print_route">Útvonal nyomtatása</string>
     <string name="osmo_device_not_found">Eszköz nem található</string>
     <string name="osmo_no_connection_msg">Nem sikerült csatlakozni az OsMo szerverhez:
@@ -1915,7 +1915,7 @@ Afganisztán, Albánia, Algéria, Amerikai Egyesült Államok, Andorra, Anglia,
     <string name="location_on_map">Helyzet:\n Szélesség %1$s\n Hosszúság %2$s</string>
     <string name="route_points">Útvonal pontok</string>
     <string name="action_create">Létrehozás művelet</string>
-    <string name="action_modify">Módosítás művelet</string>
+    <string name="action_modify">Módosítási művelet</string>
     <string name="action_delete">Törlés művelet</string>
     <string name="osm_edits">OSM szerkesztések</string>
     <string name="osmand_parking_hour">ó</string>
@@ -2260,7 +2260,7 @@ Hosszúság: %2$s</string>
     <string name="rendering_attr_roadStyle_description">Útstílus</string>
     <string name="poi_dialog_reopen">Újranyitás</string>
 	<string name="save_poi_without_poi_type_message">Biztosan elmented a POI-t típus nélkül?</string>
-    <string name="poi_context_menu_modify_osm_change">OSM szerkesztés módosítása</string>
+    <string name="poi_context_menu_modify_osm_change">OSM-szerkesztés módosítása</string>
     <string name="release_2_2">" • Új, környezetérzékeny menü térképre tapintáskor
 \n
 \n • Az alkalmazás már közvetlenül a térkép képernyővel indul a műszerfal helyett
@@ -2345,7 +2345,7 @@ Hosszúság: %2$s</string>
     <string name="osm_live_hide_user_name">Ne jelenjen meg a nevem a jelentésekben</string>
     <string name="osm_live_support_region">Támogatott régió</string>
     <string name="osm_live_month_cost">Havi költség</string>
-    <string name="osm_live_month_cost_desc">Havi kifizetés</string>
+    <string name="osm_live_month_cost_desc">Havi fizetés</string>
     <string name="osm_live_active">Aktív</string>
     <string name="osm_live_not_active">Inaktív</string>
     <string name="osm_live_enter_email">Kérlek, érvényes email címet adj meg</string>
@@ -2362,7 +2362,7 @@ Ha szereted az OsmAndot és az OSM-et, és szeretnéd támogatni a fejlődésük
     <string name="select_map_marker">Térképjelölő kiválasztása</string>
     <string name="map_markers_other">Egyéb jelölők</string>
     <string name="upload_anonymously">Feltöltés névtelenül</string>
-    <string name="show_transparency_seekbar">Átlátszóság csúszka megjelenítése</string>
+    <string name="show_transparency_seekbar">Átlátszóságcsúszka megjelenítése</string>
     <string name="download_files_error_not_enough_space">Nincs elég hely!
 A művelethez {3} MB ideiglenes és {1} MB végleges hely szükséges.
 Jelenleg csak {2} MB érhető el.</string>
@@ -2435,7 +2435,7 @@ Jelenleg csak {2} MB érhető el.</string>
 <string name="storage_permission_restart_is_required">Az alkalmazás már tud írni a külső tárolóra. Egy kézi alkalmazás újraindítás szükséges.</string>
     <string name="rec_split_desc">Klippek elvágása, ha a felhasznált hely túllépi a tárolási méretet</string>
     <string name="rec_split_clip_length_desc">Az egyes felvett klippek hossza nem lesz hosszabb a megadott időnél</string>
-    <string name="rec_split_storage_size_desc">Az összes klipp által elfoglalható hely</string>
+    <string name="rec_split_storage_size_desc">Az összes klip által elfoglalható hely</string>
     <string name="no_map_markers_found">Kérlek, vegyél fel jelölőket a térképen</string>
     <string name="no_waypoints_found">Nem találhatók útpontok</string>
     <string name="map_widget_bearing">Relatív irány</string>
@@ -2914,7 +2914,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="restart_search">Keresés újraindítása</string>
     <string name="increase_search_radius">Keresett terület szélesítése</string>
     <string name="nothing_found">Nincs találat :(</string>
-    <string name="nothing_found_descr">Módosítsd a keresőkifejezést vagy növeld a keresési sugarat</string>
+    <string name="nothing_found_descr">Módosítsd a keresőkifejezést vagy növeld a keresés sugarát</string>
     <string name="mapillary">Mapillary</string>
     <string name="shared_string_add_photos">Fényképek hozzáadása</string>
     <string name="no_photos_descr">Erről a helyről nincsenek fényképeink</string>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index 88c0912093..21c07242cc 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -2039,4 +2039,168 @@
 	<string name="poi_australian_football">Ástralskur fótbolti</string>
 	<string name="poi_equestrian">Hestaíþróttir</string>
 	<string name="poi_ice_skating">Skautar á ís</string>
+	<string name="poi_zoo_type">Tegund</string>
+	<string name="poi_motorcycle_services">Þjónusta</string>
+	<string name="poi_motorcycle_type">Tegund bifhjóls</string>
+
+<string name="poi_craft_winery">Víngerð</string>
+
+	<string name="poi_club_art">Listaklúbbur</string>
+	<string name="poi_club_computer">Tölvuklúbbur</string>
+	<string name="poi_club_board_games">Borðleikjaklúbbur</string>
+	<string name="poi_club_sport">Íþróttafélag</string>
+	<string name="poi_club_game">Leikjaklúbbur</string>
+	<string name="poi_club_chess">Skákfélag</string>
+	<string name="poi_club_cinema">Kvikmyndaklúbbur</string>
+	<string name="poi_club_fan">Aðdáendaklúbbur</string>
+	<string name="poi_club_fishing">Fiskveiðiklúbbur</string>
+	<string name="poi_club_linux">Linux-áhugamannaklúbbur</string>
+	<string name="poi_club_theatre">Leiklistarfélag</string>
+	<string name="poi_club_history">Sagnfræðifélag</string>
+	<string name="poi_club_music">Tónlistarklúbbur</string>
+	<string name="poi_club_photography">Ljósmyndaklúbbur</string>
+	<string name="poi_club_shooting">Skotfimifélag</string>
+	<string name="poi_club_charity">Góðgerðafélag</string>
+	<string name="poi_club_freemasonry">Frímúrarastúka</string>
+	<string name="poi_club_sailing">Siglingaklúbbur</string>
+	<string name="poi_club_scout">Skátafélag</string>
+
+	<string name="poi_farmyard">Hlað</string>
+	<string name="poi_pension_fund">Eftirlaunasjóður</string>
+	<string name="poi_office_administrative">Stjórnsýsluskrifstofa</string>
+	<string name="poi_isolated_dwelling">Einangraður bústaður</string>
+	<string name="poi_notary">Lögbókandi</string>
+	<string name="poi_tax_advisor">Skrifstofa skattaráðgjafa</string>
+
+	<string name="poi_orienteering">Ratleikir</string>
+	<string name="poi_paragliding">Svifdrekaflug</string>
+	<string name="poi_rugby_union">Rúgbýsamband</string>
+	<string name="poi_rugby_league">Rúgbýdeild</string>
+	<string name="poi_skateboard">Hjólabretti</string>
+	<string name="poi_archaeological_site">Fornminjar</string>
+	<string name="poi_boundary_stone">Sýslusteinn</string>
+	<string name="poi_city_gate">Borgarhlið</string>
+	<string name="poi_aquarium">Fiskabúr</string>
+	<string name="poi_theme_park">Þemagarður</string>
+
+	<string name="poi_tourism_yes">Ferðamannastaður</string>
+	<string name="poi_attraction_animal">Dýrasýning</string>
+	<string name="poi_attraction_swing_carousel">Hringekja</string>
+	<string name="poi_attraction_train">Ferðamannalest</string>
+	<string name="poi_lodging">Smáhýsi</string>
+	<string name="poi_place_of_worship">Tilbeiðslustaður</string>
+	<string name="poi_religion_christian">Kristindómur</string>
+	<string name="poi_religion_jewish">Gyðingdómur</string>
+	<string name="poi_religion_muslim">Íslam</string>
+	<string name="poi_religion_sikh">Sikhismi</string>
+	<string name="poi_religion_buddhist">Búddismi</string>
+	<string name="poi_religion_hindu">Hindúismi</string>
+	<string name="poi_religion_shinto">Shinto</string>
+	<string name="poi_religion_taoist">Taóismi</string>
+	<string name="poi_religion_voodoo">Vúdú</string>
+	<string name="poi_religion_multifaith">Fjöltrúar</string>
+	<string name="poi_religion_spiritualist">Spírítismi</string>
+	<string name="poi_religion_bahai">Baháí</string>
+	<string name="poi_religion_scientologist">Vísindatrú</string>
+	<string name="poi_religion_pagan">Heiðni</string>
+	<string name="poi_religion_tenrikyo">Tenrikyo</string>
+	<string name="poi_denomination_catholic">Kaþólskur</string>
+	<string name="poi_denomination_baptist">Baptismi</string>
+	<string name="poi_denomination_roman_catholic">Rómversk-kaþólska</string>
+	<string name="poi_denomination_orthodox">Rétttrúnaðarkirkja</string>
+	<string name="poi_denomination_lutheran">Lúterska</string>
+	<string name="poi_denomination_sunni">Súnní</string>
+	<string name="poi_denomination_protestant">Mótmælenda</string>
+	<string name="poi_denomination_methodist">Meþódista</string>
+	<string name="poi_denomination_presbyterian">Presbýterismi</string>
+	<string name="poi_denomination_russian_orthodox">Rússneska rétttrúnaðarkirkjan</string>
+	<string name="poi_denomination_mormon">Mormón</string>
+	<string name="poi_denomination_jehovahs_witness">Vottar Jehóva</string>
+	<string name="poi_denomination_greek_orthodox">Gríska rétttrúnaðarkirkjan</string>
+	<string name="poi_denomination_seventh_day_adventist">Sjöunda dags aðventistar</string>
+	<string name="poi_denomination_church_of_england">Enska biskupakirkjan</string>
+	<string name="poi_denomination_greek_catholic">Grísk-kaþólska</string>
+	<string name="poi_denomination_salvation_army">Hjálpræðisherinn</string>
+	<string name="poi_denomination_quaker">Kvekarar</string>
+	<string name="poi_denomination_adventist">Aðventistar</string>
+	<string name="poi_denomination_serbian_orthodox">Serbneska rétttrúnaðarkirkjan</string>
+	<string name="poi_denomination_latter_day_saints">Síðari-daga-heilögu</string>
+	<string name="poi_denomination_shingon_shu">Shingon búddismi</string>
+	<string name="poi_denomination_maronite">Maronítar</string>
+	<string name="poi_denomination_mahayana">Mahayana</string>
+
+	<string name="poi_religious">Helgistaður</string>
+	<string name="poi_wayside_cross">Vegakross</string>
+	<string name="poi_wayside_shrine">Vegaskrín</string>
+	<string name="poi_funicular">Dráttarlest</string>
+	<string name="poi_club_automobile">Bílaklúbbur</string>
+	<string name="poi_club_hunting">Skotveiðiklúbbur</string>
+	<string name="poi_piste_nordic">Gönguskíðabraut</string>
+	<string name="poi_piste_skitour">Gönguskíðaleið</string>
+	<string name="poi_piste_hike">Gönguleið</string>
+	<string name="poi_piste_sled">Sleðaleið</string>
+	<string name="poi_piste_ice_skate">Skautar</string>
+	<string name="poi_social_centre">Félagsmiðstöð</string>
+	<string name="poi_gallery">Listagallerí</string>
+	<string name="poi_nightclub">Næturklúbbur</string>
+	<string name="poi_beach_resort">Strandbær</string>
+	<string name="poi_dog_park">Hundagarður</string>
+	<string name="poi_recreation_ground">Leikvöllur</string>
+	<string name="poi_craft_agricultural_engines">Landbúnaðarvélar</string>
+	<string name="poi_craft_basket_maker">Körfugerð</string>
+	<string name="poi_craft_beekeeper">Býflugnabóndi</string>
+	<string name="poi_craft_carpet_layer">Teppalagning</string>
+	<string name="poi_craft_caterer">Veisluþjónusta</string>
+	<string name="poi_craft_clockmaker">Klukkusmiður</string>
+	<string name="poi_craft_dressmaker">Klæðskeri</string>
+	<string name="poi_craft_glaziery">Gler og speglar</string>
+	<string name="poi_craft_handicraft">Handverk</string>
+	<string name="poi_craft_hvac">Kynding, loftræsting, loftkæling</string>
+	<string name="poi_craft_insulation">Einangrun</string>
+	<string name="poi_craft_parquet_layer">Parkettlagning</string>
+	<string name="poi_craft_plasterer">Gifsari</string>
+	<string name="poi_craft_sailmaker">Seglagerð</string>
+	<string name="poi_craft_sawmill">Sögunarmylla</string>
+	<string name="poi_craft_scaffolder">Stillansar</string>
+	<string name="poi_craft_watchmaker">Úrsmiður</string>
+	<string name="poi_craft_window_construction">Gluggasmíði</string>
+
+	<string name="poi_tattoo">Húðflúrstofa</string>
+	<string name="poi_pawnbroker">Veðlánari</string>
+	<string name="poi_military_landuse">Hernaðarsvæði</string>
+	<string name="poi_military_danger_area">Hættusvæði</string>
+	<string name="poi_crossing_unmarked">Ómerkt</string>
+	<string name="poi_water_point">Vatnspóstur</string>
+
+	<string name="poi_piste_grooming_classic">Hefðbundið</string>
+	<string name="poi_piste_grooming_backcountry">Úr alfaraleið</string>
+	<string name="poi_piste_grooming_skating">Skautar</string>
+	<string name="poi_aerialway_bubble_yes">Blaðra</string>
+	<string name="poi_aerialway_bubble_no">Engin blaðra</string>
+	<string name="poi_rooms">Herbergi</string>
+
+	<string name="poi_payment_cash_yes">Reiðufé</string>
+	<string name="poi_payment_cash_no">Ekki tekið við reiðufé</string>
+	<string name="poi_payment_debit_cards_yes">Debetkort</string>
+	<string name="poi_payment_debit_cards_no">Ekki tekið við debetkortum</string>
+	<string name="poi_payment_bitcoin_yes">Bitcoin</string>
+	<string name="poi_payment_bitcoin_no">Ekki tekið við Bitcoin</string>
+	<string name="poi_payment_maestro_yes">Maestro-greiðslukort</string>
+	<string name="poi_payment_maestro_no">Ekki tekið við Maestro-kortum</string>
+	<string name="poi_payment_ov_chipkaart_yes">OV-Chipkaart</string>
+	<string name="poi_payment_ov_chipkaart_no">Ekki tekið við OV-Chipkaart</string>
+	<string name="poi_diet_gluten_free_filter_yes">Glútenlaust</string>
+	<string name="poi_diet_gluten_free_only">Einungis glútenlaust</string>
+	<string name="poi_diet_gluten_free_yes">Glútenlaust</string>
+	<string name="poi_diet_gluten_free_no">Glútenlaus matur: nei</string>
+	<string name="poi_automated_no">Ekki sjálfvirkt</string>
+	<string name="poi_brushless_no">Burstalaust: nei</string>
+	<string name="poi_car_wash_no">Bílaþvottur: nei</string>
+
+
+	<string name="poi_male_yes">Karlar</string>
+	<string name="poi_male_no">Bannað körlum</string>
+	<string name="poi_female_yes">Konur</string>
+	<string name="poi_female_no">Bannað konum</string>
+	<string name="poi_toilets_no">Án salerna</string>
 	</resources>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index a8ae46582e..92430be7e1 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -22,7 +22,7 @@
     <string name="si_mi_meters">Mílur/metrar</string>
     <string name="storage_free_space">Laust pláss</string>
     <string name="shared_string_change">Skipta um</string>
-    <string name="share_history_subject">" deilt með OsmAnd"</string>
+    <string name="share_history_subject">deilt með OsmAnd</string>
     <string name="search_categories">Flokkar</string>
     <string name="postcode">Póstnúmer</string>
     <string name="shared_string_from">frá</string>
@@ -321,9 +321,9 @@
     <string name="loading_smth">Hleð inn %1$s…</string>
     <string name="map_widget_plain_time">Núverandi tími</string>
     <string name="gpx_wpt">Leiðarpunktur</string>
-    <string name="gpx_info_waypoints">"Leiðarpunktar: %1$s "</string>
+    <string name="gpx_info_waypoints">Leiðarpunktar: %1$s</string>
     <string name="gpx_selection_segment_title">Bútur</string>
-    <string name="gpx_selection_number_of_points">" %1$s punktar"</string>
+    <string name="gpx_selection_number_of_points">%1$s punktar</string>
     <string name="gpx_selection_point">Punktur %1$s</string>
     <string name="osmo_follow">Fylgja</string>
     <string name="osmo_sign_in">Skrá inn</string>
@@ -417,7 +417,7 @@
     <string name="driving_region_australia">Ástralía</string>
     <string name="speak_title">Tilkynna…</string>
     <string name="speak_speed_limit">Hraðatakmörk</string>
-    <string name="route_descr_map_location">"Kort: "</string>
+    <string name="route_descr_map_location">Kort:</string>
     <string name="route_descr_destination">Áfangastaður</string>
     <string name="route_to">Til:</string>
     <string name="route_via">Um:</string>
@@ -573,7 +573,7 @@
     <string name="search_position_map_view">Núverandi miðja korts</string>
     <string name="select_search_position">Upphaf:</string>
     <string name="context_menu_item_search">Leita nálægt þessu</string>
-    <string name="filename_input">"Skráarheiti: "</string>
+    <string name="filename_input">Skráarheiti:</string>
     <string name="favorite_home_category">Heima</string>
     <string name="favorite_friends_category">Vinir</string>
     <string name="favorite_places_category">Staðir</string>
@@ -867,7 +867,7 @@
     <string name="online_map">Nettengt kort</string>
     <string name="roads_only">Einungis vegir</string>
     <string name="rendering_attr_pisteRoutes_name">Skíðabrekkur</string>
-    <string name="free">"Laust %1$s "</string>
+    <string name="free">Laust %1$s</string>
     <string name="device_memory">Minni tækis</string>
     <string name="rendering_attr_pisteGrooming_name">Verið að troða leið</string>
     <string name="parking_place">Bílastæði</string>
@@ -891,7 +891,7 @@
     <string name="traffic_warning_speed_camera">Hraðamyndavél</string>
     <string name="save_track_to_gpx_globally">Skrifa feril í GPX-skrá</string>
     <string name="save_current_track">Vista núverandi GPX-feril</string>
-    <string name="gpx_info_subtracks">"Undirferlar: %1$s "</string>
+    <string name="gpx_info_subtracks">Undirferlar: %1$s</string>
     <string name="gpx_selection_track">%1$s 
 Ferill %2$s</string>
     <string name="gpx_file_is_empty">GPX-ferill er tómur</string>
@@ -1146,7 +1146,7 @@ Ferill %2$s</string>
     <string name="recording_photo_description">Ljósmynd %1$s %2$s</string>
     <string name="dropbox_plugin_name">Dropbox-viðbót</string>
     <string name="av_settings_descr">Breyta stillingum hljóð- og myndmerkja</string>
-    <string name="av_settings">"Stillingar hljóð- og myndmerkja "</string>
+    <string name="av_settings">Stillingar hljóð- og myndskeiða</string>
     <string name="recording_context_menu_delete">Eyða upptöku</string>
     <string name="map_widget_distancemeasurement">Mæling vegalengda</string>
     <string name="map_widget_audionotes">Hljóð-minnispunktar</string>
@@ -1537,9 +1537,9 @@ Len %2$s</string>
     <string name="gpx_monitoring_start">Byrja GPX-skráningu</string>
     <string name="gpx_monitoring_stop">Stöðva GPX-skráningu</string>
     <string name="osmo_not_signed_in">Innskráning á OsMo mistókst</string>
-    <string name="gpx_info_distance">"Fjarlægð: %1$s (%2$s punktar) "</string>
+    <string name="gpx_info_distance">Vegalengd: %1$s (%2$s punktar)</string>
     <string name="osmo_track_interval">Millibil skráninga</string>
-    <string name="recording_error">"Villa kom upp á meðan upptöku stóð "</string>
+    <string name="recording_error">Villa kom upp á meðan upptöku stóð</string>
     <string name="recording_camera_not_available">Myndavél er ekki tiltæk</string>
     <string name="recording_open_external_player">Opna utanaðkomandi spilara</string>
     <string name="recording_delete_confirm">Viltu eyða þessari upptöku?</string>
@@ -1645,10 +1645,10 @@ Len %2$s</string>
     <string name="local_index_gpx_info_show">
 
 Ýta og halda til að sjá valkosti</string>
-    <string name="gpx_info_start_time">"Upphafstími: %1$tF, %1$tT "</string>
-    <string name="gpx_info_end_time">"Lokatími: %1$tF, %1$tT "</string>
-    <string name="gpx_info_average_speed">"Meðalhraði: %1$s "</string>
-    <string name="gpx_info_maximum_speed">"Hámarkshraði: %1$s "</string>
+    <string name="gpx_info_start_time">Upphafstími: %1$tF, %1$tT</string>
+    <string name="gpx_info_end_time">Lokatími: %1$tF, %1$tT</string>
+    <string name="gpx_info_average_speed">Meðalhraði: %1$s</string>
+    <string name="gpx_info_maximum_speed">Hámarkshraði: %1$s</string>
     <string name="gpx_info_avg_altitude">Meðalhæð: %1$s</string>
     <string name="gpx_info_diff_altitude">Hæðarsvið: %1$s</string>
     <string name="gpx_info_asc_altitude">Lækkun/Hækkun: %1$s</string>
@@ -1671,8 +1671,8 @@ Punktar</string>
     <string name="osmo_enable_tracker">Senda staðsetningar mínar</string>
     <string name="osmo_control">Flýtiaðgangur OsMo</string>
     <string name="osmo_session_token">Setuteikn: %1$s</string>
-    <string name="osmo_conn_successfull">"Tengingu komið á: %1$s "</string>
-    <string name="osmo_io_error">"Vandamál í OsMo-tengingu: "</string>
+    <string name="osmo_conn_successfull">Tengingu komið á: %1$s</string>
+    <string name="osmo_io_error">Vandamál í OsMo-tengingu:</string>
     <string name="use_points_as_intermediates">Reikna leið milli punkta</string>
     <string name="osmo_mode_restart">Endurræsa OsMo-setu</string>
     <string name="osmo_mode_on">Stöðva OsMo-setu</string>
@@ -1706,7 +1706,7 @@ Punktar</string>
 
     <string name="indexing_transport">Lykla samgöngur…</string>
     <string name="daynight_descr">Veldu reglu til að skipta um dags/næturham</string>
-    <string name="fast_route_mode_descr">"Virkja til að reikna hröðustu leið eða gera óvirkt til að reikna hagkvæmustu leið "</string>
+    <string name="fast_route_mode_descr">Virkja til að reikna hröðustu leið eða gera óvirkt til að reikna hagkvæmustu leið</string>
     <string name="tiles_to_download_estimated_size">Við aðdráttinn {0} skal sækja {1} tígla ({2} MB)</string>
     <string name="select_max_zoom_preload_area">Veldu hámarksaðdrátt fyrir forhleðslu</string>
     <string name="maps_could_not_be_downloaded">Það tókst ekki að hlaða inn kortinu</string>
@@ -2101,7 +2101,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="install_selected_build">Viltu setja upp OsmAnd - {0} af {1} {2} MB ?</string>
     <string name="quick_action_map_overlay_switch">Yfirlagi kortsins var breytt yfir í \"%s\".</string>
     <string name="quick_action_map_underlay_switch">Undirlagi kortsins var breytt yfir í \"%s\".</string>
-    <string name="osmo_locations_sent">"Sendar %1$d staðsetningar (í biðminni %2$d) "</string>
+    <string name="osmo_locations_sent">Sendar %1$d staðsetningar (í biðminni %2$d)</string>
     <string name="keep_and_add_destination_point">Bæta við sem áfangastað í framhaldinu</string>
     <string name="routing_preferences_descr">Stillingar leiðavals</string>
     <string name="disable_complex_routing">Gera flókið leiðaval óvirkt</string>
@@ -2126,11 +2126,11 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="rendering_attr_showRoadMaps_description">Velja þegar birta á kort einungis með vegum:</string>
     <string name="show_warnings_descr">Stilla umferðaraðvaranir (hraðatakmarkanir, lokanir, umferðarhnúta, hraðahindranir), aðvaranir um hraðamyndavélar og upplýsingar um akreinaskiptingar</string>
     <string name="osmand_short_description_80_chars">Almenn skoðun landakorta í farsíma og flakk á ónettengdum sem nettengdum OSM-landakortum</string>
-	<string name="osmand_extended_description_part7">" Leggðu þitt fram til OSM • Tilkynntu um villur í gögnum • Sendu inn GPX-ferla til OSM beint úr forritinu • Bættu við merkisstöðum og sendu þá beint inn til OSM (eða síðar ef engin nettenging er til staðar) "</string>
-    <string name="osmand_extended_description_part8">" OsmAnd er opinn hugbúnaður og í stöðugri þróun. Hver sem er getur tekið þátt í gerð forritsins, til dæmis með því að tilkynna um hnökra, bæta þýðingar eða forrita nýja eiginleika. Lífleg staða verkefnisins og sífelldar endurbætur má þannig rekja til margra þátta samspils milli notenda og hönnuða. Verkefnið styðst líka við fjárhagslega styrki frá notendum sem nýtast til að fjármagna viðameiri forritun og prófanir.
-\n Gæði og áætluð þekja landakorta: • Vestur-Evrópa: **** • Austur-Evrópa: *** • Rússland: *** • Norður-Ameríka: *** • Suður-Ameríka: ** • Asía: ** • Japan &amp; Kórea: *** • Miðausturlönd: ** • Afríka: ** • Suðurskautslandið: * Hægt er að sækja kort frá flestum heimsins löndum á netinu! Frá Afghanistan til Zimbabwe, frá Ástralíu til BNA. Argentína, Brasilía, Kanada, Frakkland, Þýskaland, Mexíkó, Spánn, eða eitthvað annað. "</string>
+	<string name="osmand_extended_description_part7">Leggðu þitt fram til OSM • Tilkynntu um villur í gögnum • Sendu inn GPX-ferla til OSM beint úr forritinu • Bættu við merkisstöðum og sendu þá beint inn til OSM (eða síðar ef engin nettenging er til staðar)</string>
+    <string name="osmand_extended_description_part8">OsmAnd er opinn hugbúnaður og í stöðugri þróun. Hver sem er getur tekið þátt í gerð forritsins, til dæmis með því að tilkynna um hnökra, bæta þýðingar eða forrita nýja eiginleika. Lífleg staða verkefnisins og sífelldar endurbætur má þannig rekja til margra þátta samspils milli notenda og hönnuða. Verkefnið styðst líka við fjárhagslega styrki frá notendum sem nýtast til að fjármagna viðameiri forritun og prófanir. 
+\n Gæði og áætluð þekja landakorta: • Vestur-Evrópa: **** • Austur-Evrópa: *** • Rússland: *** • Norður-Ameríka: *** • Suður-Ameríka: ** • Asía: ** • Japan &amp; Kórea: *** • Miðausturlönd: ** • Afríka: ** • Suðurskautslandið: * Hægt er að sækja kort frá flestum heimsins löndum á netinu! Frá Afghanistan til Zimbabwe, frá Ástralíu til BNA. Argentína, Brasilía, Kanada, Frakkland, Þýskaland, Mexíkó, Spánn, eða eitthvað annað.</string>
     <string name="osmand_plus_short_description_80_chars">Almenn skoðun landakorta í farsíma og flakk á ónettengdum sem nettengdum OSM-landakortum</string>
-	<string name="osmand_plus_extended_description_part7">" Leggðu þitt fram til OSM • Tilkynntu um villur í gögnum • Sendu inn GPX-ferla til OSM beint úr forritinu • Bættu við merkisstöðum og sendu þá beint inn til OSM (eða síðar ef engin nettenging er til staðar) OsmAnd er opinn hugbúnaður og í stöðugri þróun. Hver sem er getur tekið þátt í gerð forritsins, til dæmis með því að tilkynna um hnökra, bæta þýðingar eða forrita nýja eiginleika. Lífleg staða verkefnisins og sífelldar endurbætur má þannig rekja til margra þátta samspils milli notenda og hönnuða. Verkefnið styðst líka við fjárhagslega styrki frá notendum sem nýtast til að fjármagna viðameiri forritun og prófanir.  "</string>
+	<string name="osmand_plus_extended_description_part7">Leggðu þitt fram til OSM • Tilkynntu um villur í gögnum • Sendu inn GPX-ferla til OSM beint úr forritinu • Bættu við merkisstöðum og sendu þá beint inn til OSM (eða síðar ef engin nettenging er til staðar) OsmAnd er opinn hugbúnaður og í stöðugri þróun. Hver sem er getur tekið þátt í gerð forritsins, til dæmis með því að tilkynna um hnökra, bæta þýðingar eða forrita nýja eiginleika. Lífleg staða verkefnisins og sífelldar endurbætur má þannig rekja til margra þátta samspils milli notenda og hönnuða. Verkefnið styðst líka við fjárhagslega styrki frá notendum sem nýtast til að fjármagna viðameiri forritun og prófanir.</string>
     <string name="search_offline_geo_error">Ekki tókst að þátta \'%s\' geo-virkniskipun (intent)</string>
     <string name="send_location_email_pattern">Til að sjá staðsetninguna, fylgdu veftenglinum %1$s eða Android-virkniskipunatenglinum %2$s</string>
     <string name="version_index_is_not_supported">Ekki er stuðningur við \'\'{0}\'\' útgáfu af vísi</string>
@@ -2216,4 +2216,10 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="mapillary_widget">Mapillary græja</string>
     <string name="mapillary">Mapillary</string>
     <string name="mapillary_image">Mapillary mynd</string>
+    <string name="map_widget_ruler_control_first_mode">Tveggja-punkta mælistika</string>
+    <string name="map_widget_ruler_control_second_mode">Mælistika út frá miðju hrings</string>
+    <string name="shared_string_permissions">Heimildir</string>
+    <string name="distance_moving">Leiðrétt fjarlægð</string>
+    <string name="improve_coverage_mapillary">Bæta ljósmyndaþekju með Mapillary</string>
+    <string name="hide_from_zoom_level">Fela í aðdráttarstigi</string>
     </resources>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 9dab659744..bfe1f60d2c 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2464,7 +2464,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="access_disable_offroute_recalc_descr">案内されたルートから大きく離れた場合、自動的にルートの再計算をしないようにします</string>
     <string name="back_to_search">検索に戻る</string>
     <string name="confirmation_to_delete_history_items">選択された履歴を削除しますか？</string>
-    <string name="show_something_on_map">マップ上の%1$sへ移動</string>
+    <string name="show_something_on_map">マップ上に%1$sを表示</string>
     <string name="release_2_4">" • 新しくなって、より強化されたフリーワード検索
 \n
 \n • Bluetooth関連の改善多数
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 3c49f0f54d..19ab74101f 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -2400,4 +2400,5 @@
     <string name="mapillary_descr">Уличные онлайн фотографии для всех. Исследуйте места, сотрудничайте, снимайте мир.</string>
     <string name="mapillary">Mapillary</string>
     <string name="plugin_mapillary_descr">Уличные фотографии для всех. Исследуйте места, сотрудничайте, снимайте мир.</string>
+    <string name="save_poi_too_many_uppercase">Название содержит слишком много заглавных букв. Вы действительно хотите продолжить?</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rCN/strings.xml b/OsmAnd/res/values-zh-rCN/strings.xml
index df8ec78ad2..729ad3c7aa 100644
--- a/OsmAnd/res/values-zh-rCN/strings.xml
+++ b/OsmAnd/res/values-zh-rCN/strings.xml
@@ -1231,19 +1231,19 @@
     <string name="osmo_share_location">分享</string>
     <string name="osmo_pause_location">暂停</string>
     <string name="shared_string_notifications">通知</string>
-    <string name="release_2_5">" • 地图上可点击的图标
-\n
-\n • 强大的兴趣点过滤搜索：例如，根据菜肴搜索餐馆，或者具有特定设施的场所
-\n
-\n • 新的 Topo 地图风格，为骑行爱好者和登山者设计
-\n
-\n • 增强的旅途记录功能
-\n
-\n • 改进了导航提醒功能（Android Wear）
-\n
-\n • 许多其它改进和缺陷修复
-\n
-\n 还有更多待你发现…… "</string>
+    <string name="release_2_5">\\022 地图上可点击的图标 
+\n 
+\n • 强大的兴趣点过滤搜索：例如，根据菜肴搜索餐馆，或者具有特定设施的场所 
+\n 
+\n • 新的 Topo 地图风格，为骑行爱好者和登山者设计 
+\n 
+\n • 增强的旅途记录功能 
+\n 
+\n • 改进了导航提醒功能（Android Wear） 
+\n 
+\n • 许多其它改进和缺陷修复 
+\n 
+\n 还有更多待你发现……</string>
     <string name="christmas_poi">圣诞兴趣点</string>
     <string name="christmas_desc_q">显示圣诞兴趣点？</string>
     <string name="search_hint">输入城市、地址、兴趣点名称</string>
@@ -1634,21 +1634,21 @@
     <string name="back_to_search">返回到搜索</string>
     <string name="confirmation_to_delete_history_items">你想要从历史中删除所选的项目吗？</string>
     <string name="show_something_on_map">在地图上显示 %1$s</string>
-    <string name="release_2_4">" • 新加入非常强大的自由文本查找 
-\n 
+    <string name="release_2_4">\\022 新加入非常强大的自由文本查找 
+\n
 \n • 透过蓝牙集成汽车音响系统 / 电话扬声器 
-\n 
+\n
 \n • 改进的路线引导、 语音提示，和转弯道指示 
-\n 
+\n
 \n • 改进了运输层与路线绘制 
-\n 
+\n
 \n • 增加了更多的语言环境，现在支持区域的语言环境 
-\n 
+\n
 \n • 许多其它的改善和修正错误 
-\n 
-\n 以及更多… "</string>
+\n
+\n 以及更多…</string>
     <string name="dist_away_from_my_location">搜索 %1$s 离开</string>
-    <string name="share_history_subject">" 通过 OsmAnd 分享"</string>
+    <string name="share_history_subject">通过 OsmAnd 分享</string>
     <string name="postcode">邮政编码</string>
     <string name="shared_string_from">从</string>
     <string name="city_type_district">区</string>
@@ -1765,27 +1765,27 @@
     <string name="lang_als">"阿尔巴尼亚  (Tosk)"</string>
     <string name="world_map_download_descr">世界底图（涵盖整个世界的缩小版）可能存在丢失或过期。请考虑下载它的全球概览。</string>
     <string name="map_downloaded_descr">已下载 %1$s 的地图，你现在可以开始使用它。</string>
-    <string name="release_2_6">" • 新功能：快速动作按钮 
-\n 
+    <string name="release_2_6">"\\022 新功能：快速动作按钮 
+\n
 \n •  改进了触摸屏幕手势的回应(同时平移和缩放) 
-\n 
+\n
 \n • 新的地图字体覆盖了更多的语言环境 
-\n 
+\n
 \n • 支持 TTS 不同版本的区域语言(和语法) 
-\n 
+\n
 \n • 在一些地图样式和维基百科的清晰度增强 
-\n 
+\n
 \n • 支持开放位置码 (OLC) 
-\n 
+\n
 \n •  为记录的 GPX 轨迹和预测的路线显示海拔、坡度和速度的概貌 
-\n 
+\n
 \n •  在自行车路线中\"驾驶样式\"设置和逻辑的改进 
-\n 
+\n
 \n •  在自行车路线中使用高度数据的设置 
-\n 
+\n
 \n •  一些其它的改进和错误修复 
-\n 
-\n 和更多… "</string>
+\n
+\n 以及更多…"</string>
     <string name="simulate_initial_startup_descr">设置标志，指示第一个应用程序启动，保持所有其他设置保持不变</string>
     <string name="favorite_category_dublicate_message">指定的类别名称已存在。请使用一个不同的名称。</string>
     <string name="shared_string_trip_recording">旅行记录</string>
@@ -2604,6 +2604,6 @@
     <string name="quick_action_map_source_switch">地图来源已更改为\"%s\"。</string>
     <string name="quick_action_btn_tutorial_title">更改按钮的位置</string>
     <string name="quick_action_btn_tutorial_descr">长按并拖动按钮来改变其在屏幕上的位置</string>
-    <string name="map_widget_ruler_control_first_mode">连接模式</string>
-    <string name="map_widget_ruler_control_second_mode">半径模式</string>
+    <string name="map_widget_ruler_control_first_mode">两点量尺</string>
+    <string name="map_widget_ruler_control_second_mode">半径量尺</string>
     </resources>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 233abe8bcf..070b47939d 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2868,6 +2868,6 @@ Facebook：https://www.facebook.com/osmandapp
     <string name="distance_moving">距離已校正</string>
     <string name="shared_string_permissions">權限</string>
     <string name="import_gpx_failed_descr">OsmAnd 無法匯入檔案。 請檢查 OsmAnd 是否有權限從該位置去讀取檔案。</string>
-    <string name="map_widget_ruler_control_first_mode">兩點劃線</string>
-    <string name="map_widget_ruler_control_second_mode">半徑劃線</string>
+    <string name="map_widget_ruler_control_first_mode">兩點直尺</string>
+    <string name="map_widget_ruler_control_second_mode">半徑直尺</string>
     </resources>
diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
index 97704586ae..77ae072040 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
@@ -25,6 +25,7 @@ import net.osmand.plus.voice.AbstractPrologCommandPlayer;
 import net.osmand.plus.voice.TTSCommandPlayerImpl;
 import net.osmand.plus.voice.CommandBuilder;
 import net.osmand.plus.voice.CommandPlayer;
+import net.osmand.plus.routing.VoiceRouter;
 import net.osmand.util.Algorithms;
 
 import java.io.File;
@@ -190,7 +191,14 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 		}
 		return new Struct("");
 	}
+
 	private Term street(CommandPlayer p, String name, String ref, String destName, String currentName) {
+		// Pass all test strings through our character replacement method
+			ref = VoiceRouter.getSpeakablePointName(ref);
+			name = VoiceRouter.getSpeakablePointName(name);
+			destName = VoiceRouter.getSpeakablePointName(destName);
+			currentName = VoiceRouter.getSpeakablePointName(currentName);
+
 		if(p.supportsStructuredStreetNames()) {
 			Struct next = new Struct(new Term[] { getTermString(ref),
 					getTermString(name),
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
index a487e35cef..67d96baff6 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
@@ -10,7 +10,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.github.mikephil.charting.charts.LineChart;
-import com.github.mikephil.charting.components.YAxis;
 import com.github.mikephil.charting.data.Entry;
 import com.github.mikephil.charting.data.LineData;
 import com.github.mikephil.charting.highlight.Highlight;
@@ -18,7 +17,6 @@ import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
 import com.github.mikephil.charting.listener.ChartTouchListener.ChartGesture;
 import com.github.mikephil.charting.listener.OnChartGestureListener;
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
-import com.github.mikephil.charting.utils.ViewPortHandler;
 
 import net.osmand.data.LatLon;
 import net.osmand.data.QuadRect;
@@ -288,15 +286,18 @@ public class TrackDetailsMenu {
 		Highlight[] highlights = chart.getHighlighted();
 		LatLon location = null;
 
-		ViewPortHandler handler = chart.getViewPortHandler();
-		float minimumVisibleXValue = (float) chart.getValuesByTouchPoint(handler.contentLeft(), handler.contentBottom(), YAxis.AxisDependency.LEFT).x;
-		float maximumVisibleXValue = (float) chart.getValuesByTouchPoint(handler.contentRight(), handler.contentBottom(), YAxis.AxisDependency.LEFT).x;
+		float minimumVisibleXValue = chart.getLowestVisibleX();
+		float maximumVisibleXValue = chart.getHighestVisibleX();
 
 		if (highlights != null && highlights.length > 0) {
-			if (highlights[0].getX() < minimumVisibleXValue) {
-				gpxItem.chartHighlightPos = minimumVisibleXValue;
-			} else if (highlights[0].getX() > maximumVisibleXValue) {
-				gpxItem.chartHighlightPos = maximumVisibleXValue;
+			if (minimumVisibleXValue != 0 && maximumVisibleXValue != 0) {
+				if (highlights[0].getX() < minimumVisibleXValue) {
+					gpxItem.chartHighlightPos = minimumVisibleXValue;
+				} else if (highlights[0].getX() > maximumVisibleXValue) {
+					gpxItem.chartHighlightPos = maximumVisibleXValue;
+				} else {
+					gpxItem.chartHighlightPos = highlights[0].getX();
+				}
 			} else {
 				gpxItem.chartHighlightPos = highlights[0].getX();
 			}
@@ -572,7 +573,8 @@ public class TrackDetailsMenu {
 		if (gpxItem.chartHighlightPos != -1) {
 			chart.highlightValue(gpxItem.chartHighlightPos, 0);
 		} else {
-			chart.highlightValue(null);
+			gpxItem.chartHighlightPos = chart.getLowestVisibleX();
+			chart.highlightValue(chart.getLowestVisibleX(), 0);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index f266f08e7d..99395a0515 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -720,6 +720,8 @@ public class TrackSegmentFragment extends OsmAndListFragment {
 		addOptionSplit(300, false, groups);
 		addOptionSplit(600, false, groups);
 		addOptionSplit(900, false, groups);
+		addOptionSplit(1800, false, groups);
+		addOptionSplit(3600, false, groups);
 	}
 
 	private void updateSplit(List<GpxDisplayGroup> groups, SelectedGpxFile sf) {
diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
index 3fd91ca894..b1ac9d9a85 100644
--- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
+++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
@@ -618,18 +618,18 @@ public class VoiceRouter {
 		return empty;
 	}
 
-	public String getSpeakablePointName(String pn) {
-		// Replace characters which may produce unwanted tts sounds:
+	public static String getSpeakablePointName(String pn) {
+		// Replace characters which may produce unwanted TTS sounds:
 		if (pn != null) {
 			pn = pn.replace('-', ' ');
 			pn = pn.replace(':', ' ');
 			pn = pn.replace(";", ", "); // Trailing blank prevents punctuation being pronounced. Replace by comma for better intonation.
 			pn = pn.replace("/", ", "); // Slash is actually pronounced by many TTS engines, ceeating an awkward voice prompt, better replace by comma.
 			if ((player != null) && (!player.getLanguage().equals("de"))) {
-				pn = pn.replace("\u00df", "ss"); // Helps non-German tts voices to pronounce German Strasse (=street)
+				pn = pn.replace("\u00df", "ss"); // Helps non-German TTS voices to pronounce German Straße (=street)
 			}
 			if ((player != null) && (player.getLanguage().startsWith("en"))) {
-				pn = pn.replace("SR", "S R");    // Avoid SR (as for State Route or Strada Regionale) be pronounced as "Senior" in English tts voice
+				pn = pn.replace("SR", "S R");    // Avoid SR (as for State Route or Strada Regionale) be pronounced as "Senior" in English TTS voice
 				pn = pn.replace("Dr.", "Dr ");   // Avoid pause many English TTS voices introduce after period
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
index cf505b47c9..7f87363af1 100644
--- a/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/GPXLayer.java
@@ -12,6 +12,8 @@ import android.graphics.PointF;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuff.Mode;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.AsyncTask;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
@@ -81,8 +83,10 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 	private Map<WptPt, SelectedGpxFile> pointFileMap = new HashMap<>();
 	private MapTextLayer textLayer;
 
+	private Paint paintOuterRect;
 	private Paint paintInnerRect;
 
+    private Paint paintGridOuterCircle;
 	private Paint paintGridCircle;
 
 	private Paint paintTextIcon;
@@ -139,11 +143,22 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 		textLayer = view.getLayerByClass(MapTextLayer.class);
 
 		paintInnerRect = new Paint();
-		paintInnerRect.setStyle(Style.FILL_AND_STROKE);
+		paintInnerRect.setStyle(Style.FILL);
 		paintInnerRect.setAntiAlias(true);
+		paintOuterRect = new Paint();
+		paintOuterRect.setStyle(Style.STROKE);
+		paintOuterRect.setAntiAlias(true);
+		paintOuterRect.setColor(Color.WHITE);
+		paintOuterRect.setStrokeWidth(3);
+		paintOuterRect.setAlpha(255);
 		paintGridCircle = new Paint();
 		paintGridCircle.setStyle(Style.FILL_AND_STROKE);
 		paintGridCircle.setAntiAlias(true);
+        paintGridOuterCircle = new Paint();
+        paintGridOuterCircle.setStyle(Style.FILL_AND_STROKE);
+        paintGridOuterCircle.setAntiAlias(true);
+        paintGridOuterCircle.setColor(Color.WHITE);
+        paintGridOuterCircle.setAlpha(204);
 
 		paintIcon = new Paint();
 		pointSmall = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_white_shield_small);
@@ -307,14 +322,17 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 					if (ind > 0) {
 						nm = nm.substring(0, ind);
 					}
-					float nmWidth = paintTextIcon.measureText(nm);
-					canvas.drawRect(
-							x - nmWidth / 2 - 2 * (float) Math.ceil(tileBox.getDensity()),
-							y - r / 2 - 2 * (float) Math.ceil(tileBox.getDensity()),
-							x + nmWidth / 2 + 2 * (float) Math.ceil(tileBox.getDensity()),
-							y + r / 2 + 3 * (float) Math.ceil(tileBox.getDensity()),
-							paintInnerRect);
-					canvas.drawText(nm, x, y + r / 2, paintTextIcon);
+					Rect bounds = new Rect();
+					paintTextIcon.getTextBounds(nm, 0, nm.length(), bounds);
+					int nmWidth = bounds.width();
+					int nmHeight = bounds.height();
+                    RectF rect = new RectF(x - nmWidth / 2 - 2 * (float) Math.ceil(tileBox.getDensity()),
+                            y + nmHeight / 2 + 3 * (float) Math.ceil(tileBox.getDensity()),
+                            x + nmWidth / 2 + 3 * (float) Math.ceil(tileBox.getDensity()),
+                            y - nmHeight / 2 - 2 * (float) Math.ceil(tileBox.getDensity()));
+                    canvas.drawRoundRect(rect, 5, 5, paintInnerRect);
+					canvas.drawRoundRect(rect, 5, 5, paintOuterRect);
+					canvas.drawText(nm, x, y + nmHeight / 2, paintTextIcon);
 				}
 			}
 		}
@@ -396,6 +414,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 			trackChartPoints.setSegmentColor(color);
 		}
 		paintGridCircle.setColor(color);
+        paintGridCircle.setAlpha(255);
 		QuadRect latLonBounds = tileBox.getLatLonBounds();
 		List<WptPt> xAxisPoints = trackChartPoints.getXAxisPoints();
 		float r = 3 * tileBox.getDensity();
@@ -407,6 +426,7 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
 					&& axisPoint.getLongitude() <= latLonBounds.right) {
 				float x = tileBox.getPixXFromLatLon(axisPoint.getLatitude(), axisPoint.getLongitude());
 				float y = tileBox.getPixYFromLatLon(axisPoint.getLatitude(), axisPoint.getLongitude());
+                canvas.drawCircle(x, y, r + 2 * (float) Math.ceil(tileBox.getDensity()), paintGridOuterCircle);
 				canvas.drawCircle(x, y, r + (float) Math.ceil(tileBox.getDensity()), paintGridCircle);
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
index 809724abd3..ce9cf273b4 100644
--- a/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/RouteLayer.java
@@ -51,6 +51,7 @@ public class RouteLayer extends OsmandMapLayer {
 
 	private Paint paintIcon;
 	private Paint paintIconAction;
+	private Paint paintGridOuterCircle;
 	private Paint paintGridCircle;
 
 	private Paint paintIconSelected;
@@ -99,6 +100,12 @@ public class RouteLayer extends OsmandMapLayer {
 		paintGridCircle.setStyle(Paint.Style.FILL_AND_STROKE);
 		paintGridCircle.setAntiAlias(true);
 		paintGridCircle.setColor(attrs.defaultColor);
+		paintGridCircle.setAlpha(255);
+		paintGridOuterCircle = new Paint();
+		paintGridOuterCircle.setStyle(Paint.Style.FILL_AND_STROKE);
+		paintGridOuterCircle.setAntiAlias(true);
+		paintGridOuterCircle.setColor(Color.WHITE);
+		paintGridOuterCircle.setAlpha(204);
 	}
 	
 	@Override
@@ -179,6 +186,7 @@ public class RouteLayer extends OsmandMapLayer {
 					&& axisPoint.getLongitude() <= latLonBounds.right) {
 				float x = tileBox.getPixXFromLatLon(axisPoint.getLatitude(), axisPoint.getLongitude());
 				float y = tileBox.getPixYFromLatLon(axisPoint.getLatitude(), axisPoint.getLongitude());
+				canvas.drawCircle(x, y, r + 2 * (float) Math.ceil(tileBox.getDensity()), paintGridOuterCircle);
 				canvas.drawCircle(x, y, r + (float) Math.ceil(tileBox.getDensity()), paintGridCircle);
 			}
 		}