diff --git a/OsmAnd/res/layout/bottom_sheet_dialog.xml b/OsmAnd/res/layout/bottom_sheet_dialog.xml
new file mode 100644
index 0000000000..412a51f9ab
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_dialog.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:id="@+id/touch_outside"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <FrameLayout
+        android:id="@+id/content_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|bottom"/>
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 97e630ce27..39426d0d47 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -171,7 +171,7 @@
 	<string name="shared_string_on">تفعيل</string>
 	<string name="shared_string_off">إيقاف</string>
 	<string name="accessibility_default">وفقا لإعداد النظام العالمي</string>
-	<string name="backToMenu">الرجوع إلى القائمة</string>
+	<string name="backToMenu">العودة إلى القائمة</string>
 	<string name="zoomOut">تصغير</string>
 	<string name="zoomIn">تكبير</string>
 	<string name="zoomIs">التقريب الحالي هو</string>
@@ -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>
@@ -683,7 +683,7 @@
 	<string name="live_monitoring_url_descr">تحديد عنوان ويب مع بناء جملة المعلمة: اللات = {0}، خط الطول = {1}، والطابع الزمني = {2}، HDOP = {3}، {4 ارتفاع =}، والسرعة = {5}، واضعة = {6}.</string>
 	<string name="gpx_monitoring_disabled_warn">سجل المسار عن طريق ويدجت GPX أو عن طريق إعدادات \'تسجيل الرحلة\'.</string>
 	    
-	<string name="free_version_message">هذا الإصدار المجاني ل OsmAnd محدود إلى ٪1$s تنزيلات وحاليا لا يدعم مقالات ويكيبيديا.</string>
+	<string name="free_version_message">هذا الإصدار المجاني لـ OsmAnd محدود إلى %1$s تنزيلات وحاليا لا يدعم مقالات ويكيبيديا.</string>
 	<string name="poi_context_menu_showdescription">اظهار وصف POI.</string>
 	<string name="index_name_other">خرائط عالمية حسب الموضوع</string>
 	<string name="index_name_wiki">في جميع أنحاء العالم ويكيبيديا النقاط المهمة</string>
@@ -692,10 +692,10 @@
 	<string name="fav_export_confirmation">ملف المفضلة سبق تصديره بالفعل. هل تريد استبداله؟</string>
 	<string name="global_settings">الاعداد\ات العالمية</string>
 	<string name="global_app_settings">اعدادات التطبيق العامة</string>
-	<string name="user_name">اسم المستخدم الخاص بك</string>
+	<string name="user_name">اسم مستخدم OSM الخاص بك</string>
 	<string name="user_password">كلمة OSM الخاصة بك</string>
 	<string name="osmand_service">حالة وضع السكون</string>
-	<string name="osmand_service_descr">استخدمها لتشغيل أوسماند OSMAnd بينما الشاشة مُطفأة</string>
+	<string name="osmand_service_descr">تشغيل أوسماند OSMAnd في الخلفية بينما الشاشة مُطفأة.</string>
 	
 	
 	
@@ -828,7 +828,7 @@
 ← 
 ← للتفعيل إذهب إلى \'القائمة\' ← \'ضبط الخريطة\' ← \'مصدر الخريطة...\' ← \'خرائط فيكتور المحلية\'.</string>
 	<string name="choose_audio_stream">خروج التوجيه الصوتي</string>
-	<string name="choose_audio_stream_descr">حدد مكبر الصوت العارض للتوجيه الصوتي.</string>
+	<string name="choose_audio_stream_descr">حدد مكبر الصوت الذي سيقوم بعرض التوجيه الصوتي.</string>
 	<string name="voice_stream_voice_call">صوت المكالمة الهاتفية ( أيضا لقطع ستريو بلوتوث السيارة )</string>
 	<string name="voice_stream_notification">صوت الاشعارات</string>
 	<string name="voice_stream_music">صوت الوسائط</string>
@@ -1180,7 +1180,7 @@
     <string name="gps_status">حالة GPS</string>
     <string name="rendering_attr_streetLighting_name">إنارة الشوارع</string>
     <string name="proxy_pref_title">بروكسي</string>
-    <string name="proxy_pref_descr">تحديد بروكسي إنترنت.</string>
+    <string name="proxy_pref_descr">تحديد وكيل بروكسي إنترنت.</string>
     <string name="settings_privacy">الخصوصية</string>
     <string name="points">نقاط</string>
 	<string name="navigation_over_track">بدء الملاحة على طول المسار؟</string>
@@ -1468,7 +1468,7 @@
 	<string name="hide_poi_filter">إخفاء الفلتر</string>
 	<string name="background_router_service">تشغيل أوسماند OSMAnd في الخلفية</string>
 	<string name="background_service_provider">مزود تحديد المواقع</string>
-	<string name="background_service_provider_descr">تحديد مزود تحديد المواقع المستخدم من قبل التطبيق في الخلفية.</string>
+	<string name="background_service_provider_descr">تحديد مزود تحديد المواقع المستخدَم من قبل التطبيق في الخلفية.</string>
 	<string name="int_seconds">ثانية</string>
 	<string name="int_min">دقيقة</string>
 	<string name="gps_provider">GPS</string>
@@ -1519,7 +1519,7 @@
 	<string name="searching">جاري البحث…</string>
 	<string name="search_online_address">بحث على الإنترنت</string>
 	<string name="search_offline_address">بحث بدون اتصال</string>
-	<string name="router_service_descr">اختر خدمة ملاحة عبر أو بدون ربط بالإنترنت</string>
+	<string name="router_service_descr">اختر خدمة ملاحة عبر أو بدون ربط بالإنترنت.</string>
 	<string name="sd_dir_not_accessible">لا يمكن الوصول لمجلد تخزين البيانات على الذاكرة!</string>
 	<string name="mark_final_location_first">فضلا قم بتحديد الوجهة أولا</string>
 	<string name="downloading_list_indexes">جاري تحميل قائمة المناطق المتاحة…</string>
@@ -1551,7 +1551,7 @@
 	<string name="osb_comment_dialog_success">تم إضافة التعليق بنجاح</string>
 	<string name="tiles_to_download_estimated_size">عند التقريب {0} قم بتحميل {1} التجانبيات/المربعات ({2} MB)</string>
 	<string name="use_high_res_maps_descr">عدم تمدد (وطمس) تجانبيات/مربعات الخريطة على شاشات العرض عالية الكثافة.</string>
-	<string name="max_level_download_tile_descr">اختر مستوى التقريب الأقصى لتحميل تجانبيات/مربعات الخريطة من الإنترنت</string>
+	<string name="max_level_download_tile_descr">اختر مستوى التقريب الأقصى لتحميل تجانبيات/قراميد الخريطة من الإنترنت.</string>
 	<string name="map_tile_source_descr">اختر مصدر تجانبيات/مربعات الخريطة على الإنترنت أو المخزنة مؤقتاً.</string>
 	<string name="user_hates_app_get_feedback_long">فضلًا أخبرنا ما الذي تريد تغييره في هذا التّطبيق.</string>
 <string name="storage_directory_readonly_desc">مجلّد تخزين البيانات المحدّد حاليًّا للقراءة فقط. نُقل مجلّد التّخزين مؤقّتًا إلى الذّاكرة الدّاخليّة. رجاءا اختر وجهة تخزين صحيحة.</string>
@@ -1579,7 +1579,7 @@
     <string name="change_markers_position">تغيير موضع العلامة</string>
     <string name="follow_us">تابعنا</string>
     <string name="access_direction_audio_feedback">اتجاه صدى الصوت</string>
-    <string name="use_osm_live_routing">ملاحة OsmAnd مباشرة</string>
+    <string name="use_osm_live_routing">الملاحة الحية لـ OsmAnd</string>
     <string name="access_no_destination">لم يتم تعيين الوجهة</string>
     <string name="access_disable_wrong_direction_recalc_descr">يمنع إعادة الحساب التلقائي للطريق أثناء الانتقال للاتجاه المعاكس.</string>
     <string name="access_default_color">اللون الافتراضي</string>
@@ -2003,7 +2003,7 @@
     <string name="opening_changeset">فتح مجموعة التغييرات …</string>
     <string name="loading_poi_obj">تحميل ال POI …</string>
     <string name="auth_failed">فشل الترخيص</string>
-    <string name="show_poi_over_map">إظهار الPOI</string>
+    <string name="show_poi_over_map">إظهار الـ POI</string>
     <string name="searchpoi_activity">إختار الPOI</string>
     <string name="incremental_search_street">إختيار تدريجي للشارع</string>
     <string name="incremental_search_building">إختيار تدريجي للبناية</string>
@@ -2453,7 +2453,7 @@
     <string name="quick_action_add_marker_descr">النقر على زر الإجراء سيقوم بإضافة علامة على الموقع المحدد وسط الشاشة.</string>
     <string name="quick_action_take_video_note_descr">النقر على زر الإجراء سيقوم بإضافة ملاحظة فيديو على الموقع المحدد.</string>
     <string name="quick_favorites_name_preset">اسم الإعداد المسبق</string>
-    <string name="quick_action_add_gpx_descr">النقر على زر الإجراء سيضيف وجهة GPX على الموقع وسط الشاشة.</string>
+    <string name="quick_action_add_gpx_descr">النقر على زر الإجراء سيضيف مسارا للـ GPX وسط الشاشة.</string>
     <string name="quick_action_take_audio_note_descr">النقر على زر الإجراء سيضيف ملاحظة صوتية وسط مركز الشاشة.</string>
     <string name="quick_action_take_photo_note_descr">النقر على زر الإجراء سيضيف ملاحظة بالصورة وسط مركز الشاشة.</string>
     <string name="quick_action_add_osm_bug_descr">النقر على زر الإجراء سيضيف ملاحظة صوتية بالموقع وسط الشاشة.</string>
@@ -2683,13 +2683,13 @@
     <string name="quick_action_page_list_descr">النقر على زر الإجراء سوف يوجهك خلال القائمة أدناه.</string>
     <string name="route_points_category_name">انعطافات لتمر بهذا الطريق</string>
     <string name="navigate_point_olc_info_area">OLC الصالحة بالكامل\nتمثل المنطقة: %1$s x %2$s</string>
-    <string name="wrong_user_name">اسم مستخدم خاطئ!</string>
+    <string name="wrong_user_name">اسم المستخدم خاطئ !</string>
     <string name="shared_string_to">إلى</string>
     <string name="mapillary_menu_date_from">من</string>
-    <string name="mapillary_menu_descr_dates">عرض الصور المضافة في فترة زمنية معينة.</string>
-    <string name="mapillary_menu_title_dates">التواريخ</string>
-    <string name="mapillary_menu_edit_text_hint">أكتب اسم المستخدم</string>
-    <string name="mapillary_menu_descr_username">عرض صور أضافها مستخدم معين.</string>
+    <string name="mapillary_menu_descr_dates">عرض الصور المضافة فقط</string>
+    <string name="mapillary_menu_title_dates">التاريخ</string>
+    <string name="mapillary_menu_edit_text_hint">قم بادخال اسم المستخدم</string>
+    <string name="mapillary_menu_descr_username">عرض الصور التي أضافها المستخدم</string>
     <string name="mapillary_menu_title_username">اسم المستخدم</string>
     <string name="mapillary_menu_filter_description">يمكنك تصفية الصور حسب مقدمها أو حسب التاريخ. يتم تطبيق عوامل التصفية اذا ما كان التكبير عن كثب فقط.</string>
     <string name="shared_string_reload">إعادة تحميل</string>
@@ -2765,7 +2765,7 @@
     <string name="marker_moved_to_active">علامة الخريطة انتقلت إلى نشطة</string>
     <string name="shared_string_list">قائمة</string>
     <string name="shared_string_groups">مجموعات</string>
-    <string name="passed">آخر استخدام: %1$s</string>
+    <string name="passed">آخر استخدام : %1$s</string>
     <string name="make_active">تنشيط</string>
     <string name="today">اليوم</string>
     <string name="yesterday">أمس</string>
@@ -2781,7 +2781,7 @@
     <string name="do_not_use_animations_descr">تعطيل الرسوم المتحركة في التطبيق.</string>
     <string name="keep_showing_on_map">استمرار العرض على الخريطة</string>
     <string name="exit_without_saving">الخروج دون حفظ؟</string>
-    <string name="show_guide_line">إظهار خط التوجيه</string>
+    <string name="show_guide_line">إظهار خطوط التوجيه</string>
     <string name="show_arrows_on_the_map">إظهار الأسهم على الخريطة</string>
     <string name="show_passed">إظهار المتجاوز</string>
     <string name="hide_passed">إخفاء المتجاوز</string>
@@ -2802,7 +2802,7 @@
     <string name="marker_save_as_track_descr">تصدير علاماتك الخاصة إلى ملف يمكنك تحديده هنا:</string>
     <string name="marker_save_as_track">حفظ كمسار</string>
     <string name="move_to_history">العودة إلى السجل الزمني</string>
-    <string name="group_will_be_removed_after_restart">ستتم إزالة المجموعة بعد إعادة التشغيل</string>
+    <string name="group_will_be_removed_after_restart">ستتم إزالة المجموعة بعد إعادة تشغيل التطبيق.</string>
     <string name="shared_string_markers">علامات</string>
     <string name="coordinates_format">نسق الإحداثيات</string>
     <string name="use_system_keyboard">استخدم لوحة مفاتيح النظام</string>
@@ -2843,13 +2843,41 @@
     <string name="tap_on_map_to_hide_interface">وضع الشاشة الكاملة</string>
     <string name="show_on_top_bar">اظهار في الشريط العلوي</string>
     <string name="mark_passed">تعيين كمتجاوز</string>
-    <string name="empty_state_osm_edits">إنشاء أو تعديل أشياء OSM</string>
+    <string name="empty_state_osm_edits">إنشاء أو تعديل عناصر OSM</string>
     <string name="empty_state_osm_edits_descr">إنشاء أو تعديل OSM POI، فتح أو التعليق على ملاحظات OSM والمساهمة بملفات GPX مسجلة.</string>
     <string name="shared_string_deleted">حُذف</string>
     <string name="shared_string_edited">تم تعديله</string>
-    <string name="shared_string_added">تمت إضافة</string>
+    <string name="shared_string_added">تمت الإضافة</string>
     <string name="modify_the_search_query">تغيير البحث.</string>
     <string name="marker_activated">%s علامة مفعلة.</string>
     <string name="one_tap_active_descr">اضغط علامة على الخريطة لتحريكها الى أعلى العلامات المفعلة دون فتح قائمة السياق.</string>
     <string name="empty_state_av_notes">تدوين ملاحظات!</string>
-    </resources>
+    <string name="without_time_limit">دون تحديد الوقت</string>
+    <string name="context_menu_read_full_article">إقرأ المقال كاملا</string>
+    <string name="context_menu_read_article">قراءة المقال</string>
+    <string name="context_menu_points_of_group">كافة نقاط المجموعة</string>
+    <string name="open_from">مفتوح مِن</string>
+    <string name="open_till">مفتوح إلى غاية</string>
+    <string name="will_close_at">يغلق أبوابه على</string>
+    <string name="will_open_at">سيفتح الأبواب على</string>
+    <string name="will_open_on">يفتح أبوابه أيام</string>
+    <string name="additional_actions">إجراءات إضافية</string>
+    <string name="shared_string_actions">الإجراءات</string>
+    <string name="shared_string_marker">العلامة</string>
+    <string name="notes_by_date">الملاحظات حسب التاريخ</string>
+    <string name="by_date">بحسب التاريخ</string>
+    <string name="by_type">حسب النوع</string>
+    <string name="shared_string_more_without_dots">المزيد</string>
+    <string name="appearance_on_the_map">المظهر على الخريطة</string>
+    <string name="track_waypoints">نقاط المسار</string>
+    <string name="add_group">إضافة مجموعة</string>
+    <string name="empty_state_markers_active">قم بإنشاء علامات على الخريطة !</string>
+    <string name="empty_state_markers_groups">إستيراد مجموعات</string>
+    <string name="digits_quantity">عدد الأرقام</string>
+    <string name="shared_string_right">اليمين</string>
+    <string name="shared_string_left">اليسار</string>
+    <string name="shared_string_paste">إلصاق</string>
+    <string name="go_to_next_field">الإنتقال إلى الحقل التالي</string>
+    <string name="rename_marker">تعديل تسمية العلامة</string>
+    <string name="total_donations">التبرعات الإجمالية</string>
+</resources>
diff --git a/OsmAnd/res/values-b+hsb/strings.xml b/OsmAnd/res/values-b+hsb/strings.xml
index 52470f3d98..55abe24270 100644
--- a/OsmAnd/res/values-b+hsb/strings.xml
+++ b/OsmAnd/res/values-b+hsb/strings.xml
@@ -1343,8 +1343,8 @@
     <string name="context_menu_read_full_article">Cyły zapisk čitać</string>
     <string name="context_menu_read_article">Zapisk čitać</string>
     <string name="context_menu_points_of_group">Wšě dypki tuteje skupiny</string>
-    <string name="opened_from">Wočinjene wot</string>
-    <string name="opened_till">Wočinjene hač do</string>
+    <string name="open_from">Wočinjene wot</string>
+    <string name="open_till">Wočinjene hač do</string>
     <string name="additional_actions">Přidatne akcije</string>
     <string name="av_locations_selected_desc">GPX-dataja z koordinatami a datami wubranych noticow.</string>
     <string name="av_locations_all_desc">GPX-dataja z koordinatami a datami wšěch noticow.</string>
diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml
index be4221d774..60f17b0bc0 100644
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@@ -664,4 +664,18 @@
     <string name="show_number_pad">Sken-d anasiw umḍin</string>
     <string name="shared_string_paste">Senṭeḍ</string>
     <string name="what_is_here">Acu yellan dagi:</string>
+    <string name="context_menu_read_full_article">Γer amagrad akk</string>
+    <string name="context_menu_read_article">Γer amagrad</string>
+    <string name="context_menu_points_of_group">Akk tinqiḍin n ugraw</string>
+    <string name="open_from">Yeldi si</string>
+    <string name="open_till">Yeldi si</string>
+    <string name="will_close_at">Ad imdel γef</string>
+    <string name="will_open_at">Ad yeldi γef</string>
+    <string name="will_open_on">Ad yeldi ass</string>
+    <string name="additional_actions">Tiggawin nniḍen</string>
+    <string name="av_locations_selected_desc">Afaylu GPX igebren adig akked isefka n tezmilin ittwafernen.</string>
+    <string name="av_locations_all_desc">Afaylu igebren adig akked tizmilin.</string>
+    <string name="shared_string_actions">Tigawin</string>
+    <string name="parked_at">Sers deg</string>
+    <string name="without_time_limit">Ulac tilist deg wakud</string>
     </resources>
diff --git a/OsmAnd/res/values-be-rBY/strings.xml b/OsmAnd/res/values-be-rBY/strings.xml
index 057c737ae9..af00140e53 100644
--- a/OsmAnd/res/values-be-rBY/strings.xml
+++ b/OsmAnd/res/values-be-rBY/strings.xml
@@ -2944,9 +2944,9 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
 \n
 \n</string>
     <string name="what_is_here">Što tut:</string>
-    <string name="parked_at">praparkavany na</string>
+    <string name="parked_at">pryparkavany na</string>
     <string name="pick_up_till">Uziać da</string>
-    <string name="without_time_limit">Biez abmiežavannia času</string>
+    <string name="without_time_limit">Biez abmiežavańnia času</string>
     <string name="context_menu_read_full_article">Čytać uvieś artykul</string>
     <string name="context_menu_read_article">Čytać artykul</string>
     <string name="context_menu_points_of_group">Usie kropki hrupy</string>
@@ -2955,7 +2955,7 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="will_be_closed_at">Budzie začyniena a</string>
     <string name="will_be_opened_at">Budzie adčyniena a</string>
     <string name="will_be_opened_on">Budzie adčyniena</string>
-    <string name="additional_actions">Dadatkovyja dziejanni</string>
+    <string name="additional_actions">Dadatkovyja dziejańni</string>
     <string name="av_locations_selected_desc">GPX-fajl z kaardynatami i danymi vybranych natatak.</string>
     <string name="av_locations_all_desc">GPX-fajl z kaardynatami i danymi ŭsich natatak.</string>
     <string name="shared_string_actions">Dziejanni</string>
@@ -2963,4 +2963,9 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
     <string name="osm_recipient_stat">Zmien %1$s, suma %2$s mBTC</string>
     <string name="osm_recipients_label">OSM-atrymaĺniki</string>
     <string name="total_donations">Usiaho achviaravanniaŭ</string>
-</resources>
+<string name="open_from">Adkryta z</string>
+    <string name="open_till">Adkryta da</string>
+    <string name="will_close_at">Zakryjecca a</string>
+    <string name="will_open_at">Adkryjecca a</string>
+    <string name="will_open_on">Adkryjecca</string>
+    </resources>
diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index f0c5ded4a6..24d6eaee80 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2993,9 +2993,9 @@
 \n
 \n</string>
     <string name="what_is_here">Што тут:</string>
-    <string name="parked_at">прапаркаваны на</string>
+    <string name="parked_at">прыпаркаваны на</string>
     <string name="pick_up_till">Узяць да</string>
-    <string name="without_time_limit">Без абмежавання часу</string>
+    <string name="without_time_limit">Без абмежаваньня часу</string>
     <string name="context_menu_read_full_article">Чытаць увесь артыкул</string>
     <string name="context_menu_read_article">Чытаць артыкул</string>
     <string name="context_menu_points_of_group">Усе кропкі групы</string>
@@ -3004,7 +3004,7 @@
     <string name="will_be_closed_at">Будзе зачынена а</string>
     <string name="will_be_opened_at">Будзе адчынена а</string>
     <string name="will_be_opened_on">Будзе адчынена</string>
-    <string name="additional_actions">Дадатковыя дзеянні</string>
+    <string name="additional_actions">Дадатковыя дзеяньні</string>
     <string name="av_locations_selected_desc">GPX-файл з каардынатамі і данымі выбраных нататак.</string>
     <string name="av_locations_all_desc">GPX-файл з каардынатамі і данымі ўсіх нататак.</string>
     <string name="shared_string_actions">Дзеянні</string>
@@ -3012,4 +3012,9 @@
     <string name="osm_recipient_stat">Змен %1$s, сума %2$s mBTC</string>
     <string name="osm_recipients_label">OSM-атрымальнікі</string>
     <string name="total_donations">Усяго ахвяраванняў</string>
-</resources>
+<string name="open_from">Адкрыта з</string>
+    <string name="open_till">Адкрыта да</string>
+    <string name="will_close_at">Закрыецца а</string>
+    <string name="will_open_at">Адкрыецца а</string>
+    <string name="will_open_on">Адкрыецца</string>
+    </resources>
diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 6528ee62aa..2bcd7860db 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -2752,11 +2752,11 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Llegiu l\'article complet</string>
     <string name="context_menu_read_article">Llegiu l\'article</string>
     <string name="context_menu_points_of_group">Tots els punts del grup</string>
-    <string name="opened_from">Obert des de</string>
-    <string name="opened_till">Obert fins a</string>
-    <string name="will_be_closed_at">Es tancarà a</string>
-    <string name="will_be_opened_at">S\'obrirà a</string>
-    <string name="will_be_opened_on">S\'obrirà el</string>
+    <string name="open_from">Obert des de</string>
+    <string name="open_till">Obert fins a</string>
+    <string name="will_close_at">Es tancarà a</string>
+    <string name="will_open_at">S\'obrirà a</string>
+    <string name="will_open_on">S\'obrirà el</string>
     <string name="additional_actions">Accions addicionals</string>
     <string name="av_locations_selected_desc">Arxiu GPX amb coordenades i dades de les notes seleccionades.</string>
     <string name="av_locations_all_desc">Fitxer GPX amb coordenades i dades de totes les notes.</string>
diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index 6a7b8c3d50..fb02a2e2d8 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -3006,11 +3006,11 @@ Repræsenterer område: %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Læs hele artiklen</string>
     <string name="context_menu_read_article">Læs artikel</string>
     <string name="context_menu_points_of_group">Alle punkter i gruppen</string>
-    <string name="opened_from">Åben fra</string>
-    <string name="opened_till">Åben til</string>
-    <string name="will_be_closed_at">Vil være lukket på</string>
-    <string name="will_be_opened_at">Vil blive åbnet på</string>
-    <string name="will_be_opened_on">Der åbnes på</string>
+    <string name="open_from">Åben fra</string>
+    <string name="open_till">Åben til</string>
+    <string name="will_close_at">Vil være lukket på</string>
+    <string name="will_open_at">Vil blive åbnet på</string>
+    <string name="will_open_on">Der åbnes på</string>
     <string name="additional_actions">Yderligere handlinger</string>
     <string name="shared_string_actions">Handlinger</string>
     <string name="shared_string_marker">Markør</string>
diff --git a/OsmAnd/res/values-de/phrases.xml b/OsmAnd/res/values-de/phrases.xml
index 325dcea9b8..f8dec84d6f 100644
--- a/OsmAnd/res/values-de/phrases.xml
+++ b/OsmAnd/res/values-de/phrases.xml
@@ -3659,4 +3659,6 @@
 	<string name="poi_payment_centre">Zahlungs-Zentrum</string>
 	<string name="poi_money_transfer">Überweisung</string>
 
-</resources>
+<string name="poi_route_subway_ref">U-Bahn</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 1a1c07e91f..58323781ea 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2932,17 +2932,17 @@ Abgedeckte Fläche: %1$s x %2$s</string>
 \n• Dauer des Aufstiegs entsprechend dem Gelände (Naismiths Regel)
 \n
 \n</string>
-    <string name="one_tap_active">Aktiviren mit einem Tap</string>
+    <string name="one_tap_active">Aktivieren mit einem Tap</string>
     <string name="what_is_here">Was ist hier:</string>
     <string name="without_time_limit">Ohne Zeitbegrenzung</string>
     <string name="context_menu_read_full_article">Ganzen Artikel lesen</string>
     <string name="context_menu_read_article">Artikel lesen</string>
     <string name="context_menu_points_of_group">Alle Punkte der Gruppe</string>
-    <string name="opened_from">Geöffnet ab</string>
-    <string name="opened_till">Geöffnet bis</string>
-    <string name="will_be_closed_at">Schließt um</string>
-    <string name="will_be_opened_at">Öffnet um</string>
-    <string name="will_be_opened_on">Öffnet am</string>
+    <string name="open_from">Geöffnet ab</string>
+    <string name="open_till">Geöffnet bis</string>
+    <string name="will_close_at">Schließt um</string>
+    <string name="will_open_at">Öffnet um</string>
+    <string name="will_open_on">Öffnet am</string>
     <string name="additional_actions">Zusätzliche Aktionen</string>
     <string name="parked_at">geparkt um</string>
     <string name="pick_up_till">Abholung bis</string>
diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 7a865918b6..e63abade44 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
     <string name="add_tag">Προσθήκη Ετικέτας</string>
     <string name="btn_advanced_mode">Λειτουργία για προχωρημένους…</string>
     <string name="poi_filter_parking">Στάθμευση</string>
@@ -1084,7 +1085,7 @@
     <string name="keep_intermediate_points">Διατήρηση ενδιάμεσων προορισμών</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_map_location">Χάρτης:</string>
     <string name="route_to">Προς:</string>
     <string name="route_via">Μέσω:</string>
     <string name="route_from">Από:</string>
@@ -1719,4 +1720,23 @@
     <string name="rendering_value_medium_name">Μέτριο</string>
     <string name="rendering_value_bold_name">Παχύ</string>
     <string name="report">Αναφορά</string>
+    <string name="keep_showing_on_map">Διατήρηση εμφάνισης στο χάρτη</string>
+    <string name="exit_without_saving">Έξοδος χωρίς αποθήκευση;</string>
+    <string name="shared_string_options">Επιλογές</string>
+    <string name="none_point_error">Παρακαλώ προσθέστε τουλάχιστον ένα σημείο.</string>
+    <string name="show_on_map_after_saving">Εμφάνιση στο χάρτη μετά την αποθήκευση</string>
+    <string name="shared_string_reset">Επαναφορά</string>
+    <string name="shared_string_reload">Επαναφόρτωση</string>
+    <string name="mapillary_menu_date_from">Από</string>
+    <string name="mapillary_menu_title_username">Παρωνύμιο</string>
+    <string name="shared_string_permissions">Άδειες</string>
+    <string name="distance_moving">Η απόσταση διορθώθηκε</string>
+    <string name="open_mapillary">Άνοιγμα του Mapillary</string>
+    <string name="shared_string_install">Εγκατάσταση</string>
+    <string name="online_photos">Online φωτογραφίες</string>
+    <string name="shared_string_add_photos">Προσθήκη φωτογραφιών</string>
+    <string name="nothing_found">Δεν βρέθηκε κάτι :(</string>
+    <string name="quick_action_showhide_osmbugs_title">Εμφάνιση/απόκρυψη σημειώσεων OSM</string>
+    <string name="quick_action_osmbugs_show">Εμφάνιση σημειώσεων OSM</string>
+    <string name="quick_action_osmbugs_hide">Απόκρυψη σημειώσεων OSM</string>
     </resources>
diff --git a/OsmAnd/res/values-eo/phrases.xml b/OsmAnd/res/values-eo/phrases.xml
index af27732769..a6934f2c27 100644
--- a/OsmAnd/res/values-eo/phrases.xml
+++ b/OsmAnd/res/values-eo/phrases.xml
@@ -3663,4 +3663,6 @@
 	<string name="poi_payment_centre">Centro de pago</string>
 	<string name="poi_money_transfer">Centro de mon-transigo</string>
 
-</resources>
+<string name="poi_route_subway_ref">Metroo</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 51541919ce..6de3ee8d74 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2851,7 +2851,7 @@ Indikas lokon:  %1$s x %2$s"</string>
     <string name="import_as_gpx">Enporti kiel GPX-dosieron</string>
     <string name="import_as_favorites">Enporti kiel ŝatatajn</string>
     <string name="import_file">Enporti dosieron</string>
-	<string name="tap_on_map_to_hide_interface_descr">Frapetu la mapon por kaŝi kontrol-butonojn kaj fenestraĵojn.</string>
+	<string name="tap_on_map_to_hide_interface_descr">Frapetu la mapon por baskuli kontrol-butonojn kaj fenestraĵojn.</string>
     <string name="tap_on_map_to_hide_interface">Plenekrana reĝimo</string>
     <string name="show_on_top_bar">Montri en supra breto</string>
     <string name="mark_passed">Marki kiel pasigitan</string>
@@ -2906,4 +2906,24 @@ Indikas lokon:  %1$s x %2$s"</string>
 \n
 \n</string>
     <string name="empty_state_markers_history">\@string/shared_string_history</string>
-    </resources>
+    <string name="what_is_here">Tie ĉi:</string>
+    <string name="parked_at">parkumita je</string>
+    <string name="pick_up_till">Reprenu ĝis</string>
+    <string name="without_time_limit">Sen tempolimo</string>
+    <string name="context_menu_read_full_article">Legi tutan artikolon</string>
+    <string name="context_menu_read_article">Legi artikolon</string>
+    <string name="context_menu_points_of_group">Ĉiuj punktoj de la grupo</string>
+    <string name="open_from">Malfermita de</string>
+    <string name="open_till">Malfermita ĝis</string>
+    <string name="will_close_at">Estos fermita je</string>
+    <string name="will_open_at">Estos malfermita je</string>
+    <string name="will_open_on">Estos malfermita je</string>
+    <string name="additional_actions">Pliaj agoj</string>
+    <string name="av_locations_selected_desc">GPX-dosiero enhavanta koordinatojn kaj datumojn de elektitaj notoj.</string>
+    <string name="av_locations_all_desc">GPX-dosiero kun koordinatoj kaj datumoj de ĉiuj notoj.</string>
+    <string name="shared_string_actions">Agoj</string>
+    <string name="shared_string_marker">Marko</string>
+    <string name="osm_recipient_stat">%1$s redaktoj, %2$s m₿ tute</string>
+    <string name="osm_recipients_label">OSM-ricevantoj</string>
+    <string name="total_donations">Donacoj tute</string>
+</resources>
diff --git a/OsmAnd/res/values-es-rAR/phrases.xml b/OsmAnd/res/values-es-rAR/phrases.xml
index abecd09ce7..f196d4d427 100644
--- a/OsmAnd/res/values-es-rAR/phrases.xml
+++ b/OsmAnd/res/values-es-rAR/phrases.xml
@@ -1788,7 +1788,7 @@
 	<string name="poi_chimney">Chimenea</string>
 	<string name="poi_palm">Palmera</string>
 	<string name="poi_cypress">Ciprés</string>
-	<string name="poi_flagpole">Mástil de bandera</string>
+	<string name="poi_flagpole">Asta de bandera</string>
 
 	<string name="poi_bench_yes">Sí</string>
 	<string name="poi_bench_no">Bancos (asientos): No</string>
diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 2a815e67ed..f60b347f36 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2628,7 +2628,7 @@ Proporciona un código completo</string>
     <string name="search_favorites">Buscar favoritos</string>
     <string name="restart_search">Reiniciar búsqueda</string>
     <string name="increase_search_radius">Aumentar radio de búsqueda</string>
-    <string name="nothing_found">¡Nada por aquí! 😞</string>
+    <string name="nothing_found">¡Nada por aquí! :-(</string>
     <string name="nothing_found_descr">Modifica la consulta de búsqueda o aumenta el radio de búsqueda.</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Quieres acceder en este viaje a los caminos privados?</string>
     <string name="mapillary">Mapillary</string>
@@ -2879,11 +2879,11 @@ Proporciona un código completo</string>
     <string name="context_menu_read_full_article">Leer artículo completo</string>
     <string name="context_menu_read_article">Leer artículo</string>
     <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
-    <string name="opened_from">Abierto desde las</string>
-    <string name="opened_till">Abierto hasta las</string>
-    <string name="will_be_closed_at">Cerrará a las</string>
-    <string name="will_be_opened_at">Abrirá a las</string>
-    <string name="will_be_opened_on">Abrirá sobre las</string>
+    <string name="open_from">Abierto desde las</string>
+    <string name="open_till">Abierto hasta las</string>
+    <string name="will_close_at">Cerrará a las</string>
+    <string name="will_open_at">Abrirá a las</string>
+    <string name="will_open_on">Abrirá sobre las</string>
     <string name="additional_actions">Acciones adicionales</string>
     <string name="shared_string_actions">Acciones</string>
     <string name="shared_string_marker">Marcador</string>
diff --git a/OsmAnd/res/values-es-rUS/phrases.xml b/OsmAnd/res/values-es-rUS/phrases.xml
index 3c8d5bf8e0..364abd2ef8 100644
--- a/OsmAnd/res/values-es-rUS/phrases.xml
+++ b/OsmAnd/res/values-es-rUS/phrases.xml
@@ -1656,7 +1656,7 @@
 	<string name="poi_chimney">Chimenea</string>
 	<string name="poi_palm">Palmera</string>
 	<string name="poi_cypress">Ciprés</string>
-	<string name="poi_flagpole">Mástil de bandera</string>
+	<string name="poi_flagpole">Asta de bandera</string>
 	<string name="poi_bench_yes">Sí</string>
 	<string name="poi_bench_no">Bancos (asientos): No</string>
 	<string name="poi_bin_yes">Cesto de basura: Sí</string>
diff --git a/OsmAnd/res/values-es-rUS/strings.xml b/OsmAnd/res/values-es-rUS/strings.xml
index 438c9e0f8e..212565645c 100644
--- a/OsmAnd/res/values-es-rUS/strings.xml
+++ b/OsmAnd/res/values-es-rUS/strings.xml
@@ -2642,7 +2642,7 @@ Proporciona un código completo</string>
     <string name="search_favorites">Buscar favoritos</string>
     <string name="restart_search">Reiniciar búsqueda</string>
     <string name="increase_search_radius">Aumentar radio de búsqueda</string>
-    <string name="nothing_found">¡Nada por aquí! 😞</string>
+    <string name="nothing_found">¡Nada por aquí! :-(</string>
     <string name="nothing_found_descr">Modifica la consulta de búsqueda o aumenta el radio de búsqueda.</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Quieres acceder en este viaje a los caminos privados?</string>
     <string name="mapillary">Mapillary</string>
@@ -2888,11 +2888,11 @@ Proporciona un código completo</string>
     <string name="context_menu_read_full_article">Leer artículo completo</string>
     <string name="context_menu_read_article">Leer artículo</string>
     <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
-    <string name="opened_from">Abierto desde las</string>
-    <string name="opened_till">Abierto hasta las</string>
-    <string name="will_be_closed_at">Cerrará a las</string>
-    <string name="will_be_opened_at">Abrirá a las</string>
-    <string name="will_be_opened_on">Abrirá sobre las</string>
+    <string name="open_from">Abierto desde las</string>
+    <string name="open_till">Abierto hasta las</string>
+    <string name="will_close_at">Cerrará a las</string>
+    <string name="will_open_at">Abrirá a las</string>
+    <string name="will_open_on">Abrirá sobre las</string>
     <string name="additional_actions">Acciones adicionales</string>
     <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas elegidas.</string>
     <string name="av_locations_all_desc">Archivo GPX con coordenadas y datos de todas las notas.</string>
diff --git a/OsmAnd/res/values-es/phrases.xml b/OsmAnd/res/values-es/phrases.xml
index 74d507d24a..f826e12e27 100644
--- a/OsmAnd/res/values-es/phrases.xml
+++ b/OsmAnd/res/values-es/phrases.xml
@@ -1793,7 +1793,7 @@
 	<string name="poi_chimney">Chimenea</string>
 	<string name="poi_palm">Palmera</string>
 	<string name="poi_cypress">Ciprés</string>
-	<string name="poi_flagpole">Mástil de bandera</string>
+	<string name="poi_flagpole">Asta de bandera</string>
 
 	<string name="poi_bench_yes">Sí</string>
 	<string name="poi_bench_no">Bancos (asientos): no</string>
diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 3f4ab0eac6..8929732dab 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -2784,7 +2784,7 @@ Por favor proporciona un código completo</string>
     <string name="shared_string_more_without_dots">Más</string>
     <string name="empty_state_markers_history">\@string/shared_string_history</string>
     <string name="looking_for_tracks_with_waypoints">Buscando trazas con puntos de ruta</string>
-    <string name="release_3_0">• La detección de señales de alto, ahora considera la dirección de desplazamiento 
+    <string name="release_3_0">• La detección de señales de stop ahora considera la dirección de desplazamiento 
 \n 
 \n • Nuevo algoritmo que proporciona valores significativos de ascenso y descenso para trazas GPX. 
 \n 
@@ -2812,11 +2812,11 @@ Por favor proporciona un código completo</string>
     <string name="context_menu_read_full_article">Leer el artículo completo</string>
     <string name="context_menu_read_article">Leer artículo</string>
     <string name="context_menu_points_of_group">Todos los puntos del grupo</string>
-    <string name="opened_from">Abierto desde las</string>
-    <string name="opened_till">Abierto hasta las</string>
-    <string name="will_be_closed_at">Cerrará a las</string>
-    <string name="will_be_opened_at">Abrirá a las</string>
-    <string name="will_be_opened_on">Abrirá sobre las</string>
+    <string name="open_from">Abierto desde las</string>
+    <string name="open_till">Abierto hasta las</string>
+    <string name="will_close_at">Cerrará a las</string>
+    <string name="will_open_at">Abrirá a las</string>
+    <string name="will_open_on">Abrirá sobre las</string>
     <string name="additional_actions">Acciones adicionales</string>
     <string name="av_locations_selected_desc">Archivo GPX con coordenadas y datos de las notas seleccionadas.</string>
     <string name="av_locations_all_desc">Archivo GPX con las coordenadas y los datos de todas las notas.</string>
diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index 12fd63d21d..a3851c1858 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -2793,7 +2793,7 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="import_track_desc">%1$s fitxategiak ez du bide-punturik, inportatu lorratz gisa?</string>
     <string name="move_point">Mugitu puntua</string>
     <string name="add_segment_to_the_track">Gehitu GPX lorratzera</string>
-<string name="map_orientation_change_in_accordance_with_speed">Maparen orientazioa abiaduraren arabera aldatzen da</string>
+<string name="map_orientation_change_in_accordance_with_speed">Maparen orientazioaren atalasea</string>
     <string name="map_orientation_change_in_accordance_with_speed_descr">Erabili barne ipar-orratza eta ez mugimenduaren norabidea maparen orientazioa erabakitzeko abiadura txikia denean</string>
     <string name="all_markers_moved_to_history">Markatzaile guztiak historialera mugituta</string>
     <string name="marker_moved_to_history">Markatzailea historialera mugitu da</string>
@@ -2808,4 +2808,17 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="this_year">Aurten</string>
     <string name="widget">Trepeta</string>
     <string name="top_bar">Goiko barra</string>
+    <string name="what_is_here">Hemen dagoena:</string>
+    <string name="parked_at">aparkatzeko ordua</string>
+    <string name="pick_up_till">Jaso beranduenez</string>
+    <string name="without_time_limit">Denbora mugarik gabe</string>
+    <string name="context_menu_read_full_article">Irakurri artikulu osoa</string>
+    <string name="context_menu_read_article">Irakurri artikulua</string>
+    <string name="context_menu_points_of_group">Taldeko puntu guztiak</string>
+    <string name="open_from">Irekitze-ordua</string>
+    <string name="open_till">Ixte ordua</string>
+    <string name="will_close_at">Ixte-ordua</string>
+    <string name="will_open_at">Irekitze-ordua</string>
+    <string name="will_open_on">Irekitze-ordua</string>
+    <string name="additional_actions">Ekintza gehigarriak</string>
     </resources>
diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml
index 7ecf2c9894..b6a25f3753 100644
--- a/OsmAnd/res/values-fa/strings.xml
+++ b/OsmAnd/res/values-fa/strings.xml
@@ -1786,8 +1786,8 @@
     <string name="application_dir_change_warning3">آیا فایل‌های دادهٔ OsmAnd نیز به مکان جدید کپی شود؟</string>
     <string name="specified_directiory_not_writeable">نمی‌توان نقشه‌ها را در پوشهٔ موردنظر ایجاد کرد</string>
 	<string name="copying_osmand_file_failed">کپی‌کردن فایل‌ها ناموفق بود</string>    
-    <string name="storage_directory_external">محل ذخیره‌سازی خارجی</string>
-    <string name="storage_directory_multiuser">محل ذخیره‌سازی چندکاربره</string>
+    <string name="storage_directory_external">ذخیره‌گاه خارجی</string>
+    <string name="storage_directory_multiuser">ذخیره‌گاه چندکاربره</string>
     <string name="storage_directory_internal_app">حافظهٔ داخلی برنامه</string>
     <string name="storage_directory_manual">انتخاب دستی</string>
     <string name="storage_directory_default">حافظهٔ داخلی</string>
@@ -1984,7 +1984,7 @@
     <string name="no_inet_connection_desc_map">برای دانلودکردن نقشه‌ها لازم است.</string>
     <string name="search_location">در حال جست‌وجوی مکان…</string>
     <string name="storage_free_space">فضای خالی</string>
-    <string name="storage_place_description">محل ذخیرهٔ اطلاعات برنامه (برای نقشه‌ها، مسیرها و...): %1$s.</string>
+    <string name="storage_place_description">محل ذخیرهٔ اطلاعات (برای نقشه‌ها، مسیرها و...): %1$s.</string>
     <string name="give_permission">اجازهٔ دسترسی</string>
     <string name="allow_access_location">اجازهٔ دسترسی به موقعیتتان را بدهید</string>
     <string name="first_usage_greeting">مسیریابی و کشف جاهای تازه بدون اتصال به اینترنت</string>
@@ -2014,7 +2014,7 @@
     <string name="city_type_neighbourhood">محله</string>
     <string name="map_widget_search">جست‌وجو</string>
 	<string name="shared_string_is_open_24_7">ساعت کار 24/7</string>
-    <string name="storage_directory_card">حافظهٔ جانبی</string>
+    <string name="storage_directory_card">کارت حافظه</string>
     <string name="coords_format">قالب مختصات</string>
     <string name="coords_format_descr">قالب نمایش مختصات جغرافیایی را مشخص کنید.</string>
   	<string name="app_mode_bus">اتوبوس</string>
@@ -2057,13 +2057,13 @@
     <string name="no_map_markers_found">لطفاً نشانه‌ها را از طریق نقشه اضافه کنید</string>
     <string name="no_waypoints_found">هیچ نقطهٔ بین‌راهی پیدا نشد</string>
     <string name="report">گزارش</string>
-    <string name="storage_permission_restart_is_required">اکنون برنامه اجازهٔ ذخیره‌سازی در کارت حافظه را دارد. برنامه را ببندید و دوباره اجرا کنید.</string>
+    <string name="storage_permission_restart_is_required">اکنون برنامه اجازه دارد تا اطلاعات را در ذخیره‌گاه خارجی بنویسد. برنامه را ببندید و دوباره اجرا کنید.</string>
     <string name="shared_string_move_up">برو بالا</string>
     <string name="shared_string_move_down">برو پایین</string>
     <string name="finish_navigation">پایان راهبری</string>
     <string name="avoid_road">اجتناب از این جاده</string>
-    <string name="storage_directory_readonly_desc">پوشهٔ ذخیره‌سازی که انتخاب کرده‌اید فقط‌خواندنی است. پوشهٔ ذخیره‌سازی به‌طور موقت به حافظهٔ داخلی تغییر کرد. لطفاً یک مکان ذخیره‌سازی معتبر را انتخاب نمایید.</string>
-    <string name="storage_directory_shared">حافظهٔ مورداستفاده</string>
+    <string name="storage_directory_readonly_desc">پوشهٔ ذخیره‌سازی که انتخاب کرده‌اید فقط‌خواندنی است. پوشهٔ ذخیره‌سازی موقتاً به حافظهٔ داخلی تغییر کرد. لطفاً یک مکان ذخیره‌سازی معتبر را انتخاب نمایید.</string>
+    <string name="storage_directory_shared">حافظهٔ اشتراکی</string>
     <string name="shared_string_topbar">نوار بالا</string>
     <string name="full_report">گزارش کامل</string>
     <string name="recalculate_route">پیداکردن مجدد مسیر</string>
@@ -2581,7 +2581,7 @@
     <string name="empty_state_favourites">افزودن نقاط برگزیده</string>
     <string name="empty_state_favourites_desc">نقاط برگزیده را روی نقشه اضافه کنید یا آن‌ها را از یک فایل وارد کنید.</string>
     <string name="move_point">جابه‌جاکردن نقطه</string>
-    <string name="make_round_trip_descr">نقطهٔ شروع را به‌عنوان مقصد هم درنظر بگیر.</string>
+    <string name="make_round_trip_descr">نقطهٔ شروع را به‌عنوان مقصد هم در نظر بگیر.</string>
     <string name="make_round_trip">ایجاد سفر رفت‌وبرگشتی</string>
     <string name="coordinates_format">قالب مختصات</string>
     <string name="use_system_keyboard">استفاده از صفحه‌کلید سیستم</string>
@@ -2993,11 +2993,11 @@
     <string name="context_menu_read_full_article">مقالهٔ کامل را بخوانید</string>
     <string name="context_menu_read_article">خواندن مقاله</string>
     <string name="context_menu_points_of_group">همهٔ نقاط این گروه</string>
-    <string name="opened_from">ساعت بازشدن</string>
-    <string name="opened_till">ساعت کاری تا</string>
-    <string name="will_be_closed_at">ساعت تعطیل‌کردن</string>
-    <string name="will_be_opened_at">ساعت بازکردن</string>
-    <string name="will_be_opened_on">روز بازکردن</string>
+    <string name="open_from">ساعت بازشدن</string>
+    <string name="open_till">ساعت کاری تا</string>
+    <string name="will_close_at">ساعت تعطیل‌کردن</string>
+    <string name="will_open_at">ساعت بازکردن</string>
+    <string name="will_open_on">روز بازکردن</string>
     <string name="additional_actions">عملیات بیشتر</string>
     <string name="av_locations_selected_desc">فایل GPX با مختصات و داده‌های یادداشت‌هایی که انتخاب شده است.</string>
     <string name="av_locations_all_desc">فایل GPX با مختصات و داده‌های یادداشت‌هایی که انتخاب شده است.</string>
diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 33d1d52ef2..467d765e22 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2819,7 +2819,7 @@ représentant la zone : %1$s x %2$s</string>
     <string name="mappilary_no_internet_desc">Vous devez être connecté à Internet pour afficher les photos Mapillary</string>
     <string name="retry">Essayer à nouveau</string>
 <string name="measurement_tool_action_bar">Déplacez la carte et ajoutez des points</string>
-    <string name="measurement_tool">Mesurer de distance</string>
+    <string name="measurement_tool">Mesurer une distance</string>
     <string name="shared_string_create">Créer</string>
 <string name="add_gpx_waypoint_bottom_sheet_title">Ajouter un point GPX</string>
     <string name="release_2_7">\\022 Greffon Mapillary avec les images de rue
@@ -3055,11 +3055,11 @@ représentant la zone : %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Lire l\'article complet</string>
     <string name="context_menu_read_article">Lire l\'article</string>
     <string name="context_menu_points_of_group">Tous les points du groupe</string>
-    <string name="opened_from">Ouvert depuis</string>
-    <string name="opened_till">Ouvert depuis</string>
-    <string name="will_be_closed_at">Fermera à</string>
-    <string name="will_be_opened_at">Ouvrira à</string>
-    <string name="will_be_opened_on">Sera ouvert le</string>
+    <string name="open_from">Ouvert de</string>
+    <string name="open_till">Ouvert jusqu\'à</string>
+    <string name="will_close_at">Fermera à</string>
+    <string name="will_open_at">Ouvrira à</string>
+    <string name="will_open_on">Sera ouvert le</string>
     <string name="additional_actions">Actions supplémentaires</string>
     <string name="shared_string_actions">Actions</string>
     <string name="shared_string_marker">Marque</string>
diff --git a/OsmAnd/res/values-he/strings.xml b/OsmAnd/res/values-he/strings.xml
index 812d7b61e7..40e2d39f12 100644
--- a/OsmAnd/res/values-he/strings.xml
+++ b/OsmAnd/res/values-he/strings.xml
@@ -82,10 +82,11 @@
 	
 	
 	<string name="bg_service_sleep_mode_off">הפעלת\n מצב שינה</string>
-	<string name="bg_service_sleep_mode_on">הפסקת\n מצב שינה</string>
+	<string name="bg_service_sleep_mode_on">הפסקת
+\n הפעלה ברקע</string>
 	<string name="gps_wakeup_interval">הפרשי התעוררות של רכיב האיכון: %s</string>
 	<string name="int_continuosly">רציף</string>
-	<string name="screen_is_locked">כדי לשחרר את המסכים יש ללחוץ על סמל הנעילה</string>
+	<string name="screen_is_locked">כדי לשחרר את המסך יש ללחוץ על סמל המנעול</string>
 	<string name="map_widget_top_text">שם הרחוב</string>
 	<string name="map_widget_config">מסך ההגדרות</string>
 	
@@ -97,7 +98,7 @@
 	
 	
 	<string name="map_widget_parking">חנייה</string>
-	<string name="map_widget_monitoring">הקלטת GPX</string>
+	<string name="map_widget_monitoring">רישום GPX</string>
 	<string name="map_widget_speed">מהירות</string>
 	<string name="map_widget_distance">יעד</string>
 	<string name="map_widget_altitude">גובה</string>
@@ -126,9 +127,9 @@
 	<string name="bg_service_screen_unlock">שחרור המסך</string>
 	<string name="bg_service_screen_lock_toast">המסך נעול</string>
 	<string name="bg_service_interval">הגדרת משך התעוררות:</string>
-	<string name="show_cameras">הצגת מכמונות מהירות</string>
-	<string name="show_traffic_warnings">הצגת אזהרות תנועה</string>
-	<string name="avoid_toll_roads">המנעות מכבישי אגרה</string>
+	<string name="show_cameras">מכמונות מהירות</string>
+	<string name="show_traffic_warnings">אזהרות תנועה</string>
+	<string name="avoid_toll_roads">הימנעות מכבישי אגרה</string>
 	<string name="continue_follow_previous_route_auto">הניווט הקודם לא הושלם. האם להמשיך לעקוב אחריו? (%1$s שניות)</string>
 	<string name="route_updated_loc_found">המסלול יחושב מחדש כאשר המיקום יימצא</string>
 	<string name="osmand_parking_hours">שעות</string>
@@ -502,7 +503,7 @@
 	<string name="search_offline_geo_error">לא ניתן לנתח את הפריט הגאוגרפי \'%s\'</string>
 	<string name="search_osm_offline">חיפוש כתובת באמצעות המפה הבלתי מקוונת</string>
 	<string name="system_locale">מערכת</string>
-	<string name="preferred_locale_descr">נא לבחור את שפת התצוגה</string>
+	<string name="preferred_locale_descr">נא לבחור את שפת התצוגה (יש להפעיל את OsmAnd מחדש לאחר השינוי).</string>
 	<string name="preferred_locale">שפת התצוגה</string>
 	
 	
@@ -518,8 +519,8 @@
 	
 	<string name="shared_string_next">הבא</string>
 	<string name="shared_string_previous">הקודם</string>
-	<string name="unit_of_length_descr">שינוי יחידות האורך והמהירות</string>
-	<string name="unit_of_length">יחידת המידה</string>
+	<string name="unit_of_length_descr">שינוי יחידות האורך.</string>
+	<string name="unit_of_length">יחידות אורך</string>
 	<string name="si_mi_feet">מיילים/רגל</string>
 	<string name="si_mi_yard">מיילים/יארדים</string>
 	<string name="si_km_m">קילומטרים/מטרים</string>
@@ -565,7 +566,7 @@
 	<string name="km_h">קמ״ש</string>
 	<string name="m">מ׳</string>
 	<string name="old_map_index_is_not_supported">תבנית נתוני המפה שנזנחה „{0}“ אינה נתמכת</string>
-	<string name="poi_filter_closest_poi">נ״ע הקרובה ביותר</string>
+	<string name="poi_filter_closest_poi">נ״ע הקרובות ביותר</string>
 	<string name="poi_filter_custom_filter">מסנן מותאם אישית</string>
 	<string name="poi_filter_namefinder">מחפש שמות מקוון</string>
 	<string name="reading_cached_tiles">האריחים שנשמרו נקראים…</string>
@@ -584,7 +585,7 @@
 	<string name="build_installed">הבנייה {0} הותקנה בהצלחה ({1}).</string>
 	
 	<string name="downloading_build">הבנייה מתקבלת…</string>
-	<string name="install_selected_build">האם ברצונך להתקין את OsmAnd - {0} מהמיקום {1}‏ {2} מ״ב ?</string>
+	<string name="install_selected_build">האם ברצונך להתקין את OsmAnd‏ - {0} מתוך {1}‏ {2} מ״ב ?</string>
 	<string name="loading_builds_failed">קבלת רשימת הבניות של OsmAnd נכשלה</string>
 	<string name="loading_builds">הבניות של OsmAnd נטענות…</string>
 	<string name="select_build_to_install">יש לבחור את אחת הבניות של OsmAnd להתקנה</string>
@@ -605,7 +606,7 @@
 	<string name="shared_string_select_all">בחירת הכול</string>
 	<string name="shared_string_refresh">רענון</string>
 	<string name="fast_route_mode">המסלול המהיר ביותר</string>
-	<string name="fast_route_mode_descr">"יש להפעיל כדי לחשב את המסלול המהיר ביותר או לנטרל כדי לקבל את המסלול הקצר ביותר "</string>
+	<string name="fast_route_mode_descr">יש להפעיל כדי לחשב את המסלול המהיר ביותר או להשבית כדי לקבל את המסלול החסכוני ביותר.</string>
 	<string name="tiles_to_download_estimated_size">ברמת תקריב {0} יש להוריד {1} אריחים ({2} מ״ב)</string>
 	<string name="shared_string_download_map">הורדת המפה</string>
 	<string name="select_max_zoom_preload_area">יש לבחור את רמת התקריב המרבית כדי לטעון מראש</string>
@@ -617,7 +618,7 @@
 	<string name="renderer_load_sucess">תכונת העיבוד נטענה בהצלחה</string>
 	<string name="renderer_load_exception">אירעה חריגה: תכונת העיבוד לא נטענה</string>
 	<string name="renderers">תכונת עיבוד וקטורים</string>
-	<string name="renderers_descr">נא לבחור את הופעת תכונת העיבוד</string>
+	<string name="renderers_descr">נא לבחור את הופעת תכונת העיבוד.</string>
 	<string name="poi_context_menu_website">הצגת אתר הנ״ע</string>
 	<string name="poi_context_menu_call">הצגת טלפון הנ״ע</string>
 	<string name="website">אתר</string>
@@ -666,7 +667,7 @@
 	<string name="layer_yandex_traffic">תנועה מ־Yandex</string>
 	<string name="layer_route">מסלול</string>
 	<string name="shared_string_favorites">מועדפים</string>
-	<string name="layer_osm_bugs">תקלות ב־OSM</string>
+	<string name="layer_osm_bugs">הערות ב־OSM (מקוון)</string>
 	
 	
 	<string name="transport_Stop">תחנה</string>
@@ -686,12 +687,12 @@
 	<string name="show_transport_over_map_description">הצגת תחנות תחבורה ציבורית במפה.</string>
 	<string name="show_transport_over_map">הצגת תחנות תחבורה</string>
 	<string name="hello">יישום הניווט OsmAnd</string>
-	<string name="layer_poi">נ״ע…</string>
+	<string name="layer_poi">שכבת נ״ע…</string>
 	<string name="layer_map">מקור המפה…</string>
 	<string name="menu_layers">הגדרת תצוגה</string>
 	<string name="context_menu_item_search_poi">חיפוש נ״ע</string>
 	
-	<string name="use_trackball_descr">יש להשתמש בכדור מעקב כדי להזיז את המפה</string>
+	<string name="use_trackball_descr">יש להשתמש בכדור מעקב כדי להזיז את המפה.</string>
 	<string name="where_am_i">איפה אני?</string>
 	<string name="update_poi_success">נתוני הנ״ע עודכנו בהצלחה ({0} נטענו)</string>
 	<string name="use_trackball">שימוש בכדור המעקב</string>
@@ -700,7 +701,7 @@
 	<string name="gps_provider">רכיב איכון</string>
 	<string name="int_seconds">שניות</string>
 	<string name="int_min">דקות</string>
-	<string name="background_service_int_descr">הגדרת הפסקות שינה שמשמשות את שירות מצב השינה</string>
+	<string name="background_service_int_descr">הגדרת הפסקות שינה שמשמשות את שירות מצב הרקע.</string>
 	<string name="background_service_int">הפרשי התעוררות GPS</string>
 	<string name="update_poi_error_local">אירעה שגיאה בעת עדכון רשימת הנ״ע המקומית</string>
 	<string name="update_poi_error_loading">אירעה שגיאה בעת טעינת הנתונים מהשרת</string>
@@ -709,10 +710,10 @@
 	<string name="context_menu_item_update_poi">עדכון נ״ע</string>
 	<string name="context_menu_item_update_map_confirm">האם לעדכן את הנתונים המקומיים שלך מהאינטרנט?</string>
 	<string name="search_history_city">עיר:\n {0}</string>
-	<string name="background_service_provider_descr">נא לבחור את ספק המיקום בעת הפעלה במצב רקע</string>
+	<string name="background_service_provider_descr">נא לבחור את ספק המיקום שמשמש להפעלה במצב רקע.</string>
 	<string name="background_service_provider">ספק מיקום</string>
-	<string name="background_router_service_descr">הפעלת OsmAnd ברקע כדי לעקוב אחר המיקום שלך כשהמסך כבוי</string>
-	<string name="background_router_service">הפעלה ברקע</string>
+	<string name="background_router_service_descr">הפעלת OsmAnd ברקע כדי לעקוב אחר המיקום שלך כשהמסך כבוי.</string>
+	<string name="background_router_service">הפעלת OsmAnd ברקע</string>
 	<string name="off_router_service_no_gps_available">שירות הניווט ברקע דורש הפעלה של ספק מיקום.</string>
 	<string name="hide_poi_filter">הסתרת מסנן</string>
 	<string name="show_poi_filter">הצגת מסנן</string>
@@ -788,7 +789,7 @@
 	<string name="opening_hours">שעות הפתיחה</string>
 	<string name="background_service_wait_int">זמן ההמתנה המרבי לתיקון</string>
 	
-	<string name="background_service_wait_int_descr">הגדרת זמן ההמתנה המרבי לכל תיקון במיקום ברקע</string>
+	<string name="background_service_wait_int_descr">הגדרת זמן ההמתנה המרבי לכל תיקון במיקום ברקע.</string>
 	<string name="opening_changeset">ערכת השינויים נפתחת…</string>
 	<string name="closing_changeset">ערכת השינויים נסגרת…</string>
 	<string name="commiting_node">המפרק נשלח…</string>
@@ -2508,11 +2509,11 @@
     <string name="context_menu_read_full_article">קריאת הכתבה המלאה</string>
     <string name="context_menu_read_article">קריאת הכתבה</string>
     <string name="context_menu_points_of_group">כל הנקודות בקבוצה</string>
-    <string name="opened_from">פתיחה בשעה</string>
-    <string name="opened_till">סגירה בשעה</string>
-    <string name="will_be_closed_at">סגירה בשעה</string>
-    <string name="will_be_opened_at">פתיחה בשעה</string>
-    <string name="will_be_opened_on">פתיחה ביום</string>
+    <string name="open_from">פתיחה בשעה</string>
+    <string name="open_till">סגירה בשעה</string>
+    <string name="will_close_at">סגירה בשעה</string>
+    <string name="will_open_at">פתיחה בשעה</string>
+    <string name="will_open_on">פתיחה ביום</string>
     <string name="additional_actions">פעולות נוספות</string>
     <string name="av_locations_selected_desc">קובץ GPX עם נקודות ציון ונתונים על ההערות הנבחרות.</string>
     <string name="av_locations_all_desc">קובץ GPX עם נקודות ציון ונתונים על כל ההערות.</string>
@@ -2594,4 +2595,16 @@
     <string name="osmand_extended_description_part7">תרומה ל־OSM • דיווח על תקלה בנתונים • העלאת מסלולי GPX ישירות מהיישומון אל OSM • הוספת נקודות עניין והעלאה ישירה שלהן ל־OSM (או לאחר מכן אם אין חיבור)</string>
     <string name="arrival_distance_descr">כמה לפני המועד ברצונך להיוודע על הגעה ליעד?</string>
     <string name="live_monitoring_max_interval_to_send">חוצץ זמן למעקב מקוון</string>
+    <string name="osm_edit_removed_note">הערת OSM נמחקה</string>
+    <string name="osm_edit_created_note">נוצרה הערת OSM</string>
+    <string name="osn_bug_name">הערת OSM</string>
+    <string name="osn_add_dialog_title">יצירת הערה</string>
+    <string name="share_geo">גאו:</string>
+    <string name="osm_edits">עריכות ב־OSM</string>
+    <string name="osmand_parking_hour">שע</string>
+    <string name="navigate_point_olc">פתיחת קוד מיקום</string>
+    <string name="osm_recipients_label">נמעני OSM</string>
+    <string name="total_donations">סך כל התרומות</string>
+<string name="access_direction_audio_feedback_descr">ציון כיוון נקודת היעד עם צליל.</string>
+    <string name="delay_to_start_navigation_descr">נא לציין את זמן ההמתנה להישאר במסך תכנון הנתיב.</string>
     </resources>
diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml
index 6ea9cf5c7e..f03fa2a1ac 100644
--- a/OsmAnd/res/values-hu/strings.xml
+++ b/OsmAnd/res/values-hu/strings.xml
@@ -287,7 +287,7 @@ Ehhez {1} MB helyre van szükség.
     <string name="search_offline_geo_error">Nem sikerült értelmezni a geo intent által küldött parancsot:\'%s\'.</string>
     <string name="search_osm_offline">Cím keresése offline térképen</string>
     <string name="system_locale">Rendszer nyelve</string>
-    <string name="preferred_locale_descr">Kijelző nyelvének kiválasztása (módosítás után indítsd újra az OsmAnd programot)</string>
+    <string name="preferred_locale_descr">Kijelző nyelvének kiválasztása (módosítás után indítsd újra az OsmAndot).</string>
     <string name="preferred_locale">Preferált nyelv</string>
 
 
@@ -903,7 +903,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
 
 
     <string name="osmand_short_description_80_chars">Globális mobil térkép és navigáció, offline és online OSM térképekkel</string>
-    <string name="osmand_long_description_1000_chars">"OsmAnd (OSM Automated Navigation Directions) Az OsmAnd nyílt forráskódú navigációs alkalmazás az OpenStreetMap (OSM) adatainak széleskörű használatával. Bármelyik térképadat (vektoros és raszteres térképek) tárolható a készülék memóriakártyáján offline használatra. Az OsmAnd továbbá lehetővé teszi az offline és online útvonaltervezést is, részletes hangutasításokkal. Néhány fontosabb funkció: - Teljesen offline működés (a letöltött vektoros és raszteres térképek az eszközön tárolódnak) - A kompakt, offline vektoros térképek az egész világhoz elérhetőek - Az ország vagy régió térképei letölthetők közvetlenül az alkalmazásból - Számos rávetíthető térképréteg, mint GPX-ek, navigációs útvonalak, POI-k (érdekes helyek), kedvencek, szintvonalak, tömegközlekedési megállók, további térképek beállítható átlátszósággal - Címek és helyek offline kereshetősége - Offline útvonaltervezés rövidebb távolságokra (kísérleti) - Autós, kerékpáros és gyalogos módok: - opcionális automata nappali/éjszakai nézetváltással - opcionális sebességfüggő nagyítással - opcionális térképforgatással a mozgás vagy az iránytű alapján - opcionális sávasszisztens, sebességkorlátozás kijelzés, felvett és gépi hangutasítás Az OsmAnd ingyenes változatának korlátozásai: - Korlátozott számú vektoros térképletöltés - Offline Wikipédia cikkek nem elérhetőek Az OsmAnd folyamatosan fejlesztés alatt áll és a projektünk nagyban függ a pénzügyi támogatásoktól, amiből finanszírozhatók a fejlesztések és az új funkciók tesztelése. Kérlek, fontold meg az OsmAnd+ megvásárlását, vagy egy-egy funkció támogatását az osmand.net oldalon. "</string>
+    <string name="osmand_long_description_1000_chars">OsmAnd (OSM Automated Navigation Directions) Az OsmAnd nyílt forráskódú navigációs alkalmazás az OpenStreetMap (OSM) adatainak széleskörű használatával. Bármelyik térképadat (vektoros és raszteres térképek) tárolható a készülék memóriakártyáján offline használatra. Az OsmAnd továbbá lehetővé teszi az offline és online útvonaltervezést is, részletes hangutasításokkal. Néhány fontosabb funkció: - Teljesen offline működés (a letöltött vektoros és raszteres térképek az eszközön tárolódnak) - A kompakt, offline vektoros térképek az egész világhoz elérhetőek - Az ország vagy régió térképei letölthetők közvetlenül az alkalmazásból - Számos rávetíthető térképréteg, mint GPX-ek, navigációs útvonalak, POI-k (érdekes helyek), kedvencek, szintvonalak, tömegközlekedési megállók, további térképek beállítható átlátszósággal - Címek és helyek offline kereshetősége - Offline útvonaltervezés rövidebb távolságokra (kísérleti) - Autós, kerékpáros és gyalogos módok: - opcionális automata nappali/éjszakai nézetváltással - opcionális sebességfüggő nagyítással - opcionális térképforgatással a mozgás vagy az iránytű alapján - opcionális sávasszisztens, sebességkorlátozás kijelzés, felvett és gépi hangutasítás Az OsmAnd ingyenes változatának korlátozásai: - Korlátozott számú vektoros térképletöltés - Offline Wikipédia cikkek nem elérhetőek Az OsmAnd folyamatosan fejlesztés alatt áll és a projektünk nagyban függ a pénzügyi támogatásoktól, amiből finanszírozhatók a fejlesztések és az új funkciók tesztelése. Kérlek, fontold meg az OsmAnd+ megvásárlását, vagy egy-egy funkció támogatását az osmand.net oldalon.</string>
     <string name="osmand_plus_long_description_1000_chars">" OsmAnd+ (OSM Automated Navigation Directions)Az OsmAnd+ egy nyílt forráskódú navigációs alkalmazás az OpenStreetMap (OSM) adatainak széleskörű használatával. Bármelyik térképadat (vektoros és raszteres térképek) tárolható a készülék memóriakártyáján offline használatra. Az OsmAnd továbbá lehetővé teszi az offline és online útvonaltervezést is, részletes hangutasításokkal.Az OsmAnd+ az alkalmazás fizetős változata, aminek megvásárlásával támogatod a projektet, az új funkciók fejlesztésének finanszírozását és megkapod a legújabb frissítéseket.Néhány fontosabb funkció: - Teljesen offline működés (a letöltött vektoros és raszteres térképek az eszközön tárolódnak) - A kompakt, offline vektoros térképek az egész világhoz elérhetőek - Az ország vagy régió térképei letölthetők közvetlenül az alkalmazásból - Offline Wikipédia szócikkek letöltése, ami hasznos segítség városnézéshez - Számos rávetíthető térképréteg, mint GPX-ek, navigációs útvonalak, POI-k (érdekes helyek), kedvencek, szintvonalak, tömegközlekedési megállók, további térképek beállítható átlátszósággal - Címek és helyek offline kereshetősége - Offline útvonaltervezés közepes távolságokra - Autós, kerékpáros és gyalogos módok: - opcionális automata nappali/éjszakai nézetváltással - opcionális sebességfüggő nagyítással - opcionális térképforgatással a mozgás vagy az iránytű alapján - opcionális sávasszisztens, sebességhatár kijelzés, felvett és gépi hangutasítás "</string>
     <string name="osmand_plus_short_description_80_chars">Globális mobil térkép és navigáció, offline és online OSM térképekkel</string>
     <string name="avoid_motorway">Autópályák elkerülése</string>
@@ -1006,7 +1006,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="audionotes_plugin_description">A hang- és videojegyzetek bővítmény biztosítja az utazás közbeni hang-, fénykép- és videojegyzetek készítésének lehetőségét a térkép képernyőn lévő gomb segítségével, vagy közvetlenül a térképen lévő bármely pozíció helyi menüjének használatával.</string>
     <string name="av_def_action_video">Videofelvétel</string>
     <string name="av_def_action_audio">Hangfelvétel</string>
-    <string name="av_video_format_descr">Videókimeneti formátum kiválasztása</string>
+    <string name="av_video_format_descr">Video kimeneti formátum kiválasztása.</string>
     <string name="av_video_format">Videó kimeneti formátuma</string>
     <string name="av_use_external_recorder_descr">Rendszerprogram használata videofelvételre.</string>
     <string name="av_use_external_recorder">Külső felvevő használata</string>
@@ -1018,7 +1018,7 @@ Proporcionális memória %4$s MB (Android korlát %5$s MB, Dalvik %6$s MB).</str
     <string name="osmand_srtm_long_description_1000_chars">Ez a bővítmény egy szintvonal fedvényt és egy domborzatárnyékolás réteget biztosít, amelyek az OsmAnd normál térképein jelennek meg. Ezt a funkcionalitást nagyon fogják értékelni a sportolók, túrázók, nyomvonalrögzítők és mindenki, akiket a táj domborzati szerkezete érdekel. 
 \n 
 \nA globális adatok (az északi 70° és déli 70° szélesség között) az SRTM (Shuttle Radar Topography Mission) és az ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer) mérésein alapulnak, amely a NASA Earsh Observing System zászlóshajójának, a Terra műholdnak a képalkotó berendezése. Az ASTER a NASA, a Japán Gazdasági, Kereskedelmi és Ipari Minisztérium (METI), valamint a Japán Űrügynökség (J-spacesystems) közös projektje.</string>
-    <string name="av_widget_action_descr">Vezérlőgomb alapértelmezett működési módjának kiválasztása</string>
+    <string name="av_widget_action_descr">Vezérlőgomb alapértelmezett működési módja.</string>
     <string name="av_widget_action">Alapértelmezett mód</string>
     <string name="recording_description">Felvétel %1$s %3$s %2$s</string>
     <string name="srtm_paid_version_msg">Kérlek fontold meg a Szintvonal bővítmény megvásárlását a Play Store-ban, ezzel támogatva a további fejlesztéseket.</string>
@@ -2060,7 +2060,7 @@ Hosszúság: %2$s</string>
     <string name="file_size_in_mb">%.1f MB</string>
     <string name="update_all">Összes frissítése (%1$s MB)</string>
     <string name="free_downloads_used">Elhasznált ingyenes letöltés</string>
-    <string name="free_downloads_used_description">Megjeleníti a használt ingyenes letöltéseket</string>
+    <string name="free_downloads_used_description">Megjeleníti az elhasznált ingyenes letöltéseket.</string>
     <string name="simulate_initial_startup_descr">Az első indítást jelző flag beállítása, a többi beállítás változatlan marad.</string>
     <string name="simulate_initial_startup">Alkalmazás első indításának szimulálása</string>
     <string name="share_geo">geo:</string>
@@ -2440,7 +2440,7 @@ Jelenleg csak {2} MB érhető el.</string>
     <string name="get_for">Beszerzés %1$s-ért</string>
     <string name="edit_filter">Kategóriák szerkesztése</string>
     <string name="subcategories">Alkategóriák</string>
-    <string name="selected_categories">Kijelölt kategóriák</string>
+    <string name="selected_categories">Kiválasztott kategóriák</string>
     <string name="create_custom_poi">Egyéni szűrő létrehozása</string>
     <string name="custom_search">Egyéni keresés</string>
     <string name="shared_string_filters">Szűrők</string>
@@ -2571,7 +2571,7 @@ Jelenleg csak {2} MB érhető el.</string>
     <string name="quick_action_bug_descr">Ez az üzenet automatikusan bekerül a megjegyzés mezőbe.</string>
     <string name="quick_action_bug_message">Üzenet</string>
     <string name="quick_action_category_descr">Válaszd ki, melyik kategóriába kerüljön a kedvenc hely.</string>
-    <string name="quick_action_gpx_category_descr">Opcionális kategória kiválasztása</string>
+    <string name="quick_action_gpx_category_descr">Opcionális kategória kiválasztása.</string>
     <string name="quick_action_poi_list">POI lista</string>
     <string name="quick_action_sh_poi_descr">Hozzáadhatsz egy, vagy több, a térképen megjelenítendő POI kategóriát.</string>
     <string name="quick_action_map_style_action">Térképstílus hozzáadása</string>
@@ -2638,7 +2638,7 @@ Kérlek adj meg egy teljes kódot</string>
 \n 
 \n • Magassági adatok használata kerékpáros tervezésnél 
 \n 
-\n • Sok egyéb apró fejlesztés és hibajavítás</string>
+\n • Sok egyéb apró fejlesztés és hibajavítás…</string>
 	<string name="auto_split_recording_title">Felvételek auto-vágása szünet után</string>
 	<string name="auto_split_recording_descr">Új szakasz készítése 6 perc szünet után, új nyomvonal 2 óra szünet után, és új fájl hosszabb szünet után, vagy dátum változásakor.</string>
     <string name="max_speed">Max sebesség</string>
@@ -2731,7 +2731,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="animate_my_location_desc">Helyzetem animálásának engedélyezése navigáció közben.</string>
     <string name="shared_string_overview">Áttekintés</string>
     <string name="route_is_too_long_v2">Ennek az útnak a kiszámítása túl hosszú ideig tarthat. Ha 10 percen belül nem kap eredményt, kérjük, adjon hozzá köztes célpontokat.</string>
-    <string name="osmand_extended_description_part1">" OsmAnd (OSM Automated Navigation Directions) egy térkép- és navigációs alkalmazás, amellyel hozzáférhet az ingyenes, globális és kiváló minőségű OpenStreetMap (OSM) adataihoz. Élvezze a hangalapú és vizuális navigációs szolgáltatást, tekintsen meg érdekes pontokat (POI-kat), hozzon létre és kezeljen GPX-útvonalakat szintvonalak és magasságinformációk használatával (egy plugin segítségével), válasszon az autós, kerékpáros és gyalogos üzemmód közül és használjon ki számos egyéb lehetőséget. "</string>
+    <string name="osmand_extended_description_part1">OsmAnd (OSM Automated Navigation Directions) egy térkép- és navigációs alkalmazás, amellyel hozzáférhet az ingyenes, globális és kiváló minőségű OpenStreetMap (OSM) adataihoz. Élvezze a hangalapú és vizuális navigációs szolgáltatást, tekintsen meg érdekes pontokat (POI-kat), hozzon létre és kezeljen GPX-útvonalakat szintvonalak és magasságinformációk használatával (egy plugin segítségével), válasszon az autós, kerékpáros és gyalogos üzemmód közül és használjon ki számos egyéb lehetőséget.</string>
     <string name="save_poi_too_many_uppercase">A név túl sok nagybetűt tartalmaz. Folytatja?</string>
     <string name="private_access_routing_req">A célpont korlátozott hozzáférésű területen található. Engedélyezed a magánutak használatát ennél az útvonaltervnél?</string>
     <string name="restart_search">Keresés újraindítása</string>
@@ -2746,7 +2746,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="mapillary_widget_descr">Segítségével gyorsan hozzájárulhatsz a Mapillaryhez.</string>
     <string name="mapillary_descr">Online utcaszintű fotók mindenkinek. Fedezz fel helyeket, vegyél benne részt, fotózd le a világot.</string>
     <string name="plugin_mapillary_descr">Utcaszintű fotók mindenkinek. Fedezz fel helyeket, vegyél benne részt, fotózd le a világot.</string>
-    <string name="osmand_extended_description_part4">" Az OsmAnd sítérkép bővítménye lehetővé teszi a sípályák megjelenítését nehézség szerint, valamint további információkat, mint például a a felvonók helyét, és más berendezéseket. "</string>
+    <string name="osmand_extended_description_part4">Az OsmAnd sítérkép bővítménye lehetővé teszi a sípályák megjelenítését nehézség szerint, valamint további információkat, mint például a felvonók helyét, és más berendezéseket.</string>
     <string name="online_photos">Online fényképek</string>
     <string name="improve_coverage_mapillary">Fényképes lefedettség javítása a Mapillaryvel</string>
     <string name="improve_coverage_install_mapillary_desc">Készíthet saját fényképet vagy fényképsorozatot, és hozzáadhatja ehhez a térképhelyhez. 
@@ -2755,7 +2755,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="shared_string_install">Telepítés</string>
     <string name="open_mapillary">Mapillary megnyitása</string>
     <string name="mapillary_image">Mapillary-kép</string>
-    <string name="osmand_plus_extended_description_part8">" Hozzávetőleges lefedettség és térképminőség:  • Nyugat-Európa: ****  • Kelet-Európa: ***  • Oroszország: ***  • Észak-Amerika: ***  • Dél-Amerika: **  • Ázsia: **  • Japán és Korea: ***  • Közel-Kelet: **  • Afrika: **  • Antarktisz: *  A világ legtöbb országa letölthető. Afganisztántól Zimbabwéig, Ausztráliától az Egyesült Államokig. Magyarország, Szlovákia, Románia, Ausztria, Németország, Olaszország… "</string>
+    <string name="osmand_plus_extended_description_part8">"Hozzávetőleges lefedettség és térképminőség:  • Nyugat-Európa: ****  • Kelet-Európa: ***  • Oroszország: ***  • Észak-Amerika: ***  • Dél-Amerika: **  • Ázsia: **  • Japán és Korea: ***  • Közel-Kelet: **  • Afrika: **  • Antarktisz: *  A világ legtöbb országa letölthető. Afganisztántól Zimbabwéig, Ausztráliától az Egyesült Államokig. Magyarország, Szlovákia, Románia, Ausztria, Németország, Olaszország…"</string>
     <string name="distance_moving">Korrigált távolság</string>
     <string name="shared_string_permissions">Engedélyek</string>
     <string name="import_gpx_failed_descr">Az OsmAnd nem tudja importálni a fájlt. Ellenőrizze, hogy az OsmAndnak van-e engedélye fájlt olvasni erről a helyről.</string>
@@ -2767,7 +2767,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="mapillary_menu_title_tile_cache">Csempegyorsítótár</string>
     <string name="wrong_user_name">Hibás felhasználónév!</string>
     <string name="shared_string_to">Ide:</string>
-    <string name="mapillary_menu_date_from">Innen:</string>
+    <string name="mapillary_menu_date_from">Ettől:</string>
     <string name="mapillary_menu_descr_dates">Csak az ekkor hozzáadott képek megtekintése:</string>
     <string name="mapillary_menu_title_dates">Dátum</string>
     <string name="mapillary_menu_edit_text_hint">Felhasználónév megadása</string>
@@ -2858,7 +2858,7 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="osn_modify_dialog_error">Kivétel történt: a megjegyzés nem módosult</string>
     <string name="osn_modify_dialog_title">Megjegyzés módosítása</string>
     <string name="context_menu_item_modify_note">OSM-megjegyzés módosítása</string>
-    <string name="make_round_trip_descr">Kiindulási pont másolatának hozzáadása célpontként</string>
+    <string name="make_round_trip_descr">Kiindulási pont másolatának hozzáadása célpontként.</string>
     <string name="make_round_trip">Körút készítése</string>
     <string name="shared_string_navigate">Navigáció</string>
     <string name="show_map">Térkép megjelenítése</string>
@@ -2962,6 +2962,24 @@ Kérlek adj meg egy teljes kódot</string>
     <string name="context_menu_read_full_article">Olvasd el a tejes cikket</string>
     <string name="context_menu_read_article">Cikk elolvasása</string>
     <string name="context_menu_points_of_group">A csoport összes pontja</string>
-    <string name="opened_from">Nyitott ekkor:</string>
-    <string name="opened_till">Nyitva eddig:</string>
-    </resources>
+    <string name="open_from">Nyitott ekkor:</string>
+    <string name="open_till">Nyitva eddig:</string>
+    <string name="will_close_at">Ekkor fog bezárni:</string>
+    <string name="will_open_at">Ekkor fog kinyitni:</string>
+    <string name="will_open_on">Ekkor fog kinyitni:</string>
+    <string name="additional_actions">További műveletek</string>
+    <string name="av_locations_selected_desc">"GPX fájl a kiválasztott pont  koordinátáival és adataival."</string>
+    <string name="av_locations_all_desc">"GPX fájl az összes jegyzet  koordinátáival és adataival."</string>
+    <string name="release_3_0">• A stoptáblák felismerése már figyelembe veszi a vezetési irányt
+\n
+\n • Új GPX nyomvonal feldolgozási algoritmus, ami valósabb szintemelkedés/szintvesztés adatokat számol
+\n
+\n • Terep (emelkedőket) figyelembe vevő gyaloglási idő számítás (Naismith-szabály)
+\n
+\n</string>
+    <string name="modify_the_search_query">Keresési kifejezés módosítása.</string>
+    <string name="shared_string_actions">Műveletek</string>
+    <string name="shared_string_marker">Jelölő</string>
+    <string name="osm_recipients_label">OSM címzettek</string>
+    <string name="total_donations">Összes adomány</string>
+</resources>
diff --git a/OsmAnd/res/values-hy/strings.xml b/OsmAnd/res/values-hy/strings.xml
index 89a163e0b7..52dc23e6b2 100644
--- a/OsmAnd/res/values-hy/strings.xml
+++ b/OsmAnd/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <string name="download_hillshade_maps">Տարածքի մգեցված ռելիեֆով քարտեզներ</string>
+    <string name="download_hillshade_maps">Տարածքի մգեցված ռելիեֆով քարտեզներ (Hillshades)</string>
     
     <string name="local_indexes_cat_av">Ձայնա/Տեսանյութեր</string>
     <string name="clear_dest_confirm">Վստահ ե՞ք, որ ցանկանում եք ջնջել ձեր նպատակակետը(և միջանկյալ նպատակակետը)?</string>
@@ -145,7 +145,7 @@
 	<string name="routing_attr_avoid_motorway_description">Խուսափել ավտոճանապարհները։</string>
 	<string name="routing_attr_weight_name">Առավելագույն քաշը</string>
 	<string name="routing_attr_weight_description">Նշել մեքենայի քաշը երթուղին հաշվառկելու համար։</string>
-    <string name="osmand_distance_planning_plugin_description">Ստեղծել ուղիներ (կամ օգտագործել/փոփոխել առկա GPX ֆայլերը) կետեռի միջև հեռավորության չափման համար։ Պահպանել որպես GPX, որը կարող է օգտագործվել GPX ուղիների պլանավորման համար։</string>
+    <string name="osmand_distance_planning_plugin_description">Այս plugin-նը ապահովում է քարտեզի էկրանի վրա վիջեթ, որը հնարավորություն է տալիս ստեղծել ուղիներ, քարտեզի վրա կտտացնելով, նաև օգտագործել կամ փոփոխել առկա GPX ֆայլերը, ուղեւորություն պլանավորել և չափել կետերի միջև հեռավորությունը։</string>
     <string name="shared_string_no">Ոչ</string>
 	<string name="shared_string_yes">Այո</string>
 	<string name="osn_modify_dialog_error">Բացառություն է տեղի ունեցել՝ նշումը չի փոփոխվել</string>
@@ -172,8 +172,8 @@
     <string name="marker_save_as_track_descr">Արտահանեք ձեր մարկերները այն ֆայլի մեջ, որը կարող եք նշել այստեղ:</string>
     <string name="marker_save_as_track">Պահպանել որպես հետեւել</string>
     <string name="move_to_history">Տեղափոխեք պատմություն</string>
-    <string name="group_will_be_removed_after_restart">Վերագործարկվելուց հետո խումբը կհեռացվի</string>
-    <string name="show_guide_line">Ցույց տալ ուղեցույցի գիծը</string>
+    <string name="group_will_be_removed_after_restart">Հերթական ծրագրի վերագործարկվելուց հետո խումբը կհեռացվի։</string>
+    <string name="show_guide_line">Ցույց տալ ուղեցույցներ</string>
     <string name="show_arrows_on_the_map">Ցույց տալ սլաքները քարտեզի վրա</string>
     <string name="show_passed">Ցույց տալ անցած</string>
     <string name="hide_passed">Թաքցնել անցած</string>
@@ -284,7 +284,7 @@
     <string name="change_color">Փոխել գույնը</string>
     <string name="edit_name">Խմբագրել անունը</string>
     <string name="animate_my_location">Անիմացնել իմ դիրքը</string>
-    <string name="shared_string_overview">Ակնարկ</string>
+    <string name="shared_string_overview">Համատեսք</string>
     <string name="select_street">Ընտրեք փողոցը</string>
     <string name="shared_string_in_name">%1$s</string>
     <string name="type_address">Մուտքագրեք հասցեն</string>
@@ -431,7 +431,7 @@
     <string name="animate_my_location_desc">"Միացնել  Իմ Դիրքի անիմացումը քարտեզի համայնապատկերում նավիգացիայի ժամանակ։"</string>
     <string name="index_item_depth_points_southern_hemisphere">Ծովային խորության կետերը հարավային կիսագնդում</string>
     <string name="index_item_depth_points_northern_hemisphere">Ծովային խորության կետերը հյուսիսային կիսագնդում</string>
-    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd հավաքում է միայն այն տեղեկատվությունները, որոնք վերաբերվում են հավելվածին օգտագործման։ Ձեր դիրքը երբեք չի ուղարկվի, ոչ էլ այն, ինչ դուք մուտք եք գործել հավեվածում կամ ձեր դիտած, որոնման և ներբեռնելու տարածքների մանրամասները:</string>
+    <string name="do_not_send_anonymous_app_usage_desc">OsmAnd հավաքում է միայն այն տեղեկատվությունները, որոնք վերաբերվում են հավելվածին օգտագործման։ Ձեր գտնվելու վայրը երբեք չի ուղարկվի, ոչ էլ այն, ինչ դուք մուտք եք գործել հավեվածում կամ ձեր դիտած, որոնման և ներբեռնելու տարածքների մանրամասները:</string>
     <string name="do_not_show_startup_messages_desc">Չցուցադրել հավելվածի զեղչերի և տեղական միջոցառման հատուկ հաղորդագրությունները։</string>
     <string name="auto_split_recording_descr">Սկսել նոր սեգմենտ 6 րոպեանոց ընդմիջումից հետո, նոր տրեկ 2 ժամանոց ընդմիջումից հետո կամ նոր ֆայլ երկարատև ընդմիջումից հետո (եթե ամսաթիվը փոխվել է):</string>
     <string name="rendering_attr_contourColorScheme_description">Եզրագծերի գունային սխեման</string>
@@ -684,10 +684,10 @@
 \n• Այլ բարելավումներ և սխալներ ուղղում
 \n
 \n</string>
-    <string name="release_2_8">• Լիովին վերամշակված քարտեզի մարկերներ, ուղեցույցների գծերը և երթուղիների պլանավորումը
-\n
-\n• Հեռավորության չափման գործիք, որը փոխկապակցված է ճանապարհին և կետերին պահպանում որպես ուղու
-\n
+    <string name="release_2_8">\\022 Լիովին վերամշակված քարտեզի մարկերներ, ուղեցույցների գծերը և երթուղիների պլանավորումը 
+\n 
+\n• Հեռավորության չափման գործիք, որը փոխկապակցված է ճանապարհին և կետերին պահպանում որպես ուղու 
+\n 
 \n• OsmAnd Live: սխալների ուղղում, յուրաքանչյուր 30 րոպեում սերվերի վրա տվյալների թարմացում, թարմացումները հաշվի են առնվում նավիգացիայում
 \n
 \n</string>
@@ -1128,7 +1128,7 @@
     <string name="rendering_attr_tramTrainRoutes_name">Տրամվայների և գնացքների երթուղիները</string>
     <string name="rendering_attr_subwayMode_name">Մետրոի երթուղիները</string>
     <string name="lock_screen_request_explanation">%1$s պետք է այդ թույլտվությունը էկրանը անջատելու համար էներգիա խնայելու համար:</string>
-    <string name="wake_on_voice">Ինքնաբերաբար միացնել էկրանը մինչև շրջադարձ</string>
+    <string name="wake_on_voice">Ինքնաբերաբար միացնել էկրանը շրջադարձից առաջ</string>
     <string name="wake_on_voice_descr">Միացնել սարքի էկրանը(եթե անջատված է), երբ մոտենում եք շրջադարձին։</string>
     <string name="impassable_road">Խուսափել ճանապարհներից…</string>
     <string name="rendering_attr_trainLightrailRoutes_name">Գնացքների երթուղիները</string>
@@ -1246,7 +1246,7 @@
     <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_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>
@@ -1266,7 +1266,7 @@
     <string name="show_zoom_buttons_navigation">Ցույց տալ խոշորացման կոճակները</string>
     <string name="save_as_favorites_points">Պահպանել որպես «Սիրված» խումբ</string>
     <string name="select_destination_and_intermediate_points">Ընտրեք նպատակակետերը</string>
-    <string name="layer_amenity_label">Կետերի պիտակներ</string>
+    <string name="layer_amenity_label">"POI  կետերի պիտակները"</string>
     <string name="loading_smth">Բեռնում %1$s…</string>
     <string name="map_widget_plain_time">Ընթացիկ ժամը</string>
     <string name="gpx_wpt">Կետ</string>
@@ -1661,7 +1661,7 @@
     <string name="day_night_info">Արևածագ/մայրամուտ</string>
     <string name="map_widget_renderer">Քարտեզի ոճը</string>
     <string name="layer_map_appearance">Կարգավորել էկրանը</string>
-    <string name="show_lanes">Ցույց տար երթևեկության շերտերը</string>
+    <string name="show_lanes">Ցույց տար երթևեկության գոտիները</string>
     <string name="avoid_unpaved">Խուսափել չմշակված ճանապարհներից</string>
     <string name="avoid_ferries">Խուսափել լաստանավերից</string>
     <string name="avoid_in_routing_title">Երթուղին կառուցման ժամանակ խուսափել…</string>
@@ -1795,7 +1795,7 @@
     <string name="accessibility_mode">Հատուկ հնարավորությունների ռեժիմ</string>
     <string name="accessibility_mode_descr">Միացնում է հատուկ հնարավորություններ։</string>
     <string name="accessibility_default">Օգտագործել համակարգի պարամետրերը</string>
-    <string name="backToMenu">Վերադառնալ «Մենյուին»</string>
+    <string name="backToMenu">Վերադառնալ Մենյուին</string>
     <string name="zoomOut">Մանրացնել</string>
     <string name="zoomIn">Խոշորացնել. մոտեցնել</string>
     <string name="zoomIs">Մասշտաբը</string>
@@ -2597,7 +2597,7 @@
     <string name="retry">Կրկնել</string>
     <string name="track_waypoints">Տրեկի (track) կետերը</string>
     <string name="add_group">Ավելացնել խումբ</string>
-    <string name="add_group_descr">Դուք կարող եք ավելացնել «Սիրված» խումբ կամ տրեկի կետեր:</string>
+    <string name="add_group_descr">Դուք կարող եք ներմուծել խումբ «Սիրված»-ներից կամ տրեկի կետերից:</string>
     <string name="empty_state_markers_groups">Ներմուծել խմբերը</string>
     <string name="empty_state_markers_groups_desc">Դուք կարող եք ներմուծել «Սիրված» խմբեր կամ տրեկի կետերը որպես մարկերներ:</string>
     <string name="shared_string_two">Երկու</string>
@@ -2618,13 +2618,13 @@
     <string name="add_segment_to_the_track">Ավելացնել սեգմենտը GPX-ին</string>
 <string name="shared_string_more_without_dots">Ավելին</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="favourites_group">«Սիրված»-ի խումբը</string>
-    <string name="empty_state_markers_active">Մարկերները քարտեզի վրա է!</string>
-    <string name="empty_state_markers_active_desc">Կետերի նշում քարտեզի վրա սխմելով էկրանին։</string>
+    <string name="add_track_to_markers_descr">"Ընտրեք տրեկը ճանապարհային կետերը ավելացնելու մարկերներին։ (Ցուցադրված միայն  այն տրեկների որոնք ունեն ճանապարհային կետեր։)"</string>
+    <string name="add_favourites_group_to_markers_descr">Ընտրեք «Սիրված» խումբը, որը ցանկանում եք ավելացնել մարկերներին։</string>
+    <string name="favourites_group">«Սիրված»-ի կատեգորիան</string>
+    <string name="empty_state_markers_active">Ստեղծեք քարտեզի մարկերներ!</string>
+    <string name="empty_state_markers_active_desc">Սեղմեք ցանկալի վայրում, ապա մարկերի վրա:</string>
     <string name="empty_state_markers_history_desc">Այս էկրանին կհայտնվեն մարկերներ, որոնք նշված են ինչպես անցած։</string>
-    <string name="digits_quantity">Թվերի քանակը</string>
+    <string name="digits_quantity">Տասներորդ թվերի թվաքանակը</string>
     <string name="show_number_pad">Ցուցադրել թվային վահանակը</string>
     <string name="coordinate_input_accuracy">%1$d թվեր</string>
     <string name="mark_passed">Նշել անցած</string>
@@ -2633,4 +2633,86 @@
     <string name="shared_string_deleted">Ջնջված է</string>
     <string name="shared_string_edited">Խմբագրվեց</string>
     <string name="shared_string_added">Ավելացված է</string>
-    </resources>
+    <string name="what_is_here">Ինչ է այստեղ`</string>
+    <string name="parked_at">կայանված է</string>
+    <string name="pick_up_till">Վերցնել մինչև</string>
+    <string name="without_time_limit">Առանց ժամանակի սահմանափակում</string>
+    <string name="context_menu_read_full_article">Կարդալ ամբողջ հոդվածը</string>
+    <string name="context_menu_read_article">Կարդալ հոդվածը</string>
+    <string name="context_menu_points_of_group">Խմբի բոլոր կետերը</string>
+    <string name="open_from">Բացվում է</string>
+    <string name="open_till">Բաց Է մինև</string>
+    <string name="will_close_at">Կփակվի</string>
+    <string name="will_open_at">Կբացվի</string>
+    <string name="will_open_on">Բացվելու է</string>
+    <string name="additional_actions">Լրացուցիչ գործողություններ</string>
+    <string name="av_locations_selected_desc">GPX ֆայլը կոորդինատներով և ընտրված գրառումների տվյալներով:</string>
+    <string name="av_locations_all_desc">GPX ֆայլը կոորդինատներով և բոլոր նշումների տվյալները։</string>
+    <string name="release_3_0">"• Հիմա դադարեցման լապտերի հայտնաբերումը հաշվի է առնում ճամփորդության ուղղությունը
+\n
+\n• Նոր ալգորիթմ, որը տրամադրում է վերելքի/վայրեջքի  իրական արժեքները  GPX տրեկների համար
+\n
+\n• Քայլելու ժամանակը կախված տեղանքից (վերելքից) (ըստ Նեյսմիտի կանոնին)
+\n
+\n"</string>
+    <string name="modify_the_search_query">Փոխել որոնման հարցումը:</string>
+    <string name="shared_string_actions">Գործողություններ</string>
+    <string name="shared_string_marker">Մարկեր</string>
+    <string name="marker_activated">Մարկեր %s ակտիվացված է:</string>
+    <string name="one_tap_active_descr">"Քարտեզի վրա  մարկերի նշումը, տեղափոխելու է այն առաջին տեղը ակտիվ մարկերների ցուցակում,       
+\nառանց  կոնտեքստային մենյուն բացելու։"</string>
+    <string name="one_tap_active">Մեկ սեղմումով ակտիվացում</string>
+    <string name="empty_state_av_notes">Նշումներ կատարեք:</string>
+    <string name="empty_state_av_notes_desc">Տեղադրեք աուդիո, վիդեո կամ ֆոտո գրառումներ քարտեզի ցանկացած կետի վրա, օգտագործելով վիջեթ կամ համատեքստային մենյու:</string>
+    <string name="notes_by_date">Նշումներ ըստ ամսաթվի</string>
+    <string name="by_date">Ըստ ամսաթվի</string>
+    <string name="by_type">Ըստ տեսակի</string>
+    <string name="looking_for_tracks_with_waypoints">Տրեկների որոնում ճանապարհային կետեր հետ</string>
+    <string name="empty_state_markers_history">\@string/shared_string_history (պատմությունը)</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="coordinate_input_accuracy_description">Ավտոմատ առաջընթաց հաջորդ դաշտ տասնորդական կետից հետո մուտքագրելուց %1$d թվեր:</string>
+    <string name="tap_on_map_to_hide_interface_descr">Սեղմելով քարտեզի վրա փոխարինում են հսկողության կոճակները եւ վիջեթները:</string>
+    <string name="tap_on_map_to_hide_interface">Ամբողջ էկրանով ռեժիմ</string>
+    <string name="osm_recipient_stat">"Խմբագրումները կազմում են %1$s, գումարը  %2$s mBTC"</string>
+    <string name="release_2_2">"\\ 022 Քարտեզի և այլ էկրանների վրա տեղադրելու համար նոր համատեքստի զգայուն գրաֆիկական ինտերֆեյս
+\n
+\n• Այժմ քարտեզի էկրանը միանվում է ուղղակիորեն, եթե դուք չեք ընտրում «Ցուցադրել վահանակը, երբ ծրագիրը մեկնարկեց»
+\n
+\n• Կառավարման վահանակում ընտրվում է քարտերի տեսակն ու տեսակը ցուցադրելու համար
+\n
+\n• Անջատեք վահանակը եթե Ձեզ դուր է գալիս մենյուից  հիմնական ծրագրերի կառավարումը
+\n
+\n• Քարտեզները ներբեռնելու համար տարածաշրջանները կարող են ուղղակիորեն ընտրվել համաշխարհային քարտեզի վրա `փնտրելով 
+\n
+\n• POI որոնումը այժմ աջակցում է ավելի կոնկրետ հարցումներ
+\n
+\n• Բարելավված POI և OSM խմբագրման գործառույթ
+\n
+\n• Քարտեզի տվյալների ներբեռնումը
+\n
+\n․․և այլ…"</string>
+    <string name="plugin_ski_descr">"OsmAnd-ի այս հավելվածը  տրքմքդրում է մանրամասները գլոբալ ցածր լեռնադահուկային լանջերի, խաչաձեւ լեռնադահուկային լեռնանցքի, ալպիական լեռնադահուկային երթուղիների, ճոպանուղիների և լեռնադահուկային վերելակների մանրամասների մասին:
+\n
+\nԱյս տեսակը ակտիվացնելու դեպքում, քարտեզի ոճը փոխվում է «Ձմեռային եւ լեռնադահուկային սպորտին», ցույց տալով լանդշաֆտի բոլոր մանրամասները `ձմռանը նայելու ձևով: Այս (ձմեռային) տեսքը կարող է չեղյալ համարվել ,  այստեղ կրկին անջատելով այն, կամ եթե փոխեք «Քարտի ոճը» ցանկալի տեսք, «Քարտեզների կարգավորումը» ցանկում:"</string>
+    <string name="tiles_to_download_estimated_size">Մասշտաբով {0} ներբեռնել {1} սալիկներ ({2} ՄԲ)</string>
+    <string name="use_high_res_maps_descr">"Չձգել  պատկերացանցային(ռաստրային) քարտեզները բարձրորակ էկրանների վրա:"</string>
+    <string name="route_tu">Կատարեք շրջադարձ(U-turn) և շարժվեք</string>
+    <string name="map_orientation_default">Ըստ սարքի</string>
+    <string name="map_orientation_portrait">Դիմանկարի ձև (Portrait)</string>
+    <string name="map_orientation_landscape">Լանդշաֆտ (Landscape)</string>
+    <string name="map_screen_orientation">Էկրանի կողմնորոշումը (Screen orientation)</string>
+    <string name="map_screen_orientation_descr">Ընտրեք էկրանի կողմնորոշումը (Portrait, landscape, or device):</string>
+    <string name="update_poi_error_loading">Խնդիր առաջացավ սերվերից տվյալների ներբեռման ժամանակ</string>
+    <string name="max_level_download_tile_descr">Նշեք առավելագույն մաշտաբը առցանց քարտեզի սալիկները ներբեռնելու համար:</string>
+    <string name="map_tile_source">Սալիկային(ռաստրային) քարտեզների աղբյուրը</string>
+    <string name="navigation_item_description">Կարգավորում(Setup) նավարկության:</string>
+    <string name="map_viewing_item">Քարտեզի դիտում</string>
+    <string name="search_on_the_map_item">Քարտեզի որոնում</string>
+    <string name="quick_favorites_name_preset">Նախադրվածի(preset) անունը</string>
+    <string name="add_route_points">Ավելացնել կետեր երթուղուն</string>
+    <string name="osm_recipients_label">OSM ստացողներ</string>
+    <string name="total_donations">Ընդհանուր նվիրատվությունները</string>
+</resources>
diff --git a/OsmAnd/res/values-is/phrases.xml b/OsmAnd/res/values-is/phrases.xml
index a1745ed276..4fb1e625eb 100644
--- a/OsmAnd/res/values-is/phrases.xml
+++ b/OsmAnd/res/values-is/phrases.xml
@@ -602,8 +602,8 @@
 	<string name="poi_wood">Skógur</string>
 	<string name="poi_strait">Sund</string>
 	<string name="poi_anchorage">Akkerisfestar</string>
-	<string name="poi_anchor_berth">Viðlegufæri</string>
-	<string name="poi_berth">Ból</string>
+	<string name="poi_anchor_berth">Akkerislægi</string>
+	<string name="poi_berth">Skipalægi</string>
 	<string name="poi_buoy_isolated_danger">Bauja, einangruð hætta</string>
 	<string name="poi_dry_dock">Þurrkví</string>
 	<string name="poi_floating_dock">Flotkví</string>
@@ -1353,11 +1353,11 @@
 	<string name="poi_impromptu_no">Án pöntunar: nei</string>
 	<string name="poi_sanitary_dump_station_yes">Stöð fyrir hreinlætisúrgang: já</string>
 	<string name="poi_sanitary_dump_station_no">Stöð fyrir hreinlætisúrgang: nei</string>
-	<string name="poi_power_supply_no">Rafmagnsinnstungur: nei</string>
-	<string name="poi_power_supply_cee_17_blue">Rafmagnsinnstungur: CEE 17 blátt</string>
-	<string name="poi_power_supply_cee_7_4">Rafmagnsinnstungur: CEE 7/4</string>
-	<string name="poi_power_supply_cee_7_5">Rafmagnsinnstungur: CEE 7/5</string>
-	<string name="poi_power_supply_nema_5_15">Rafmagnsinnstungur: NEMA 5-15</string>
+	<string name="poi_power_supply_no">Aflgjafi: nei</string>
+	<string name="poi_power_supply_cee_17_blue">Aflgjafi (innstunga): CEE 17 blátt</string>
+	<string name="poi_power_supply_cee_7_4">Aflgjafi (innstunga): CEE 7/4</string>
+	<string name="poi_power_supply_cee_7_5">Aflgjafi (innstunga): CEE 7/5</string>
+	<string name="poi_power_supply_nema_5_15">Aflgjafi (innstunga): NEMA 5-15</string>
 
 	<string name="poi_capacity_tents">Hámarksfjöldi tjalda</string>
 	<string name="poi_capacity_caravans">Hámarksfjöldi hjólhýsa</string>
@@ -1782,7 +1782,7 @@
 	<string name="poi_diet">Mataræði</string>
 	<string name="poi_health_specialty">Heilsutengt sérsvið</string>
 	<string name="poi_massage_type">Tegund af nuddi</string>
-	<string name="poi_power_supply">Rafmagnsinnstungur</string>
+	<string name="poi_power_supply">Aflgjafi</string>
 	<string name="poi_medical_system">Lækningasvið</string>
 	<string name="poi_home_visit">Heimsóknir</string>
 	<string name="poi_free_flying_characteristic">Eiginleikar</string>
@@ -2918,4 +2918,274 @@
 	<string name="poi_water_purification_reverse_osmosis">Öfug osmósa</string>
 	<string name="poi_water_place_access_community">Samfélag</string>
 	<string name="poi_water_place_access_family">Fjölskylda</string>
+	<string name="poi_water_place_access">Aðgangur að vatni</string>
+
+<string name="poi_car_sharing">Deiling bíla</string>
+	<string name="poi_boat_sharing">Deiling báta</string>
+	<string name="poi_payment_terminal">Greiðslukassi</string>
+	<string name="poi_money_lender">Peningaútlán</string>
+	<string name="poi_lock_basin">Lokukví skipastiga</string>
+	<string name="poi_seamark_clearance_height">Nothæf hæð</string>
+	<string name="poi_seamark_clearance_height_closed">Nothæf hæð (lokað)</string>
+	<string name="poi_seamark_clearance_height_open">Nothæf hæð (opið)</string>
+	<string name="poi_seamark_clearance_width">Nothæf breidd</string>
+
+	<string name="poi_military_bunker">Hernaðarsprengjubyrgi</string>
+	<string name="poi_military_range">Hersvæði</string>
+	<string name="poi_military_office">Hermálaskrifstofa</string>
+	<string name="poi_icn_ref">Hnútur í alþjóðlegu hjólaleiðaneti</string>
+	<string name="poi_ncn_ref">Hnútur í landsbundnu hjólaleiðaneti</string>
+	<string name="poi_rcn_ref">Hnútur í svæðisbundnu hjólaleiðaneti</string>
+	<string name="poi_lcn_ref">Hnútur í svtaðbundnu hjólaleiðaneti</string>
+	<string name="poi_iwn_ref">Hnútur í alþjóðlegu gönguleiðaneti</string>
+	<string name="poi_nwn_ref">Hnútur í landsbundnu gönguleiðaneti</string>
+	<string name="poi_rwn_ref">Hnútur í svæðisbundnu gönguleiðaneti</string>
+	<string name="poi_lwn_ref">Hnútur í staðbundnu gönguleiðaneti</string>
+
+	<string name="poi_route_hiking_iwn_poi">Alþjóðleg gönguleið</string>
+	<string name="poi_route_hiking_nwn_poi">Gönguleið á landsvísu</string>
+	<string name="poi_route_hiking_rwn_poi">Svæðisbundin gönguleið</string>
+	<string name="poi_route_hiking_lwn_poi">Staðbundin gönguleið</string>
+	<string name="poi_route_hiking_ref_poi">Tilvísun gönguleiðar</string>
+
+	<string name="poi_aerialway_summer_access_entry">Aðgangur að sumarlagi: einungis inngangur</string>
+	<string name="poi_aerialway_summer_access_exit">Aðgangur að sumarlagi: einungis útgangur</string>
+	<string name="poi_aerialway_summer_access_both">Aðgangur að sumarlagi: út- og inngangur</string>
+
+	<string name="poi_love_hotel">Elskendahótel</string>
+
+	<string name="poi_payment_pikepass_designated">PIKEPASS (uppgefið)</string>
+	<string name="poi_payment_routex_yes">Routex</string>
+	<string name="poi_payment_routex_no">Ekki tekið við Routex eldsneytiskortum</string>
+	<string name="poi_payment_bancomat_yes">Bancomat</string>
+	<string name="poi_payment_bancomat_no">Ekki tekið við Bancomat</string>
+	<string name="poi_payment_icsf_yes">IC Stored Fare</string>
+	<string name="poi_payment_icsf_no">Ekki tekið við IC Stored Fare kortum</string>
+	<string name="poi_payment_prepaid_ticket_yes">Fyrirframgreiddir miðar</string>
+	<string name="poi_payment_jcb_yes">JCB</string>
+	<string name="poi_payment_jcb_no">Ekki tekið við JCB-kortum</string>
+	<string name="poi_payment_laser_yes">Laser</string>
+	<string name="poi_payment_laser_no">Ekki tekið við Laser-kortum</string>
+	<string name="poi_payment_ep_quick_yes">Quick</string>
+	<string name="poi_payment_ep_quick_no">Ekki tekið við Quick-kortum</string>
+	<string name="poi_payment_eurowag_yes">Eurowag</string>
+	<string name="poi_payment_eurowag_no">Ekki tekið við Eurowag-kortum</string>
+	<string name="poi_payment_e_zpass_yes">E‑ZPass</string>
+	<string name="poi_payment_e_zpass_no">Ekki tekið við E‑ZPass</string>
+	<string name="poi_payment_euroshell_yes">Euroshell</string>
+	<string name="poi_payment_euroshell_no">Ekki tekið við Euroshell eldsneytiskortum</string>
+	<string name="poi_payment_kitcard_yes">KITCard</string>
+	<string name="poi_payment_kitcard_no">Ekki tekið við KITCard</string>
+	<string name="poi_payment_westfalen_card_yes">Westfalen</string>
+	<string name="poi_payment_westfalen_card_no">Ekki tekið við Westfalen-kortum</string>
+	<string name="poi_payment_v_pay_yes">V PAY</string>
+	<string name="poi_payment_v_pay_no">Ekki tekið við V-PAY kortum</string>
+	<string name="poi_payment_dogecoin_yes">Dogecoin</string>
+	<string name="poi_payment_dogecoin_no">Ekki tekið við Dogecoin</string>
+	<string name="poi_payment_cibus_yes">Cibus</string>
+	<string name="poi_payment_cibus_no">Ekki tekið við Cibus-kortum</string>
+	<string name="poi_payment_ep_cash_yes">Reiðufjárkort (Geldkarte)</string>
+	<string name="poi_payment_ep_cash_no">Ekki tekið við reiðufjárkortum (Geldkarte)</string>
+	<string name="poi_payment_ep_proton_yes">Proton</string>
+	<string name="poi_payment_ep_proton_no">Ekki tekið við Proton-kortum</string>
+	<string name="poi_payment_ep_avant_yes">AvantCard</string>
+	<string name="poi_payment_ep_avant_no">Ekki tekið við AvantCard</string>
+	<string name="poi_payment_ep_mep_yes">MEP</string>
+	<string name="poi_payment_ep_mep_no">Ekki tekið við MEP</string>
+	<string name="poi_payment_ep_minipay_yes">Minipay</string>
+	<string name="poi_payment_ep_minipay_no">Ekki tekið við Minipay</string>
+	<string name="poi_payment_ep_minicash_yes">MiniCash</string>
+	<string name="poi_payment_ep_minicash_no">Ekki tekið við MiniCash</string>
+	<string name="poi_payment_ep_moneo_yes">Moneo</string>
+	<string name="poi_payment_ep_moneo_no">Ekki tekið við Moneo</string>
+	<string name="poi_payment_ep_monedero4b_yes">Monedero 4B</string>
+	<string name="poi_payment_ep_monedero4b_no">Ekki tekið við Monedero 4B</string>
+	<string name="poi_payment_ep_monedero_yes">Monedero</string>
+	<string name="poi_payment_ep_monedero_no">Ekki tekið við Monedero</string>
+	<string name="poi_payment_bankaxess_yes">BankAxess</string>
+	<string name="poi_payment_bankaxess_no">Ekki tekið við BankAxess</string>
+	<string name="poi_payment_coinkite_yes">Coinkite</string>
+	<string name="poi_payment_coinkite_no">Ekki tekið við Coinkite</string>
+	<string name="poi_payment_roadrunner_yes">Roadrunner</string>
+	<string name="poi_payment_roadrunner_no">Ekki tekið við Roadrunner-kortum</string>
+	<string name="poi_payment_sube_yes">SUBE</string>
+	<string name="poi_payment_sube_no">Ekki tekið við SUBE-kortum</string>
+	<string name="poi_payment_via_verde_yes">Via Verde</string>
+	<string name="poi_payment_via_verde_no">Ekki tekið við Via Verde</string>
+	<string name="poi_payment_u_key_yes">U-Key</string>
+	<string name="poi_payment_u_key_no">Ekki tekið við U-Key</string>
+	<string name="poi_payment_gift_card_yes">Gjafakort</string>
+	<string name="poi_payment_gift_card_no">Ekki tekið við gjafakortum</string>
+	<string name="poi_payment_golden_crown_yes">Golden Crown</string>
+	<string name="poi_payment_golden_crown_no">Ekki tekið við Golden Crown kortum</string>
+	<string name="poi_payment_pro100_yes">PRO100</string>
+	<string name="poi_payment_pro100_no">Ekki tekið við PRO100-kortum</string>
+	<string name="poi_payment_union_card_yes">Union-kort</string>
+	<string name="poi_payment_union_card_no">Ekki tekið við Union-greiðslukortum</string>
+	<string name="poi_payment_mtsmoney_yes">MTS-Money</string>
+	<string name="poi_payment_mtsmoney_no">Ekki tekið við MTS-Money</string>
+	<string name="poi_payment_yandexmoney_yes">Yandex.Money</string>
+	<string name="poi_payment_yandexmoney_no">Ekki tekið við Yandex.Money</string>
+	<string name="poi_vending_fuel">Eldsneytissjálfsali</string>
+	<string name="poi_vending_toll">Tollsjálfsali</string>
+	<string name="poi_vending_water">Vatnssjálfsali</string>
+	<string name="poi_vending_telephone_vouchers">Símaávísanir</string>
+	<string name="poi_vending_vouchers">Greiðsluseðlar</string>
+	<string name="poi_wheelchair_designated">Uppgefið</string>
+	<string name="poi_socket_cee_blue">Rafmagnsinnstunga: CEE blátt</string>
+	<string name="poi_socket_cee_blue_current">Rafmagnsinnstunga: CEE blátt: straumur</string>
+	<string name="poi_socket_cee_blue_output">Rafmagnsinnstunga: CEE blátt: úttak</string>
+	<string name="poi_socket_cee_red_16a">Rafmagnsinnstunga: CEE rautt 16A</string>
+	<string name="poi_socket_cee_red_16a_current">Rafmagnsinnstunga: CEE rautt 16A: straumur</string>
+	<string name="poi_socket_cee_red_16a_output">Rafmagnsinnstunga: CEE rautt 16A: úttak</string>
+	<string name="poi_socket_cee_red_32a">Rafmagnsinnstunga: CEE rautt 32A</string>
+	<string name="poi_socket_cee_red_32a_current">Rafmagnsinnstunga: CEE rautt 32A: straumur</string>
+	<string name="poi_socket_cee_red_32a_output">Rafmagnsinnstunga: CEE rautt 32A: úttak</string>
+	<string name="poi_socket_cee_red_64a">Rafmagnsinnstunga: CEE rautt 64A</string>
+	<string name="poi_socket_cee_red_64a_current">Rafmagnsinnstunga: CEE rautt 64A: straumur</string>
+	<string name="poi_socket_cee_red_64a_output">Rafmagnsinnstunga: CEE rautt 64A: úttak</string>
+	<string name="poi_socket_cee_red_125a">Rafmagnsinnstunga: CEE rautt 125A</string>
+	<string name="poi_socket_cee_red_125a_current">Rafmagnsinnstunga: CEE rautt 125A: straumur</string>
+	<string name="poi_socket_cee_red_125a_output">Rafmagnsinnstunga: CEE rautt 125A: úttak</string>
+	<string name="poi_socket_type1">Rafmagnsinnstunga: Type 1</string>
+	<string name="poi_socket_type1_current">Rafmagnsinnstunga: Type 1: straumur</string>
+	<string name="poi_socket_type1_output">Rafmagnsinnstunga: Type 1: úttak</string>
+	<string name="poi_socket_type1_combo">Rafmagnsinnstunga: Type 1 combo</string>
+	<string name="poi_socket_type1_combo_current">Rafmagnsinnstunga: Type 1 combo: straumur</string>
+	<string name="poi_socket_type1_combo_output">Rafmagnsinnstunga: Type 1 combo: úttak</string>
+	<string name="poi_socket_type2">Rafmagnsinnstunga: Type 2</string>
+	<string name="poi_socket_type2_current">Rafmagnsinnstunga: Type 2: straumur</string>
+	<string name="poi_socket_type2_output">Rafmagnsinnstunga: Type 2: úttak</string>
+	<string name="poi_socket_type2_combo">Rafmagnsinnstunga: Type 2 combo</string>
+	<string name="poi_socket_type2_combo_current">Rafmagnsinnstunga: Type 2 combo: straumur</string>
+	<string name="poi_socket_type2_combo_output">Rafmagnsinnstunga: Type 2 combo: úttak</string>
+	<string name="poi_socket_type3">Rafmagnsinnstunga: Type 3</string>
+	<string name="poi_socket_type3_current">Rafmagnsinnstunga: Type 3: straumur</string>
+	<string name="poi_socket_type3_output">Rafmagnsinnstunga: Type 3: úttak</string>
+	<string name="poi_socket_chademo">Rafmagnsinnstunga: CHAdeMO</string>
+	<string name="poi_socket_chademo_current">Rafmagnsinnstunga: CHAdeMO: straumur</string>
+	<string name="poi_socket_chademo_output">Rafmagnsinnstunga: CHAdeMO: úttak</string>
+	<string name="poi_socket_tesla_standard">Rafmagnsinnstunga: Staðlað Tesla</string>
+	<string name="poi_socket_tesla_standard_current">Rafmagnsinnstunga: Staðlað Tesla: straumur</string>
+	<string name="poi_socket_tesla_standard_output">Rafmagnsinnstunga: Staðlað Tesla: úttak</string>
+	<string name="poi_socket_tesla_supercharger">Rafmagnsinnstunga: Tesla Supercharger</string>
+	<string name="poi_socket_tesla_supercharger_current">Rafmagnsinnstunga: Tesla Supercharger: straumur</string>
+	<string name="poi_socket_tesla_supercharger_output">Rafmagnsinnstunga: Tesla Supercharger: úttak</string>
+	<string name="poi_socket_tesla_roadster">Rafmagnsinnstunga: Tesla Roadster</string>
+	<string name="poi_socket_tesla_roadster_current">Rafmagnsinnstunga: Tesla Roadster: straumur</string>
+	<string name="poi_socket_tesla_roadster_output">Rafmagnsinnstunga: Tesla Roadster: úttak</string>
+	<string name="poi_socket_nema_5_15">Rafmagnsinnstunga: NEMA 5-15R</string>
+	<string name="poi_car_yes">Bíll: já</string>
+	<string name="poi_car_no">Bíll: nei</string>
+	<string name="poi_bicycle_yes">Reiðhjól: já</string>
+	<string name="poi_bicycle_no">Reiðhjól: nei</string>
+	<string name="poi_scooter_yes">Skellinaðra: já</string>
+	<string name="poi_scooter_no">Skellinaðra: nei</string>
+	<string name="poi_truck_yes">Flutningabifreið: já</string>
+	<string name="poi_truck_no">Flutningabifreið: nei</string>
+
+	<string name="poi_parking_fee_yes">Bílastæðagjöld: já</string>
+	<string name="poi_parking_fee_no">Bílastæðagjöld: nei</string>
+	<string name="poi_parking_fee">Bílastæðagjöld</string>
+
+	<string name="poi_amperage">Amperstyrkur</string>
+	<string name="poi_charging_station_output">Aflúttak hleðslustöðvar</string>
+
+	<string name="poi_map_type_topo">Tegund korts: landfræðileg</string>
+	<string name="poi_map_type_street">Tegund korts: götukort</string>
+	<string name="poi_map_type_scheme">Tegund korts: skematísk</string>
+	<string name="poi_map_size_city">Tegund korts: borgarkort</string>
+	<string name="poi_map_size_region">Tegund korts: héraðskort</string>
+
+	<string name="poi_letter_box">Bréfakassi</string>
+	<string name="poi_post_street">Gata</string>
+	<string name="poi_post_housenumber">Húsnúmer</string>
+	<string name="poi_post_flats">Íbúð</string>
+
+	<string name="poi_payment_centre">Greiðslumiðstöð</string>
+	<string name="poi_money_transfer">Greiðslumiðlun</string>
+
+<string name="poi_government_archive">Skjalasafn</string>
+	<string name="poi_government_treasury">Ríkissjóður</string>
+	<string name="poi_government_transportation">Samgöngustofnun</string>
+	<string name="poi_government_legislative">Lagastofnun</string>
+
+	<string name="poi_location_underwater">Staðsetning: neðan vatnsyfirborðs</string>
+	<string name="poi_location_overground">Staðsetning: á yfirborði</string>
+	<string name="poi_location_overhead">Staðsetning: upphengt</string>
+	<string name="poi_location_roof">Staðsetning: þak</string>
+	<string name="poi_location_rooftop">Staðsetning: efst á þaki</string>
+	<string name="poi_location_outdoor">Staðsetning: utandyra</string>
+	<string name="poi_location_indoor">Staðsetning: innandyra</string>
+	<string name="poi_location_platform">Staðsetning: pallur</string>
+	<string name="poi_location_kiosk">Staðsetning: sölubás</string>
+	<string name="poi_location_bridge">Staðsetning: brú</string>
+	<string name="poi_location_wall">Staðsetning: veggur</string>
+	<string name="poi_location_entrance">Staðsetning: inngangur</string>
+
+	<string name="poi_visibility_house">Sýnileiki: hús</string>
+	<string name="poi_visibility_street">Sýnileiki: gata</string>
+	<string name="poi_visibility_area">Sýnileiki: svæði</string>
+
+	<string name="poi_socket_nema_5_15_current">Rafmagnsinnstunga: NEMA 5-15R: straumur</string>
+	<string name="poi_socket_nema_5_15_output">Rafmagnsinnstunga: NEMA 5-15R: úttak</string>
+	<string name="poi_socket_nema_5_20">Rafmagnsinnstunga: NEMA 5-20</string>
+	<string name="poi_socket_nema_5_20_current">Rafmagnsinnstunga: NEMA 5-20: straumur</string>
+	<string name="poi_socket_nema_5_20_output">Rafmagnsinnstunga: NEMA 5-20: úttak</string>
+	<string name="poi_socket_nema_14_30">Rafmagnsinnstunga: NEMA 14-30</string>
+	<string name="poi_socket_nema_14_30_current">Rafmagnsinnstunga: NEMA 14-30: straumur</string>
+	<string name="poi_socket_nema_14_30_output">Rafmagnsinnstunga: NEMA 14-30: úttak</string>
+	<string name="poi_socket_nema_14_50">Rafmagnsinnstunga: NEMA 14-50</string>
+	<string name="poi_socket_nema_14_50_current">Rafmagnsinnstunga: NEMA 14-50: straumur</string>
+	<string name="poi_socket_nema_14_50_output">Rafmagnsinnstunga: NEMA 14-50: úttak</string>
+	<string name="poi_socket_schuko">Rafmagnsinnstunga: Schuko</string>
+	<string name="poi_socket_schuko_current">Rafmagnsinnstunga: Schuko: straumur</string>
+	<string name="poi_socket_schuko_output">Rafmagnsinnstunga: Schuko: úttak</string>
+	<string name="poi_socket_bs1363">Rafmagnsinnstunga: BS 1363</string>
+	<string name="poi_socket_bs1363_current">Rafmagnsinnstunga: BS 1363: straumur</string>
+	<string name="poi_socket_bs1363_output">Rafmagnsinnstunga: BS 1363: úttak</string>
+	<string name="poi_socket_as3112">Rafmagnsinnstunga: AS/NZS 3112</string>
+	<string name="poi_socket_as3112_current">Rafmagnsinnstunga: AS/NZS 3112: straumur</string>
+	<string name="poi_socket_as3112_output">Rafmagnsinnstunga: AS/NZS 3112: úttak</string>
+
+	<string name="poi_variety_store">Smávörumarkaður</string>
+	<string name="poi_energy">Verslun orkusöluaðila</string>
+	<string name="poi_denomination_bulgarian_orthodox">Búlgarska réttrúnaðarkirkjan</string>
+	<string name="poi_denomination_armenian_apostolic">Armenska postulakirkjan</string>
+	<string name="poi_denomination_romanian_orthodox">Rúmenska rétttrúnaðarkirkjan</string>
+	<string name="poi_craft_stand_builder">Kynningarbásagerð</string>
+	<string name="poi_craft_sun_protection">Sólarvarnir</string>
+	<string name="poi_craft_sweep">Sóthreinsun</string>
+	<string name="poi_craft_tiler">Flísaleggjari</string>
+	<string name="poi_cutline">Grisjunarfar</string>
+	<string name="poi_beacon_cardinal">Höfuðáttamerki</string>
+	<string name="poi_beacon_lateral">Hliðarmerki</string>
+	<string name="poi_beacon_safe_water">Sjómerki á öruggri siglingaleið</string>
+	<string name="poi_buoy_cardinal">Höfuðáttadufl</string>
+	<string name="poi_buoy_installation">Festardufl</string>
+	<string name="poi_buoy_lateral">Hliðardufl</string>
+	<string name="poi_buoy_safe_water">Dufl á öruggri siglingaleið</string>
+	<string name="poi_notice">Upplýsingar, sjómerki</string>
+	<string name="poi_pile">Staur</string>
+	<string name="poi_small_craft_facility">Smábátaaðstaða</string>
+	<string name="poi_topmark">Toppmerki, sjómerki</string>
+	<string name="poi_sally_port">Virkishlið</string>
+	<string name="poi_kent_carriage_gap">Kent-hlið fyrir hestaumferð</string>
+	<string name="poi_payment_token_yes">Aðrir greiðslumátar</string>
+	<string name="poi_payment_token_no">Ekki tekið við öðru en reiðufé og greiðslukortum</string>
+	<string name="poi_events_venue">Aðstaða fyrir atburð</string>
+
+	<string name="poi_vending_elongated_coin">Myntpressa</string>
+	<string name="poi_motorcycle_type_standard">Staðlað</string>
+
+	<string name="poi_generator_output_electricity_no">Úttak: (rafmagn): nei</string>
+
+	<string name="poi_owner">Eigandi</string>
+
+	<string name="poi_reservation_required">Panta fyrirfram: nauðsynleg</string>
+	<string name="poi_reservation_recommended">Panta fyrirfram: mælt með</string>
+	<string name="poi_reservation_yes">Panta fyrirfram: já</string>
+	<string name="poi_reservation_no">Panta fyrirfram: nei</string>
+	<string name="poi_reservation_members_only">Panta fyrirfram: einungis meðlimir</string>
+
 	</resources>
diff --git a/OsmAnd/res/values-is/strings.xml b/OsmAnd/res/values-is/strings.xml
index e7ff90c685..bc2b66c2cf 100644
--- a/OsmAnd/res/values-is/strings.xml
+++ b/OsmAnd/res/values-is/strings.xml
@@ -509,7 +509,7 @@
     <string name="gpx_description_txt">Lýsing</string>
     <string name="default_buttons_support">Stuðningur</string>
     <string name="info_button">Upplýsingar</string>
-    <string name="backToMenu">Fara aftur í valmynd</string>
+    <string name="backToMenu">Aftur í valmynd</string>
     <string name="zoomOut">Renna frá</string>
     <string name="zoomIn">Renna að</string>
     <string name="zoomIs">Aðdráttarstig er</string>
@@ -2453,4 +2453,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
     <string name="new_filter_desc">Settu inn heiti fyrir nýju síuna, þessu verður bætt við á Flokkar-flipann þinn.</string>
     <string name="speed_limit_exceed_message">Veldu þolvik hraðatakmarkana, ef þú ert þetta mikið fyrir ofan verður lesin aðvörun.</string>
     <string name="route_is_too_long_v2">Þessi leið gæti verið of löng til að reikna hana. Bættu við áfangastöðum inn í leiðina ef ekkert finnst innan 10 mínútna.</string>
+    <string name="what_is_here">Það sem er hér:</string>
+    <string name="context_menu_read_full_article">Lesa óstytta grein</string>
+    <string name="context_menu_read_article">Lesa grein</string>
     </resources>
diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index 3a6bd892ef..eea8267344 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -1989,7 +1989,7 @@ Attivando questa vista lo stile della mappa diventerà \'Inverno e sci\', mostra
     <string name="si_min_km">Minuti al chilometro</string>
     <string name="si_min_m">Minuti per miglia</string>
     <string name="si_nm_h">Miglia nautiche per ora (nodi)</string>
-    <string name="nm_h">kn/h</string>
+    <string name="nm_h">nm/h</string>
     <string name="min_mile">min/m</string>
     <string name="min_km">min/km</string>
     <string name="m_s">m/s</string>
@@ -3018,11 +3018,11 @@ Rappresenta l\'area: %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Leggi l\'articolo completo</string>
     <string name="context_menu_read_article">Leggi l\'articolo</string>
     <string name="context_menu_points_of_group">Tutti i punti del gruppo</string>
-    <string name="opened_from">Aperto da</string>
-    <string name="opened_till">Aperto sino</string>
-    <string name="will_be_closed_at">Chiuderà alle</string>
-    <string name="will_be_opened_at">Aprirà alle</string>
-    <string name="will_be_opened_on">Sarà aperto in</string>
+    <string name="open_from">Aperto da</string>
+    <string name="open_till">Aperto sino</string>
+    <string name="will_close_at">Chiuderà alle</string>
+    <string name="will_open_at">Aprirà alle</string>
+    <string name="will_open_on">Sarà aperto in</string>
     <string name="additional_actions">Altre azioni</string>
     <string name="av_locations_selected_desc">File GPX con le coordinate e i dati delle note selezionate</string>
     <string name="av_locations_all_desc">File GPX con le coordinate e i dati di tutte le note.</string>
diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index 4b32d9433f..a9b01d1a95 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -2675,7 +2675,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="add_new_folder">新しいフォルダーを追加</string>
     <string name="points_delete_multiple_succesful">ポイントは正常に削除されました。</string>
     <string name="points_delete_multiple">%1$d個のポイントを削除します。よろしいですか？</string>
-    <string name="track_points_category_name">このルートで重要な場所</string>
+    <string name="track_points_category_name">このルートで重要とされた地点(マーカー)一覧</string>
     <string name="gpx_track">経路</string>
     <string name="get_for_month">月額</string>
     <string name="favorite_group_name">グループ名</string>
@@ -2978,7 +2978,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="shared_string_sort">並べ替え</string>
     <string name="coordinate_input">座標入力</string>
     <string name="is_saved">は、保存されました</string>
-    <string name="marker_save_as_track_descr">マーカーはあなたの指定した以下の場所に保存されます:</string>
+    <string name="marker_save_as_track_descr">マーカーは以下に指定したファイル名でエクスポートされます:</string>
     <string name="marker_save_as_track">経路を保存</string>
     <string name="move_to_history">履歴に移動</string>
     <string name="group_will_be_removed_after_restart">グループは再起動後に削除されます</string>
@@ -2988,7 +2988,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="descendingly">降順</string>
     <string name="ascendingly">昇順</string>
     <string name="date_added">作成日時</string>
-    <string name="order_by">並び順の変更</string>
+    <string name="order_by">並び順:</string>
     <string name="marker_show_distance_descr">マップ画面でマーカーへの方向と距離を示す方法を選択します:</string>
     <string name="do_not_use_animations">アニメーションを使用しない</string>
     <string name="do_not_use_animations_descr">アプリ内で使用される画面のアニメ効果を無効化します</string>
@@ -3006,7 +3006,7 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="this_year">今年</string>
     <string name="move_all_to_history">全て履歴に移動</string>
     <string name="show_direction">距離表示</string>
-    <string name="sort_by">並び順:</string>
+    <string name="sort_by">並び順の変更</string>
     <string name="keep_showing_on_map">マップ上に表示し続ける</string>
     <string name="exit_without_saving">保存せずに終了しますか？</string>
     <string name="line">線</string>
@@ -3089,10 +3089,17 @@ OsmAndとOSMをサポートする方法として現状最適な方法である
     <string name="by_date">日付別</string>
     <string name="by_type">種類別</string>
     <string name="digits_quantity">小数点以下の桁数</string>
-    <string name="coordinate_input_accuracy_description">小数点(.)以下 %1$d桁入力されたら次の入力項目へ自動的に移動します。</string>
+    <string name="coordinate_input_accuracy_description">小数点(.)以下[%1$d桁]入力されたら次の入力項目へ自動的に移動します。</string>
     <string name="go_to_next_field">次の入力項目へ移動</string>
     <string name="tap_on_map_to_hide_interface_descr">マップ画面のタップで操作ボタンやウィジェットの表示と交互に切り替えます。</string>
     <string name="tap_on_map_to_hide_interface">フルスクリーンモード</string>
     <string name="live_monitoring_max_interval_to_send">オンライン追跡用のバッファ指定</string>
     <string name="live_monitoring_max_interval_to_send_desrc">送信用現在地データをネット接続せずにどのくらいの時間記録するか、バッファを指定します</string>
+    <string name="release_3_0">• 停止標識の案内は運転方向を考慮するように変更
+\n
+\n • GPX経路に残す上昇下降値に有意かつ新しいアルゴリズムを採用
+\n
+\n • 地形(上り坂)を考慮した徒歩移動時間を算出するように改良(ネイスミスのルール／Naismith\'s ruleを適用)
+\n
+\n</string>
     </resources>
diff --git a/OsmAnd/res/values-ka/strings.xml b/OsmAnd/res/values-ka/strings.xml
index f82c41098c..eacfd264ae 100644
--- a/OsmAnd/res/values-ka/strings.xml
+++ b/OsmAnd/res/values-ka/strings.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="offline_navigation_not_available">OsmAnd-ით ნავიგაცია გათიშულ რეჟიმში დროებით მიუწვდომელია.</string>
   <string name="left_side_navigation">მარცხენა ხელით ტარება</string>
   <string name="left_side_navigation_descr">აირჩიეთ მარცხენა მხარეს საჭის გამომყენებელი ქვეყნებისათვის</string>
   
@@ -1345,4 +1346,22 @@
     <string name="quick_action_replace_destination">დანიშნულების წერტილის შეცვლა</string>
     <string name="subscribe_email_error">შეცდომა</string>
     <string name="fonts_header">რუკის ფონტები</string>
-    </resources>
\ No newline at end of file
+    <string name="parked_at">პარკირების ადგილი</string>
+    <string name="pick_up_till">გაყვანის დრო</string>
+    <string name="without_time_limit">დროის შეზღუდვის გარეშე</string>
+    <string name="context_menu_read_full_article">"მთლიანი  სტატიის წაკითხვა"</string>
+    <string name="context_menu_read_article">სტატიის წაკითხვა</string>
+    <string name="opened_from">გახსნის დროა</string>
+    <string name="opened_till">დახურვის დრო</string>
+    <string name="will_be_closed_at">დახურვის დრო</string>
+    <string name="will_be_opened_at">გახსნის დრო</string>
+    <string name="will_be_opened_on">გაიხსნება</string>
+    <string name="additional_actions">დამატებითი მოქმედებები</string>
+    <string name="modify_the_search_query">ძებნის შინაარსის შეცვლა.</string>
+    <string name="shared_string_actions">მოქმედებები</string>
+    <string name="shared_string_marker">სანიშნი</string>
+    <string name="shared_string_deleted">წაშლილია</string>
+    <string name="shared_string_edited">ჩასწორებულია</string>
+    <string name="shared_string_added">დამატებულია</string>
+    <string name="shared_string_action_name">მოქმედების სახელი</string>
+    </resources>
diff --git a/OsmAnd/res/values-nb/phrases.xml b/OsmAnd/res/values-nb/phrases.xml
index a31d54d033..4ebf1d6568 100644
--- a/OsmAnd/res/values-nb/phrases.xml
+++ b/OsmAnd/res/values-nb/phrases.xml
@@ -1211,7 +1211,7 @@
 	<string name="poi_payment_bitcoin_yes">bitcoin</string>
 	<string name="poi_payment_bitcoin_no">bitcoin godtas ikke</string>
 	<string name="poi_payment_visa_yes">Visakort</string>
-	<string name="poi_payment_visa_no">Visa-kort er ikke akseptert</string>
+	<string name="poi_payment_visa_no">Visakort er ikke akseptert</string>
 	<string name="poi_payment_mastercard_yes">MasterCard</string>
 	<string name="poi_payment_maestro_yes">Mastro-kort</string>
 	<string name="poi_payment_maestro_no">Maestro-kort godtas ikke</string>
@@ -1264,4 +1264,5 @@
 
 	<string name="poi_nat_name">Nasjonalt navn</string>
 	<string name="poi_reg_name">Regionalt navn</string>
+	<string name="poi_payment_mastercard_no">MasterCard er ikke akseptert</string>
 	</resources>
diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index c05c622095..1383e0378b 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -1873,7 +1873,7 @@
     <string name="trip_rec_notification_settings_desc">Vis et systemvarsel slik at du kan starte turopptak.</string>
     <string name="save_track_min_speed">Minimumshastighet for logging</string>
     <string name="save_track_min_speed_descr">Filter: Still inn minimumshastighet for at et punkt skal logges.</string>
-    <string name="save_track_min_distance">Logging ved bevegelsesoppdagelse</string>
+    <string name="save_track_min_distance">Minsteavstand for logging</string>
     <string name="save_track_min_distance_descr">Filter: Angi minste avstand fra siste posisjon for at et punkt skal logges.</string>
     <string name="save_track_precision">Minste loggingspresisjon</string>
     <string name="save_track_precision_descr">Filter: Velg minste presisjon som starter loggføring av et punkt.</string>
@@ -2615,7 +2615,7 @@ Representerer området: %1$s x %2$s</string>
     <string name="show_arrows_descr">Vis en eller to piler som indikerer retningen til de aktive markørene.</string>
     <string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string>
     <string name="active_markers_descr">Velg hvor mange retningsindikatorer som vises.</string>
-    <string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og modulene.</string>
+    <string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og miniprogrammene.</string>
     <string name="release_3_0">\\022 Oppdagelse av stoppskilt tar nå hensyn til kjøreretning
 \n
 \n • Ny algoritme gir meningsfulle verdier for ned-/stigning for GPX-spor
@@ -2676,4 +2676,21 @@ Representerer området: %1$s x %2$s</string>
     <string name="osm_live_header">Dette abonnementet skrur på timevise oppdateringer av alle kart verden over. Deler av inntekten går tilbake til OSM-gemenskapen, og er betalt for hvert OSM-bidrag. Hvis du elsker OsmAnd og OSM, og ønsker å støtte opp, dette er den perfekte måten å gjøre det.</string>
     <string name="m_s">m/s</string>
     <string name="lang_ber">Berber</string>
+    <string name="additional_actions">Flere handlinger</string>
+    <string name="shared_string_actions">Handlinger</string>
+    <string name="shared_string_marker">Markør</string>
+    <string name="what_is_here">Hva finnes her:</string>
+    <string name="parked_at">parkert</string>
+    <string name="pick_up_till">Henting til</string>
+    <string name="without_time_limit">Uten tidsbegrensning</string>
+    <string name="context_menu_read_full_article">Les hele artikkelen</string>
+    <string name="context_menu_read_article">Les artikkel</string>
+    <string name="context_menu_points_of_group">Alle punkter i gruppen</string>
+    <string name="opened_from">Åpen fra</string>
+    <string name="opened_till">Åpen til</string>
+    <string name="will_be_closed_at">Stenger</string>
+    <string name="will_be_opened_at">Åpner</string>
+    <string name="will_be_opened_on">Åpner</string>
+    <string name="av_locations_selected_desc">GPX-fil med de valgte notatenes koordinater og data.</string>
+    <string name="av_locations_all_desc">GPX-fil med alle notaters koordinater og data.</string>
     </resources>
diff --git a/OsmAnd/res/values-nl/phrases.xml b/OsmAnd/res/values-nl/phrases.xml
index b4a92bbae1..40ba4be93e 100644
--- a/OsmAnd/res/values-nl/phrases.xml
+++ b/OsmAnd/res/values-nl/phrases.xml
@@ -1579,7 +1579,7 @@
 	<string name="poi_free_flying_characteristic">Karakteristiek</string>
 	<string name="poi_cafeteria">Cafetaria</string>
 	<string name="poi_zoo_type">Type</string>
-	<string name="poi_motorcycle_services">Service</string>
+	<string name="poi_motorcycle_services">Diensten</string>
 	<string name="poi_motorcycle_type">Soort motorfiets</string>
 
 <string name="poi_emergency_infrastructure">Noodvoorzieningen</string>
@@ -2278,15 +2278,15 @@
 
 	<string name="poi_internet_access_type_terminal">Terminal</string>
 	<string name="poi_internet_access_type_public">Type internettoegang: openbaar</string>
-	<string name="poi_internet_access_type_service">Type internettoegang: service</string>
-	<string name="poi_internet_access_type_no">Geen Internettoegang</string>
+	<string name="poi_internet_access_type_service">Type internettoegang: dienst</string>
+	<string name="poi_internet_access_type_no">Geen internettoegang</string>
 	<string name="poi_internet_access_type_yes">Met internettoegang</string>
 
 	<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_wiki_lang_bpy"/>
 	<string name="poi_historic_farm">Historische boerderij</string>
 	<string name="poi_historic_railway_station">Historisch treinstation</string>
 
@@ -2488,4 +2488,7 @@
 	<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>
+	<string name="poi_animal_shelter_type">Dieren toegestaan</string>
+	<string name="poi_faa">FAA-code</string>
+	
 	</resources>
diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index 3a1707508d..311e45b519 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -1734,7 +1734,7 @@ Wilt u verder gaan met een nieuwe registratie?</string>
 	
 	<string name="rename_failed">Hernoemen mislukt.</string>
 	<string name="back_to_map">Terug naar kaart</string>
-	<string name="share_note">Deel Opmerking</string>
+	<string name="share_note">Deel notitie</string>
 	
     <string name="location_on_map">Locatie:\n Lat %1$s\n Lon %2$s</string>
 	<string name="notes">AV-Notities</string>
@@ -2107,18 +2107,18 @@ Lengtegraad:\t\t%2$s</string>
     <string name="shared_string_location">Coördinaten</string>
     <string name="osm_edit_modified_poi">Gewijzigde OSM POI</string>
     <string name="osm_edit_deleted_poi">Gewiste OSM POI</string>
-    <string name="context_menu_item_open_note">OSM-Opmerking aanmaken</string>
-    <string name="osm_edit_reopened_note">Heropende OSM-Opmerking</string>
-    <string name="osm_edit_commented_note">OSM-Opmerking met commentaar</string>
-    <string name="osm_edit_removed_note">OSM-Opmerking gewist</string>
-	<string name="osm_edit_created_note">OSM-Opmerking aangemaakt</string>
-	<string name="osn_bug_name">OSM-Opmerking</string>
-	<string name="osn_add_dialog_title">OSM-Opmerking aanmaken</string>
+    <string name="context_menu_item_open_note">Maak OSM-notitie aan</string>
+    <string name="osm_edit_reopened_note">Heropen OSM-notitie</string>
+    <string name="osm_edit_commented_note">Becommentarieerde OSM-notitie</string>
+    <string name="osm_edit_removed_note">Verwijderde OSM-notitie</string>
+	<string name="osm_edit_created_note">Aangemaakte OSM-notitie</string>
+	<string name="osn_bug_name">OSM-notitie</string>
+	<string name="osn_add_dialog_title">Maak OSM-notitie aan</string>
 	<string name="osn_comment_dialog_title">Voeg commentaar toe</string>
-	<string name="osn_reopen_dialog_title">Heropen notitie</string>
+	<string name="osn_reopen_dialog_title">Heropen opmerking</string>
 	<string name="osn_close_dialog_title">Sluit notitie</string>
-	<string name="osn_add_dialog_success">OSM-Opmerking aangemaakt</string>
-	<string name="osn_add_dialog_error">Er was een probleem: OSM-Opmerking niet aangemaakt</string>
+	<string name="osn_add_dialog_success">OSM-notitie is succesvol aangemaakt</string>
+	<string name="osn_add_dialog_error">Een probleem is opgetreden: OSM-notitie is niet aangemaakt</string>
 	<string name="osn_close_dialog_success">Notitie is gesloten</string>
 	<string name="osn_close_dialog_error">Er was een probleem: notitie is niet afgesloten</string>
 	<string name="osm_save_offline">Bewaar voor off-line gebruik</string>
@@ -2276,7 +2276,7 @@ Nu is maar {2} MB beschikbaar.</string>
 Tijdelijk is {3} MB nodig en permanent {1} MB. 
 Er is nu {2} MB beschikbaar</string>
     <string name="upload_osm_note_description">Je kunt OSM Opmerkingen anoniem uploaden of je OpenStreetMap.org profiel gebruiken.</string>
-    <string name="upload_osm_note">OSM Opmerking uploaden</string>
+    <string name="upload_osm_note">Upload OSM-notitie</string>
     <string name="map_marker_1st">Eerste Markeervlaggetje</string>
     <string name="map_marker_2nd">Tweede Markeervlaggetje</string>
     <string name="shared_string_toolbar">Werkbalk</string>
@@ -2355,7 +2355,7 @@ Er is nu {2} MB beschikbaar</string>
     <string name="access_direction_audio_feedback_descr">Geef de richting van de bestemming aan met geluid.</string>
     <string name="access_direction_haptic_feedback">Richting aangeven met trilling</string>
     <string name="access_direction_haptic_feedback_descr">Geef de richting van de bestemming aan met trillingen.</string>
-    <string name="move_marker_bottom_sheet_title">Schuif de kaart om de marker-positie te wijzigen</string>
+    <string name="move_marker_bottom_sheet_title">Verplaats de kaart om de positie van de markering te wijzigen</string>
     <!-- string name="lat_lon_pattern">Lat: %1$.5f Lon: %2$.5f</string -->
     <string name="map_widget_battery">Accuniveau</string>
     <string name="lang_hu_formal">Hongaars (formeel)</string>
@@ -2555,7 +2555,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="quick_action_take_audio_note">Audio-notitie maken</string>
     <string name="quick_action_take_video_note">Video-notitie maken</string>
     <string name="quick_action_take_photo_note">Maak foto</string>
-    <string name="quick_action_add_osm_bug">OSM-opmerking aanmaken</string>
+    <string name="quick_action_add_osm_bug">Voeg OSM-notitie toe</string>
     <string name="quick_action_navigation_voice">Stembegeleiding Aan/Uit</string>
     <string name="quick_action_navigation_voice_off">Stembegeleiding staat uit</string>
     <string name="quick_action_navigation_voice_on">Stembegeleiding staat aan</string>
@@ -2574,7 +2574,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="quick_action_take_audio_note_descr">Een druk op de Sneltoets maakt een Audio-notitie in het midden van het scherm.</string>
     <string name="quick_action_take_video_note_descr">Een druk op de Sneltoets maakt een Video-notitie in het midden van het scherm.</string>
     <string name="quick_action_take_photo_note_descr">Een druk op de Sneltoets maakt een Foto-notitie in het midden van het scherm.</string>
-    <string name="quick_action_add_osm_bug_descr">Een druk op de Sneltoets maakt een OSM-opmerking in het midden van het scherm.</string>
+    <string name="quick_action_add_osm_bug_descr">Een druk op de sneltoets voegt een OSM-notitie toe in het midden van het scherm.</string>
     <string name="quick_action_add_poi_descr">"Een druk op de Sneltoets maakt een POI,  in het midden van het scherm."</string>
     <string name="quick_action_navigation_voice_descr">Een druk op de Sneltoets zet de stembegeleiding aan of uit tijdens navigatie.</string>
     <string name="quick_action_add_parking_descr">Een druk op de Sneltoets stelt je parkeerpositie in op het midden van het scherm.</string>
@@ -2597,7 +2597,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="quick_action_add_navigation">Navigatie</string>
     <string name="quick_action_fav_name_descr">Leeg laten om automatisch adres of plaatsnaam te gebruiken</string>
     <string name="quick_action_bug_descr">Dit bericht wordt automatisch aangevuld in het commentaarveld.</string>
-    <string name="quick_action_bug_message">Opmerking</string>
+    <string name="quick_action_bug_message">Bericht</string>
     <string name="quick_action_category_descr">Kies de categorie om de favoriet in op te slaan</string>
     <string name="quick_action_gpx_category_descr">Kies een categorie (optie)</string>
     <string name="quick_action_poi_list">POI-lijst</string>
@@ -2625,7 +2625,7 @@ voor Gebied: %1$s x %2$s</string>
     <string name="rendering_attr_depthContours_name">Zeedieptelijnen</string>
 	<string name="select_gpx_folder">Kies map voor GPX-tracks</string>
     <string name="file_can_not_be_moved">Bestand kan niet verplaatst worden.</string>
-    <string name="shared_string_move">Verplaatsen</string>
+    <string name="shared_string_move">Verplaats</string>
     <string name="shared_string_tracks">Tracks</string>
     
     <string name="route_altitude">Route hoogteprofiel</string>
@@ -2819,7 +2819,7 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="mapillary_menu_title_dates">Data</string>
     <string name="mapillary_menu_edit_text_hint">Geef gebruikersnaam</string>
     <string name="mapillary_menu_title_username">Gebruikersnaam</string>
-    <string name="move_all_to_history">Alles naar geschiedenis verplaatsen</string>
+    <string name="move_all_to_history">Verplaats alles naar geschiedenis</string>
     <string name="build_route">Route maken</string>
     <string name="show_direction">Toon afstand</string>
     <string name="sort_by">Sorteren op</string>
@@ -2853,18 +2853,18 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="ascendingly">van laag naar hoog</string>
     <string name="shared_string_list">Lijst</string>
     <string name="shared_string_groups">Groepen</string>
-    <string name="osn_modify_dialog_title">Wijzig opmerking</string>
-    <string name="context_menu_item_modify_note">Wijzig opmerking in OSM</string>
+    <string name="osn_modify_dialog_title">Wijzig notitie</string>
+    <string name="context_menu_item_modify_note">Wijzig OSM-notitie</string>
     <string name="make_round_trip_descr">Kopieer het beginpunt en voeg het toe als bestemming.</string>
     <string name="make_round_trip">Ga heen en terug</string>
     <string name="shared_string_navigate">Navigeer</string>
     <string name="shared_string_markers">Markeringen</string>
-    <string name="coordinates_format">Coördinaten-formaat</string>
+    <string name="coordinates_format">Coördinatenformaat</string>
     <string name="use_system_keyboard">Gebruik systeemtoetsenbord</string>
     <string name="fast_coordinates_input_descr">Kies het invoerformaat voor coördinaten. Dit is te wijzigen in de instellingen.</string>
     <string name="fast_coordinates_input">Snelle invoer van coördinaten</string>
-    <string name="routing_attr_avoid_ice_roads_fords_name">Vermijd ijswegen en wegen onder water</string>
-    <string name="routing_attr_avoid_ice_roads_fords_description">Vermijd ijswegen en wegen die bij hoogtij onder water staan.</string>
+    <string name="routing_attr_avoid_ice_roads_fords_name">Vermijd ijswegen en wegen die (deels) onder water staan</string>
+    <string name="routing_attr_avoid_ice_roads_fords_description">Vermijd ijswegen en wegen die (deels) onder water staan.</string>
     <string name="use_location">Gebruik mijn positie</string>
     <string name="add_location_as_first_point_descr">Voeg uw poistie toe als eerste routepunt.</string>
     <string name="my_location">Mijn positie</string>
@@ -2873,15 +2873,15 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="shared_string_sort">Sorteer</string>
     <string name="coordinate_input">Invoer van coördinaten</string>
     <string name="is_saved">is opgeslagen</string>
-    <string name="marker_save_as_track_descr">Markeringen exporteren naar het bestand dat u hier opgeeft:</string>
+    <string name="marker_save_as_track_descr">Exporteer uw markeringen naar een bestand dat u hier opgeeft:</string>
     <string name="marker_save_as_track">Bewaar als spoor</string>
     <string name="move_to_history">Verplaats naar geschiedenis</string>
-    <string name="group_will_be_removed_after_restart">De groep wordt verwijderd na een herstart</string>
+    <string name="group_will_be_removed_after_restart">De groep wordt verwijderd na een herstart van de app.</string>
     <string name="show_guide_line">Toon hulplijnen</string>
     <string name="show_arrows_on_the_map">Toon pijlen op de kaart</string>
     <string name="show_passed">Toon afgelopen</string>
     <string name="hide_passed">Verberg afgelopen</string>
-    <string name="remove_from_map_markers">Verwijder kaartmarkering</string>
+    <string name="remove_from_map_markers">Verwijder van kaartmarkeringen</string>
     <string name="date_added">Toegevoegd op</string>
     <string name="order_by">Sorteer op:</string>
     <string name="marker_show_distance_descr">Weergave van afstand en richting naar markeingen op het kaartscherm:</string>
@@ -2941,7 +2941,7 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="show_map">Kaart weergeven</string>
     <string name="route_is_calculated">Route wordt berekend</string>
     <string name="round_trip">Retour</string>
-    <string name="osn_modify_dialog_error">Er was een probleem: notitie is niet opgeslagen</string>
+    <string name="osn_modify_dialog_error">Er was een probleem: opmerking is niet opgeslagen</string>
     <string name="release_2_8">\\022 Geheel vernieuwde kaartmarkeringen met lijnen en routeplanning
 \n
 \n• Afstandmeter kan vastklikken aan wegen en als track opslaan
@@ -2954,7 +2954,7 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
 	<string name="enter_new_name">Kies een nieuwe naam</string>
 	<string name="shared_string_back">Vorige</string>
 	<string name="view">Bekijk</string>
-	<string name="wrong_format">Verkeerd format</string>
+	<string name="wrong_format">Foutief formaat</string>
     <string name="shared_string_road">Weg</string>
     <string name="tap_on_map_to_hide_interface_descr">Een tik op de kaart verbergt/toont de bedieningsknoppen en widgets.</string>
     <string name="tap_on_map_to_hide_interface">Volledig scherm modus</string>
@@ -2964,10 +2964,10 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="import_as_gpx">importeer als GPX bestand</string>
     <string name="import_as_favorites">Importeer als Favorieten</string>
     <string name="import_file">Importeer bestand</string>
-	<string name="appearance_on_the_map">Uiterlijk op de kaart</string>
-    <string name="favourites_group">Favorieten groep</string>
-    <string name="add_group">Groep toevoegen</string>
-    <string name="empty_state_markers_active">Markeringen op de kaart!</string>
+	<string name="appearance_on_the_map">Weergave op de kaart</string>
+    <string name="favourites_group">Favorietencategorie</string>
+    <string name="add_group">Voeg groep toe</string>
+    <string name="empty_state_markers_active">Maak markeringen aan op de kaart!</string>
     <string name="shared_string_two">Twee</string>
     <string name="shared_string_one">Een</string>
     <string name="active_markers_descr">Kies hoeveel richtingaanwijzers u wilt zien.</string>
@@ -2975,9 +2975,39 @@ We slaan geen locatiegegevens, zoektermen of andere gebruikersgegevens op.</stri
     <string name="shared_string_right">Rechts</string>
     <string name="shared_string_left">Links</string>
     <string name="shared_string_paste">Plakken</string>
-    <string name="coordinate_input_accuracy_description">Automatisch overschakelen naar het volgende veld na het invoeren van %1$d cijfers achter het decimaalteken</string>
+    <string name="coordinate_input_accuracy_description">Automatisch overschakelen naar het volgende veld na het invoeren van %1$d decimale cijfers.</string>
     <string name="coordinate_input_accuracy">%1$d cijfers</string>
     <string name="go_to_next_field">Ga naar het volgende veld</string>
-    <string name="rename_marker">Markering hernoemen</string>
+    <string name="rename_marker">Herbenoem markering</string>
     <string name="plan_route_no_markers_toast">U moet ten minste één markering toevoegen om deze functie te gebruiken.</string>
+    <string name="parked_at">geparkeerd op</string>
+    <string name="pick_up_till">Ophalen tot</string>
+    <string name="without_time_limit">Zonder tijdlimiet</string>
+    <string name="context_menu_read_full_article">Lees het hele artikel</string>
+    <string name="context_menu_read_article">Lees artikel</string>
+    <string name="context_menu_points_of_group">Alle punten van de groep</string>
+    <string name="opened_from">Open van</string>
+    <string name="opened_till">Open tot</string>
+    <string name="will_be_closed_at">Sluit om</string>
+    <string name="will_be_opened_at">Gaat open om</string>
+    <string name="will_be_opened_on">Zal opengaan op</string>
+    <string name="additional_actions">Verdere acties</string>
+    <string name="modify_the_search_query">Zoekopdracht veranderen.</string>
+    <string name="shared_string_actions">Acties</string>
+    <string name="shared_string_marker">Markering</string>
+    <string name="empty_state_osm_edits">Maak of wijzig OSM-objecten</string>
+    <string name="shared_string_deleted">Verwijderd</string>
+    <string name="shared_string_edited">Gewijzigd</string>
+    <string name="shared_string_added">Toegevoegd</string>
+    <string name="av_locations_selected_desc">GPX-bestand met coördinaten en gegevens van de geselecteerde notities.</string>
+    <string name="av_locations_all_desc">GPX-bestand met coördinaten en gegevens van alle notities.</string>
+    <string name="empty_state_osm_edits_descr">Creëer of wijzig OSM POI, maak of becommentarieer een OSM-notities en draag opgenomen GPX-bestanden bij.</string>
+    <string name="marker_activated">Markering %s is geactiveerd.</string>
+    <string name="empty_state_av_notes">Maak notities!</string>
+    <string name="empty_state_av_notes_desc">Voeg audio-, video- of fotonotities aan voor elk punt op de kaart, gebruik widget of context menu.</string>
+    <string name="notes_by_date">Notities op datum</string>
+    <string name="by_date">Op datum</string>
+    <string name="by_type">Op type</string>
+    <string name="shared_string_more_without_dots">Meer</string>
+    <string name="show_number_pad">Toon cijfertoetsenbord</string>
     </resources>
diff --git a/OsmAnd/res/values-pl/phrases.xml b/OsmAnd/res/values-pl/phrases.xml
index 76be10798b..6a18a2c4ad 100644
--- a/OsmAnd/res/values-pl/phrases.xml
+++ b/OsmAnd/res/values-pl/phrases.xml
@@ -227,7 +227,7 @@
 	<string name="poi_driving_school">Szkoła nauki jazdy</string>
 	<string name="poi_school">Szkoła</string>
 	<string name="poi_kindergarten">Przedszkole</string>
-	<string name="poi_college">Kolegium</string>
+	<string name="poi_college">Uczelnia</string>
 	<string name="poi_university">Uniwersytet</string>
 
 	<string name="poi_social_facility">Placówka społeczna</string>
@@ -715,7 +715,7 @@
 	<string name="poi_craft_boatbuilder">Stocznia</string>
 	<string name="poi_craft_jeweller">Jubiler</string>
 	<string name="poi_transport_construction">Roboty drogowe</string>
-		<string name="poi_base">Miejsce do base jumpingu</string>
+		<string name="poi_base">Base jumping</string>
 	<string name="poi_ice_stock">Ice stock</string>
 	<string name="poi_artwork">Dzieło sztuki</string>
 	<string name="poi_attraction_amusement_ride">Karuzela</string>
@@ -1197,7 +1197,7 @@
 	<string name="poi_denomination_adventist">Adwentyści</string>
 	<string name="poi_denomination_nazarene">Kościół Nazarejczyka</string>
 	<string name="poi_denomination_old_believers">Staroobrzędowcy</string>
-	<string name="poi_denomination_serbian_orthodox">Serbski ortodoksyjny</string>
+	<string name="poi_denomination_serbian_orthodox">Serbski prawosławny</string>
 	<string name="poi_denomination_armenian_apostolic">Apostolski Kościół Ormiański</string>
 	<string name="poi_denomination_dutch_reformed">Holenderski Kościół Reformowany</string>
 	<string name="poi_denomination_apostolic">Kościół Apostolski</string>
@@ -3680,4 +3680,8 @@
 	<string name="poi_payment_centre">Centrum płatności</string>
 	<string name="poi_money_transfer">Przelew pieniędzy</string>
 
-</resources>
+<string name="poi_route_subway_ref">Metro</string>
+
+	<string name="poi_depot">Zajezdnia</string>
+
+	</resources>
diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml
index fc08d56a93..ae07ac53e6 100644
--- a/OsmAnd/res/values-pl/strings.xml
+++ b/OsmAnd/res/values-pl/strings.xml
@@ -2935,10 +2935,13 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="shared_string_added">Dodane</string>
     <string name="empty_state_osm_edits">Tworzenie lub modyfikowanie obiektów OSM</string>
     <string name="rename_marker">Zmień nazwę znacznika</string>
-    <string name="opened_from">Otwarte od</string>
-    <string name="opened_till">Otwarte do</string>
+    <string name="open_from">Otwarte od</string>
+    <string name="open_till">Otwarte do</string>
+    <string name="will_close_at">Zostanie zamknięty o</string>
+    <string name="will_open_at">Zostanie otwarty o</string>
+    <string name="will_open_on">Zostanie otwarty w</string>
     <string name="additional_actions">Dodatkowe czynności</string>
-    <string name="release_3_0">\\022 Wykrywanie znaków stop uwzględnia teraz kierunek jazdy,
+    <string name="release_3_0">• Wykrywanie znaków stop uwzględnia teraz kierunek jazdy,
 \n
 \n • nowy algorytm udostępnia bardziej precyzyjne wartości podejścia/zejścia dla śladów GPX,
 \n
@@ -2950,4 +2953,7 @@ Reprezentuje obszar: %1$s x %2$s</string>
     <string name="marker_activated">Uaktywniono znacznik %s.</string>
     <string name="by_date">Według daty</string>
     <string name="by_type">Według rodzaju</string>
+    <string name="parked_at">zaparkowano o</string>
+    <string name="without_time_limit">Bez ograniczenia czasu</string>
+    <string name="context_menu_points_of_group">Wszystkie punkty w grupie</string>
     </resources>
diff --git a/OsmAnd/res/values-pt-rBR/phrases.xml b/OsmAnd/res/values-pt-rBR/phrases.xml
index 42da75d0a3..b2ab028dba 100644
--- a/OsmAnd/res/values-pt-rBR/phrases.xml
+++ b/OsmAnd/res/values-pt-rBR/phrases.xml
@@ -76,7 +76,7 @@
 	<string name="poi_computer">Loja de informática</string>
 	<string name="poi_copyshop">Reprografia</string>
 	<string name="poi_curtain">Loja de cortinas</string>
-	<string name="poi_fabric">Tecidos</string>
+	<string name="poi_fabric">Loja de tecidos</string>
 	<string name="poi_bedding">Loja de roupa de cama</string>
 	<string name="poi_dive">Equipamento de mergulho</string>
 	<string name="poi_doityourself">Artigos para casa</string>
@@ -102,14 +102,14 @@
 	<string name="poi_kitchen">Mobiliário de cozinha</string>
 	<string name="poi_medical_supply">Suprimentos médicos</string>
 	<string name="poi_mobile_phone">Loja de celulares</string>
-	<string name="poi_motorcycle">Revenda de motocicletas</string>
+	<string name="poi_motorcycle">Loja de motos</string>
 	<string name="poi_musical_instrument">Loja de instrumentos musicais</string>
-	<string name="poi_newsagent">Banca de revistas</string>
+	<string name="poi_newsagent">Banca de jornal</string>
 	<string name="poi_optician">Ótica</string>
 	<string name="poi_organic">Produtos orgânicos</string>
 	<string name="poi_outdoor">Loja de esporte/aventura</string>
 	<string name="poi_paint">Loja de tintas</string>
-	<string name="poi_pet">Loja de animais</string>
+	<string name="poi_pet">Pet shop</string>
 	<string name="poi_photo">Loja de fotografia</string>
 	<string name="poi_radiotechnics">Loja de radiotecnia</string>
 	<string name="poi_second_hand">Brechó</string>
@@ -168,7 +168,7 @@
 	<string name="poi_traffic_calming_bump">Lombada</string>
 	<string name="poi_traffic_calming_hump">Lombada rápida</string>
 	<string name="poi_traffic_calming_cushion">Lomanda cushion</string>
-	<string name="poi_traffic_calming_chicane">Chicane</string>
+	<string name="poi_traffic_calming_chicane">Chicana</string>
 	<string name="poi_traffic_calming_rumble_strip">Sonorizador</string>
 	<string name="poi_traffic_calming_choker">Estreitamento</string>
 	<string name="poi_traffic_signals">Semáforo</string>
@@ -227,7 +227,7 @@
 	<string name="poi_car">Revenda de automóveis</string>
 	<string name="poi_fire_flapper">Abafador de incêncio</string>
 	<string name="poi_helipad">Heliponto</string>
-	<string name="poi_railway_buffer_stop">Para-choque de final de linha</string>
+	<string name="poi_railway_buffer_stop">Para-choque de via</string>
 	<string name="poi_taxi">Ponto de táxi</string>
 
 	<string name="poi_aerodrome">Aeroporto</string>
@@ -294,7 +294,7 @@
 	<string name="poi_neighbourhood">Vizinhança</string>
 	<string name="poi_locality">Localidade</string>
 	<string name="poi_place_allotments">Loteamentos</string>
-	<string name="poi_place_farm">Lavoura</string>
+	<string name="poi_place_farm">Fazenda</string>
 	<string name="poi_pharmacy">Farmácia</string>
 	<string name="poi_hospital">Hospital</string>
 	<string name="poi_doctors">Consultório médico</string>
@@ -317,7 +317,7 @@
 	<string name="poi_psychotherapist">Psicoterapeuta</string>
 	<string name="poi_healthcare_rehabilitation">Reabilitação</string>
 	<string name="poi_speech_therapist">Fonoaudiólogo</string>
-	<string name="poi_company">Empresa</string>
+	<string name="poi_company">Companhia</string>
 	<string name="poi_insurance">Seguro</string>
 	<string name="poi_estate_agent">Imobiliária</string>
 	<string name="poi_lawyer">Advogado</string>
@@ -339,7 +339,7 @@
 	<string name="poi_pier">Píer</string>
 	<string name="poi_surveillance">Vigilância</string>
 	<string name="poi_observatory">Observatório</string>
-	<string name="poi_astronomical_observatory">Observatório astronômico</string>
+	<string name="poi_astronomical_observatory">Astronômico</string>
 	<string name="poi_tower">Torre</string>
 	<string name="poi_mast">Mastro</string>
 	<string name="poi_radar">Radar</string>
@@ -404,7 +404,7 @@
 	<string name="poi_sports_centre">Centro/clube esportivo</string>
 	<string name="poi_golf_course">Campo de golfe</string>
 	<string name="poi_ice_rink">Pista de patinação no gelo</string>
-	<string name="poi_pitch">Quadra</string>
+	<string name="poi_pitch">Quadra/Campo</string>
 	<string name="poi_leisure_track">Pista de esportes</string>
 	<string name="poi_running_track">Pista de atletismo</string>
 	<string name="poi_bicycle_track">Pista de ciclismo</string>
@@ -421,7 +421,7 @@
 	<string name="poi_basketball">Basquete</string>
 	<string name="poi_beachvolleyball">Voleibol de praia</string>
 	<string name="poi_bmx">Bicicross</string>
-	<string name="poi_boules">Boules</string>
+	<string name="poi_boules">Bocha</string>
 	<string name="poi_bowls">Bowls</string>
 	<string name="poi_canadian_football">Futebol canadense</string>
 	<string name="poi_canoe">Canoa</string>
@@ -446,7 +446,7 @@
 	<string name="poi_sport_motor">Esporte automotivo</string>
 	<string name="poi_sport_multi">Poliesportivo</string>
 	<string name="poi_orienteering">Orientação</string>
-	<string name="poi_paddle_tennis">Raquete de tênis</string>
+	<string name="poi_paddle_tennis">Pádel</string>
 	<string name="poi_paragliding">Parapente</string>
 	<string name="poi_pelota">Bocha/pelota</string>
 	<string name="poi_racquet">Esportes com raquete</string>
@@ -536,7 +536,7 @@
 	<string name="poi_historic_monastery">Mosteiro histórico</string>
 	<string name="poi_wayside_cross">Cruz de beira de estrada</string>
 	<string name="poi_wayside_shrine">Capelinha de beira de estrada</string>
-	<string name="poi_information">Informação turística</string>
+	<string name="poi_information">Informação</string>
 	<string name="poi_clock">Relógio</string>
 	<string name="poi_travel_agent">Agente de viagens</string>
 	<string name="poi_viewpoint">Mirante</string>
@@ -623,7 +623,7 @@
 	<string name="poi_restaurant">Restaurante</string>
 	<string name="poi_fast_food">Lanchonete</string>
 	<string name="poi_bar">Bar</string>
-	<string name="poi_pub">Pub</string>
+	<string name="poi_pub">Boteco</string>
 	<string name="poi_food_court">Praça de alimentação</string>
 	<string name="poi_drinking_water">Fonte de água potável</string>
 	<string name="poi_barbecue">Churrasqueira</string>
@@ -677,7 +677,7 @@
 	<string name="poi_funeral_directors">Funerária</string>
 	<string name="poi_craft_computer">Montagem de computadores</string>
 	<string name="poi_beauty">Salão de beleza</string>
-	<string name="poi_beauty_salon_nails">Salão de manicure</string>
+	<string name="poi_beauty_salon_nails">Manicure</string>
 	<string name="poi_hairdresser">Cabeleireiro</string>
 	<string name="poi_massage">Salão de massagem</string>
 	<string name="poi_tattoo">Estúdio de tatuagem</string>
@@ -837,7 +837,7 @@
 	<string name="poi_bus_trap">Armadilha de ônibus</string>
 	<string name="poi_cattle_grid">Mata-burro</string>
 	<string name="poi_full_height_turnstile">Catraca de altura completa</string>
-	<string name="poi_bump_gate">Bump gate</string>
+	<string name="poi_bump_gate">Portão de colisão</string>
 	<string name="poi_general_barrier">Barreira geral</string>
 	<string name="poi_stile">Travessia em cerca</string>
 	<string name="poi_height_restrictor">Limitador de altura</string>
@@ -848,10 +848,10 @@
 	<string name="poi_entrance">Entrada</string>
 	<string name="poi_entrance_exit">Saída</string>
 
-	<string name="poi_kissing_gate">Kissing gate</string>
+	<string name="poi_kissing_gate">Quebra-corpo</string>
 	<string name="poi_sally_port">Portão de fortaleza</string>
-	<string name="poi_swing_gate">Swing gate</string>
-	<string name="poi_kent_carriage_gap">Kent carriage gap</string>
+	<string name="poi_swing_gate">Cancela de balanço</string>
+	<string name="poi_kent_carriage_gap">Pilaretes anti-carro (carroças passam)</string>
 	<string name="poi_highway_crossing">Travessia de pedestres</string>
 
 <string name="poi_cheese">Queijaria</string>
@@ -860,14 +860,14 @@
 	<string name="poi_pasta">Loja de massas</string>
 	<string name="poi_pastry">Pastelaria</string>
 	<string name="poi_candles">Loja de velas</string>
-	<string name="poi_fashion">Acessórios moda</string>
+	<string name="poi_fashion">Loja de moda</string>
 	<string name="poi_free_flying">Artigos de voo livre</string>
 	<string name="poi_furnace">Artigos de calefação</string>
 	<string name="poi_garden_furniture">Móveis para jardim</string>
 	<string name="poi_leather">Artigos de couro</string>
 	<string name="poi_music">Loja de discos musicais</string>
 	<string name="poi_tyres">Borracharia</string>
-	<string name="poi_energy">Artigos de energia</string>
+	<string name="poi_energy">Loja de materiais elétricos</string>
 	<string name="poi_watches">Relojoaria</string>
 	<string name="poi_games">Jogos</string>
 	<string name="poi_model">Modelos em escala</string>
@@ -956,7 +956,7 @@
 	<string name="poi_animal_shelter_dog_cat">Abrigo para cães e gatos</string>
 	<string name="poi_animal_shelter_bird">Abrigo para aves</string>
 
-<string name="poi_recycling_container">Tipo: contêiner</string>
+<string name="poi_recycling_container">Contêiner</string>
 	<string name="poi_recycling_glass">Vidro</string>
 	<string name="poi_recycling_paper">Papel</string>
 	<string name="poi_recycling_clothes">Roupas</string>
@@ -1036,8 +1036,8 @@
 	<string name="poi_seasonal_autumn">Outono</string>
 	<string name="poi_seasonal_winter">Inverno</string>
 
-	<string name="poi_recycling_centre">Tipo: centro de reciclagem</string>
-	<string name="poi_recycling_hardcore">Material duro</string>
+	<string name="poi_recycling_centre">Centro de reciclagem</string>
+	<string name="poi_recycling_hardcore">Entulho (concreto)</string>
 	<string name="poi_crossing_traffic_signals">Com semáforos</string>
 	<string name="poi_crossing_uncontrolled">Sem controle</string>
 	<string name="poi_crossing_unmarked">Desmarcado</string>
@@ -1138,9 +1138,9 @@
 	<string name="poi_brownfield">Terreno abandonado</string>
 	<string name="poi_greenfield">Terreno virgem</string>
 	<string name="poi_start_date">Data de início</string>
-	<string name="poi_wheelchair_yes">Cadeirante</string>
+	<string name="poi_wheelchair_yes">Sim</string>
 
-	<string name="poi_bunker_silo">Silo de abrigo</string>
+	<string name="poi_bunker_silo">Silo trincheira</string>
 	<string name="poi_content_silage">Conteúdo: silagem</string>
 	<string name="poi_content_water">Conteúdo: água</string>
 	<string name="poi_content_slurry">Conteúdo: chorume</string>
@@ -1259,7 +1259,7 @@
 	<string name="poi_water_point">Ponto de água</string>
 
 <string name="poi_cooling_tower">Torre de resfriamento</string>
-	<string name="poi_bicycle_parking_wall_loops">Suporte de parede</string>
+	<string name="poi_bicycle_parking_wall_loops">Suporte de roda</string>
 	<string name="poi_bicycle_parking_rack">Prateleira</string>
 	<string name="poi_deadlock">Impasse</string>
 
@@ -1288,7 +1288,7 @@
 	<string name="poi_board_type_notice">Quadro de avisos</string>
 	<string name="poi_board_type_plants">Ponto de informação: plantas</string>
 	<string name="poi_board_type_geology">Ponto de informação: geologia</string>
-	<string name="poi_board_type_public_transport">Ponto de informação: transporte público</string>
+	<string name="poi_board_type_public_transport">Transporte público</string>
 	<string name="poi_board_type_technology">Ponto de informação: tecnologia</string>
 	<string name="poi_board_type_astronomy">Ponto de informação: astronomia</string>
 
@@ -1349,8 +1349,8 @@
 	<string name="poi_internet_access_yes">Com acesso à Internet</string>
 	<string name="poi_internet_access_no">Sem acesso à Internet</string>
 
-	<string name="poi_wheelchair_no">Cadeirante: não acessível</string>
-	<string name="poi_wheelchair_limited">Cadeirante: limitado</string>
+	<string name="poi_wheelchair_no">Não</string>
+	<string name="poi_wheelchair_limited">Limitado</string>
 	<string name="poi_pump_yes">Bomba</string>
 
 	<string name="poi_debris">Escombros</string>
@@ -1786,7 +1786,7 @@
 	<string name="poi_bin_yes">Com lixeira</string>
 	<string name="poi_bin_no">Sem lixeira</string>
 
-	<string name="poi_shelter_type_public_transport">Tipo de abrigo: transporte público</string>
+	<string name="poi_shelter_type_public_transport">Transporte público</string>
 	<string name="poi_shelter_type_picnic_shelter">Tipo de abrigo: abrigo de piquenique</string>
 	<string name="poi_shelter_type_weather_shelter">Tipo de abrigo: abrigo do tempo</string>
 	<string name="poi_piste_grooming_scooter">Pista de preparação: scooter</string>
@@ -1824,7 +1824,7 @@
 	<string name="poi_shelter_type_tent">Tipo de abrigo: tenda</string>
 	<string name="poi_shelter_type_abandoned">Tipo de abrigo: abandonado</string>
 
-	<string name="poi_internet_access_type_wlan">Tipo de acesso à Internet: wifi</string>
+	<string name="poi_internet_access_type_wlan">Wi-Fi</string>
 	<string name="poi_internet_access_type_terminal">Tipo de acesso à Internet: terminal</string>
 	<string name="poi_internet_access_type_wired">Tipo de acesso à Internet: cabo</string>
 	<string name="poi_internet_access_type_public">Tipo de acesso à Internet: público</string>
@@ -1939,8 +1939,8 @@
 	<string name="poi_route_trolleybus_ref">Trólebus</string>
 	<string name="poi_route_tram_ref">Bonde</string>
 	<string name="poi_wheelchair_description">Descrição para usuários cadeirantes</string>
-	<string name="poi_ramp_wheelchair_yes">Rampa para cadeira de rodas: sim</string>
-	<string name="poi_ramp_wheelchair_no">Rampa para cadeira de rodas: não</string>
+	<string name="poi_ramp_wheelchair_yes">Rampa para cadeirantes: sim</string>
+	<string name="poi_ramp_wheelchair_no">Rampa para cadeirantes: não</string>
 	<string name="poi_route_ferry_ref">Balsa</string>
 
 	<string name="poi_route_railway_ref">Rota ferroviária</string>
@@ -2160,16 +2160,16 @@
 	<string name="poi_refugee_yes">Serviços para refugiados</string>
 	<string name="poi_refugee_no">Refugiados: não</string>
 
-	<string name="poi_social_facility_group_home">Centro social: grupo residencial</string>
-	<string name="poi_social_facility_assisted_living">Centro social: vida assistida</string>
-	<string name="poi_social_facility_outreach">Centro social: divulgação</string>
+	<string name="poi_social_facility_group_home">Moradia assistida</string>
+	<string name="poi_social_facility_assisted_living">Assistência domiciliar</string>
+	<string name="poi_social_facility_outreach">Alcance</string>
 	<string name="poi_impromptu_yes">Improvisado: sim</string>
 	<string name="poi_impromptu_no">Improvisado: não</string>
-	<string name="poi_social_facility_food_bank">Centro social: banco de alimentos</string>
-	<string name="poi_social_facility_shelter">Centro social: abrigo</string>
-	<string name="poi_social_facility_ambulatory_care">Centro social: assistência ambulatorial</string>
-	<string name="poi_social_facility_workshop">Centro social: emprego protegido</string>
-	<string name="poi_social_facility_day_care">Centro social: dia</string>
+	<string name="poi_social_facility_food_bank">Banco de alimentos</string>
+	<string name="poi_social_facility_shelter">Abrigo</string>
+	<string name="poi_social_facility_ambulatory_care">Assistência ambulatorial</string>
+	<string name="poi_social_facility_workshop">Emprego protegido</string>
+	<string name="poi_social_facility_day_care">Berçário</string>
 
 	<string name="poi_social_facility_for_senior">Centro social para idosos</string>
 	<string name="poi_social_facility_for_child">Centro social para crianças</string>
@@ -2376,17 +2376,17 @@
 	<string name="poi_conveying_yes">Transporte: Sim</string>
 
 	<string name="poi_bridge_ref">Ponte ref</string>
-	<string name="poi_tunnel_ref">Túnel ref</string>
+	<string name="poi_tunnel_ref">Ref. do túnel</string>
 
 	<string name="poi_ref">Referência</string>
 
-	<string name="poi_cargo_passengers">Carga: passageiros</string>
-	<string name="poi_cargo_vehicle">Carga: veículos</string>
-	<string name="poi_cargo_bicycle">Carga: bicicletas</string>
-	<string name="poi_cargo_container">Carga: contêineres</string>
-	<string name="poi_cargo_hgv">Carga: veículos pesados</string>
+	<string name="poi_cargo_passengers">Passageiros</string>
+	<string name="poi_cargo_vehicle">Veículos</string>
+	<string name="poi_cargo_bicycle">Bicicletas</string>
+	<string name="poi_cargo_container">Contêineres</string>
+	<string name="poi_cargo_hgv">Veículos pesados</string>
 
-	<string name="poi_fitness_station">Estação de ginástica</string>
+	<string name="poi_fitness_station">Academia ao ar livre</string>
 
 	<string name="poi_castle_type_castrum">Tipo de castelo: castra</string>
 	<string name="poi_backcountry_yes">Acampamento em zona isolada</string>
@@ -2573,8 +2573,8 @@
 	<string name="poi_judo">Judô</string>
 	<string name="poi_futsal">Futsal</string>
 	<string name="poi_squash">Squash</string>
-	<string name="poi_parking_garage_boxes">Tipo: garagem box</string>
-	<string name="poi_parking_carports">Tipo: garagem coberta</string>
+	<string name="poi_parking_garage_boxes">Box de garagem</string>
+	<string name="poi_parking_carports">Estacionamento coberto</string>
 
 	<string name="poi_dojo">Dojô</string>
 
@@ -2683,7 +2683,7 @@
 	<string name="poi_fuel_type">Tipo de combustível</string>
 	<string name="poi_fuel_avia_type">Tipo de combustível (aviação)</string>
 	<string name="poi_payment_type">Tipo de pagamento</string>
-	<string name="poi_payment_fuel_type">Tipo de pagamento</string>
+	<string name="poi_payment_fuel_type">Cartões de combustível</string>
 	<string name="poi_additional_type">Adicional</string>
 	<string name="poi_internet_access_type">Tipo de acesso à Internet</string>
 	<string name="poi_vending_type">Tipo de venda</string>
@@ -2735,7 +2735,7 @@
 
 <string name="poi_military_checkpoint">Checkpoint militar</string>
 
-	<string name="poi_bicycle_parking_lockers">Cadeados</string>
+	<string name="poi_bicycle_parking_lockers">Armários</string>
 	<string name="poi_depth">Profundidade</string>
 
 	<string name="poi_summer_camp">Acampamento de verão</string>
@@ -2770,8 +2770,8 @@
 	<string name="poi_thermometer_no">Termômetro: não</string>
 	<string name="poi_min_age">Idade mínima</string>
 
-	<string name="poi_organic_yes">Alimentos orgânicos: sim</string>
-	<string name="poi_organic_no">Alimentos orgânicos: não</string>
+	<string name="poi_organic_yes">Sim</string>
+	<string name="poi_organic_no">Não</string>
 	<string name="poi_organic_only">Somente alimentos orgânigos</string>
 
 	<string name="poi_diplomatic_consulate">Consulado</string>
@@ -2810,7 +2810,7 @@
 	<string name="poi_dish">Prato</string>
 	<string name="poi_payment_transport_type">Tipo de pagamento (transporte)</string>
 	<string name="poi_social_facility_type">Tipo</string>
-	<string name="poi_social_facility_for">Grupo-alvo</string>
+	<string name="poi_social_facility_for">Público alvo</string>
 	<string name="poi_compressed_air_filter">Ar comprimido</string>
 	<string name="poi_vacuum_cleaner_filter">Aspirador de pó</string>
 	<string name="poi_free_flying_characteristic">Característica</string>
@@ -2836,7 +2836,7 @@
 	<string name="poi_seamark_clearance_height_open">Altura livre (aberta)</string>
 	<string name="poi_seamark_clearance_width">Largura livre</string>
 
-	<string name="poi_wheelchair_accessibility">Acesso para cadeira de rodas</string>
+	<string name="poi_wheelchair_accessibility">Acesso para cadeirantes</string>
 	<string name="poi_animal_shelter_wildlife">Animais selvagens</string>
 	<string name="poi_animal_shelter_horse">Cavalos</string>
 	<string name="poi_animal_shelter_mammal">Mamíferos</string>
@@ -2872,4 +2872,683 @@
 	<string name="poi_free_flying_paragliding_yes">Parapente</string>
 	<string name="poi_outdoor_seating">Lugares ao ar livre</string>
 	<string name="poi_diaper_table_count">Fraldário</string>
+	<string name="poi_drive_in">Drive-in</string>
+	<string name="poi_drive_through">Drive-through</string>
+	<string name="poi_route_subway_ref">Metrô</string>
+
+	<string name="poi_free_flying_site_toplanding">Pouso elevado</string>
+	<string name="poi_free_flying_site_towing">Reboque</string>
+	<string name="poi_free_flying_paragliding_no">Parapente: não</string>
+	<string name="poi_free_flying_hanggliding_yes">Asa-delta</string>
+	<string name="poi_free_flying_hanggliding_no">Asa-delta: não</string>
+	<string name="poi_free_flying_rigid_yes">Rígido</string>
+	<string name="poi_free_flying_rigid_no">Asa-delta rígida: não</string>
+	<string name="poi_tanning_salon">Solário</string>
+
+	<string name="poi_sanitary_dump_station">Estação de descarga sanitária</string>
+
+	<string name="poi_medical_system_western_yes">Ocidental</string>
+	<string name="poi_medical_system_chinese_yes">Chinês tradicional</string>
+	<string name="poi_medical_system_mongolian_yes">Mongol tradicional</string>
+	<string name="poi_medical_system_tibetan_yes">Tibetano tradicional</string>
+	<string name="poi_health_service_nursing_yes">Serviço de saúde: enfermagem: sim</string>
+	<string name="poi_health_service_nursing_no">Serviço de saúde: enfermagem: não</string>
+	<string name="poi_health_service_counselling_yes">Serviço de saúde: aconselhamento: sim</string>
+	<string name="poi_health_service_counselling_no">Serviço de saúde: aconselhamento: não</string>
+	<string name="poi_health_service_examination_yes">Serviço de saúde: exame: sim</string>
+	<string name="poi_health_service_examination_no">Serviço de saúde: exame: não</string>
+	<string name="poi_health_service_child_care_yes">Serviço de saúde: cuidados infantis: sim</string>
+	<string name="poi_health_service_child_care_no">Serviço de saúde: cuidados infantis: não</string>
+	<string name="poi_health_service_prevention_yes">Serviço de saúde: prevenção: sim</string>
+	<string name="poi_health_service_prevention_no">Serviço de saúde: prevenção: não</string>
+	<string name="poi_health_service_prevention_vaccination_yes">Serviço de saúde: vacinação: sim</string>
+	<string name="poi_health_service_prevention_vaccination_no">Serviço de saúde: vacinação: não</string>
+	<string name="poi_health_service_support_yes">Serviço de saúde: apoio: sim</string>
+	<string name="poi_health_service_support_no">Serviço de saúde: apoio: não</string>
+	<string name="poi_health_service_test_yes">Serviço de saúde: teste: sim</string>
+	<string name="poi_health_service_test_no">Serviço de saúde: teste: não</string>
+
+	<string name="poi_health_facility_type_office">Consultório médico</string>
+	<string name="poi_health_facility_type_laboratory">Tipo de instalação de saúde: laboratório</string>
+	<string name="poi_health_facility_type_therapy">Tipo de instalação de saúde: terapia</string>
+	<string name="poi_health_facility_type_department">Tipo de instalação de saúde: departamento</string>
+	<string name="poi_health_facility_type_dispensary">Tipo de instalação de saúde: farmácia</string>
+	<string name="poi_health_facility_type_first_aid">Tipo de instalação de saúde: primeiros socorros</string>
+	<string name="poi_health_facility_type_nursing_home">Tipo de instalação de saúde: lar de idosos</string>
+	<string name="poi_health_facility_type_support_group_home">Tipo de instalação de saúde: casa de grupo de apoio</string>
+
+	<string name="poi_suction_point">Ponto de sucção</string>
+
+	<string name="poi_fire_hydrant_type_underground">Subterrâneo</string>
+	<string name="poi_fire_hydrant_type_pillar">Coluna</string>
+	<string name="poi_fire_hydrant_type_dry_barrel">Coluna seca</string>
+	<string name="poi_fire_hydrant_type_wall">Parede</string>
+
+	<string name="poi_health_amenity_type_first_aid_kit">Kit de primeiros socorros</string>
+	<string name="poi_toilets_disposal_flush">Eliminação de dejetos: descarga</string>
+	<string name="poi_toilets_disposal_pitlatrine">Eliminação de dejetos: latrina por poço</string>
+	<string name="poi_toilets_disposal_chemical">Eliminação de dejetos: químico</string>
+	<string name="poi_toilets_disposal_bucket">Eliminação de dejetos: balde</string>
+
+	<string name="poi_free_flying_site_orientation_n">Orientação do local para voo livre: N</string>
+	<string name="poi_free_flying_site_orientation_ne">Orientação do local para voo livre: NE</string>
+	<string name="poi_free_flying_site_orientation_e">Orientação do local para voo livre: E</string>
+	<string name="poi_free_flying_site_orientation_se">Orientação do local para voo livre: SE</string>
+	<string name="poi_free_flying_site_orientation_s">Orientação do local para voo livre: S</string>
+	<string name="poi_free_flying_site_orientation_sw">Orientação do local para voo livre: SW</string>
+	<string name="poi_free_flying_site_orientation_w">Orientação do local para voo livre: W</string>
+	<string name="poi_free_flying_site_orientation_nw">Orientação do local para voo livre: NW</string>
+	<string name="poi_free_flying_no_flight_time">Sem tempo de voo (voo livre)</string>
+	<string name="poi_free_flying_guest_guidelines_yes">Diretrizes para convidados: sim</string>
+	<string name="poi_free_flying_guest_guidelines_no">Diretrizes para convidados: não</string>
+
+	<string name="poi_medical_system_ayurveeda_yes">Ayurveda</string>
+	<string name="poi_medical_system_kampo_yes">Kampo</string>
+	<string name="poi_medical_system_sidda_yes">Sidda</string>
+	<string name="poi_medical_system_unani_yes">Unani</string>
+
+	<string name="poi_health_facility_type_field_hospital">Tipo de instalação de saúde: hospital de campanha</string>
+	<string name="poi_health_facility_type_counselling_centre">Tipo de instalação de saúde: centro de aconselhamento</string>
+	<string name="poi_fire_hydrant_type_pond">Lagoa</string>
+	<string name="poi_health_amenity_type_scales">Balanças públicas</string>
+
+	<string name="poi_health_person_type_assistant">Função do profissional de saúde: assistente</string>
+	<string name="poi_health_person_type_healer">Função do profissional de saúde: curandeiro</string>
+	<string name="poi_health_person_type_midwife">Função do profissional de saúde: parteira</string>
+	<string name="poi_health_person_type_nurse">Função do profissional de saúde: enfermeiro</string>
+	<string name="poi_health_person_type_paramedic">Função do profissional de saúde: paramédico</string>
+	<string name="poi_health_person_type_physician">Função do profissional de saúde: médico</string>
+	<string name="poi_health_person_type_podologist">Função do profissional de saúde: podologista</string>
+	<string name="poi_health_person_type_psychologist">Função do profissional de saúde: psicólogo</string>
+	<string name="poi_health_person_type_therapist">Função do profissional de saúde: terapeuta</string>
+	<string name="poi_health_person_type_physician_assitant">Função do profissional de saúde: médico assistente</string>
+	<string name="poi_health_person_type_technician">Função do profissional de saúde: técnico</string>
+	<string name="poi_health_person_type_witchdoctor">Função do profissional de saúde: bruxo</string>
+
+	<string name="poi_counselling_type_addiction_yes">Aconselhamento (vício): sim</string>
+	<string name="poi_counselling_type_addiction_no">Aconselhamento (vício): não</string>
+	<string name="poi_counselling_type_antenatal_yes">Aconselhamento (pré-natal): sim</string>
+	<string name="poi_counselling_type_antenatal_no">Aconselhamento (pré-natal): não</string>
+	<string name="poi_counselling_type_child_guidance_yes">Aconselhamento (orientação infantil): sim</string>
+	<string name="poi_counselling_type_child_guidance_no">Aconselhamento (orientação infantil): não</string>
+	<string name="poi_counselling_type_couple_yes">Aconselhamento (casal): sim</string>
+	<string name="poi_counselling_type_couple_no">Aconselhamento (casal): não</string>
+	<string name="poi_counselling_type_crisis_yes">Aconselhamento (crise): sim</string>
+	<string name="poi_counselling_type_crisis_no">Aconselhamento (crise): não</string>
+	<string name="poi_counselling_type_drugs_yes">Aconselhamento (drogas): sim</string>
+	<string name="poi_counselling_type_drugs_no">Aconselhamento (drogas): não</string>
+	<string name="poi_counselling_type_education_yes">Aconselhamento (educação): sim</string>
+	<string name="poi_counselling_type_education_no">Aconselhamento (educação): não</string>
+	<string name="poi_counselling_type_family_yes">Aconselhamento (família): sim</string>
+	<string name="poi_counselling_type_family_no">Aconselhamento (família): não</string>
+	<string name="poi_counselling_type_homeless_yes">Aconselhamento (sem-teto): sim</string>
+	<string name="poi_counselling_type_homeless_no">Aconselhamento (sem-teto): não</string>
+	<string name="poi_counselling_type_immigrant_yes">Aconselhamento (imigrante): sim</string>
+	<string name="poi_counselling_type_immigrant_no">Aconselhamento (imigrante): não</string>
+	<string name="poi_counselling_type_marriage_yes">Aconselhamento (casamento): sim</string>
+	<string name="poi_counselling_type_marriage_no">Aconselhamento (casamento): não</string>
+	<string name="poi_counselling_type_nutrition_yes">Aconselhamento (nutrição): sim</string>
+	<string name="poi_counselling_type_nutrition_nfire_hydo">Aconselhamento (nutrição): não</string>
+	<string name="poi_counselling_type_rehabilitation_yes">Aconselhamento (reabilitação): sim</string>
+	<string name="poi_counselling_type_rehabilitation_no">Aconselhamento (reabilitação): não</string>
+	<string name="poi_counselling_type_sexual_yes">Aconselhamento (sexual): sim</string>
+	<string name="poi_counselling_type_sexual_no">Aconselhamento (sexual): não</string>
+	<string name="poi_counselling_type_sexual_abuse_yes">Aconselhamento (abuso sexual): sim</string>
+	<string name="poi_counselling_type_sexual_abuse_no">Aconselhamento (abuso sexual): não</string>
+	<string name="poi_counselling_type_victim_yes">Aconselhamento (vítima): sim</string>
+	<string name="poi_counselling_type_victim_no">Aconselhamento (vítima): não</string>
+	<string name="poi_counselling_type_violence_yes">Aconselhamento (violência): sim</string>
+	<string name="poi_counselling_type_violence_no">Aconselhamento (violência): não</string>
+
+	<string name="poi_provided_for_infant_yes">Para bebês: sim</string>
+	<string name="poi_provided_for_infant_no">Para bebês: não</string>
+	<string name="poi_provided_for_toddler_yes">Para crianças pequenas: sim</string>
+	<string name="poi_provided_for_toddler_no">Para crianças pequenas: não</string>
+	<string name="poi_provided_for_child_yes">Para crianças: sim</string>
+	<string name="poi_provided_for_child_no">Para crianças: não</string>
+	<string name="poi_provided_for_adult_yes">Para adultos: sim</string>
+	<string name="poi_provided_for_adult_no">Para adultos: não</string>
+	<string name="poi_provided_for_woman_yes">Para mulheres: sim</string>
+	<string name="poi_provided_for_woman_no">Para mulheres: não</string>
+	<string name="poi_provided_for_senior_yes">Para idosos: sim</string>
+	<string name="poi_provided_for_senior_no">Para idosos: não</string>
+	<string name="poi_provided_for_girl_yes">Para meninas: sim</string>
+	<string name="poi_provided_for_girl_no">Para meninas: não</string>
+	<string name="poi_provided_for_man_yes">Para homens: sim</string>
+	<string name="poi_provided_for_man_no">Para homens: não</string>
+	<string name="poi_provided_for_boy_yes">Para meninos: sim</string>
+	<string name="poi_provided_for_boy_no">Para meninos: não</string>
+
+	<string name="poi_capacity_beds">Capacidade (leitos)</string>
+
+	<string name="poi_treat_inpatient_yes">Serviços de internamento: sim</string>
+	<string name="poi_treat_inpatient_no">Serviços de internamento: não</string>
+	<string name="poi_treat_inpatient_only">Serviços de internamento: somente</string>
+	<string name="poi_counselling_yes">Aconselhamento: sim</string>
+	<string name="poi_counselling_no">Aconselhamento: não</string>
+	<string name="poi_emergency_yes">Emergência: sim</string>
+	<string name="poi_emergency_no">Emergência: não</string>
+	<string name="poi_home_visit_yes">Sim</string>
+	<string name="poi_home_visit_no">Visita domiciliar: não</string>
+
+	<string name="poi_disease_malaria_yes">Malária: sim</string>
+	<string name="poi_disease_malaria_no">Malária: não</string>
+	<string name="poi_disease_ebola_yes">Ebola: sim</string>
+	<string name="poi_disease_ebola_no">Ebola: não</string>
+	<string name="poi_disease_autism_yes">Autismo: sim</string>
+	<string name="poi_disease_autism_no">Autismo: não</string>
+	<string name="poi_disease_aids_yes">AIDS: sim</string>
+	<string name="poi_disease_aids_no">AIDS: não</string>
+
+	<string name="poi_office_physician">Consultório médico</string>
+	<string name="poi_office_nursing_service">Serviço de enfermagem</string>
+	<string name="poi_fire_hydrant_diameter">Diâmetro do hidrante</string>
+	<string name="poi_fire_hydrant_pressure">Pressão do hidrante</string>
+	<string name="poi_fire_hydrant_count">Número de hidrantes</string>
+	<string name="poi_fire_hydrant_flow_capacity">Capacidade de vazão do hidrante</string>
+	<string name="poi_fire_hydrant_position_sidewalk">Calçada</string>
+	<string name="poi_fire_hydrant_position_green">Verde</string>
+	<string name="poi_fire_hydrant_position_lane">Faixa de rolamento</string>
+	<string name="poi_fire_hydrant_position_parking_lot">Estacionamento</string>
+	<string name="poi_fire_hydrant_position_street">Rua</string>
+	<string name="poi_fire_hydrant_position_underground">Subterrâneo</string>
+	<string name="poi_fire_hydrant_style_wsh">Estilo de hidrante: wsh</string>
+	<string name="poi_fire_hydrant_style_water_source_main">Rede de água</string>
+	<string name="poi_fire_hydrant_style_water_source_pond">Lagoa</string>
+	<string name="poi_fire_hydrant_style_water_source_stream">Ribeirão/Rio</string>
+	<string name="poi_fire_hydrant_style_water_source_cistern">Cisterna</string>
+	<string name="poi_in_service_yes">Em serviço: sim</string>
+
+	<string name="poi_street_cabinet_power">Tipo de gabinete: força</string>
+	<string name="poi_street_cabinet_telecom">Tipo de gabinete: telecom</string>
+	<string name="poi_street_cabinet_cable_tv">Tipo de gabinete: TV a cabo</string>
+	<string name="poi_street_cabinet_gas">Tipo de gabinete: gás</string>
+	<string name="poi_street_cabinet_postal_service">Tipo de gabinete: serviço postal</string>
+	<string name="poi_street_cabinet_waste">Tipo de gabinete: lixo</string>
+	<string name="poi_street_cabinet_water_management">Tipo de gabinete: gestão de água</string>
+	<string name="poi_street_cabinet_street_lighting">Tipo de gabinete: iluminação pública</string>
+
+	<string name="poi_bicycle_parking_tree">Suspenso</string>
+	<string name="poi_bicycle_parking_streetpod">De roda</string>
+
+	<string name="poi_salt_yes">Sal</string>
+	<string name="poi_salt_no">Sal: não</string>
+	<string name="poi_wheelchair_designated">Designado</string>
+	<string name="poi_spoil_heap">Rejeito de mineração</string>
+	
+	<string name="poi_crossing_activation_automatic">Ativação do cruzamento: automático</string>
+	<string name="poi_crossing_activation_local">Ativação do cruzamento: local</string>
+	<string name="poi_crossing_activation_remote">Ativação do cruzamento: remoto</string>
+	<string name="poi_crossing_barrier_no">Barreira do cruzamento: não</string>
+	<string name="poi_crossing_barrier_yes">Barreira de cruzamento</string>
+	<string name="poi_crossing_barrier_full">Barreira do cruzamento: total</string>
+	<string name="poi_crossing_barrier_half">Barreira do cruzamento: metade</string>
+	<string name="poi_crossing_barrier_double_half">Barreira do cruzamento: dupla metade</string>
+	<string name="poi_crossing_bell_yes">Sinal sonoro</string>
+	<string name="poi_crossing_bell_no">Sinal sonoro: não</string>
+	<string name="poi_crossing_light_yes">Sinal luminoso</string>
+	<string name="poi_crossing_light_no">Sinal luminoso: não</string>
+	<string name="poi_crossing_on_demand_yes">Cruzamento sob demanda</string>
+	<string name="poi_crossing_on_demand_no">Cruzamento sob demanda: não</string>
+	<string name="poi_crossing_saltire_yes">Cruz de Santo André</string>
+	<string name="poi_crossing_saltire_no">Cruz de Santo André: não</string>
+	<string name="poi_crossing_supervision_yes">Supervisão de cruzamento</string>
+	<string name="poi_crossing_supervision_no">Supervisão de cruzamento: não</string>
+	<string name="poi_crossing_supervision_attendant">Supervisão de cruzamento: atendente</string>
+	<string name="poi_crossing_supervision_camera">Supervisão de cruzamento: câmera</string>
+
+	<string name="poi_dispensing_yes">Sim</string>
+	<string name="poi_dispensing_no">Emite receitas: não</string>
+
+	<string name="poi_valley_balka">Pequeno vale</string>
+
+	<string name="poi_ventilation_shaft">Poço de ventilação</string>
+
+	<string name="poi_pump_type_beam_pump">Tipo de bomba: bomba de vareta</string>
+	<string name="poi_pump_type_india_mk_2_3">Tipo de bomba: Índia Mk II ou III&gt;</string>
+	<string name="poi_pump_type_gravity">Tipo de bomba: gravidade</string>
+	<string name="poi_pump_style_modern">Estilo de bomba: moderno</string>
+	<string name="poi_pump_style_historic">Estilo de bomba: histórico</string>
+	<string name="poi_pump_status_ok">Status da bomba: ok</string>
+	<string name="poi_pump_status_broken">Status da bomba: quebrado</string>
+	<string name="poi_pump_status_locked">Status da bomba: bloqueado</string>
+
+	<string name="poi_payment_troika_yes">Troika</string>
+	<string name="poi_telescope">Telescópio</string>
+	<string name="poi_telescope_type_optical">Óptico</string>
+	<string name="poi_telescope_type_radio">Rádio</string>
+	<string name="poi_telescope_type_gamma">Gama</string>
+	<string name="poi_greenhouse_horticulture">Horticultura em estufa</string>
+
+	<string name="poi_generator_output_electricity_yes">Saída: eletricidade</string>
+	<string name="poi_generator_output_hot_water">Potência de saída de água quente</string>
+	<string name="poi_generator_output_hot_water_yes">Saída: água quente</string>
+	<string name="poi_generator_output_steam_yes">Saída: vapor</string>
+	<string name="poi_generator_output_hot_air_yes">Saída: ar quente</string>
+	<string name="poi_generator_output_cold_water_yes">Saída: água fria</string>
+	<string name="poi_generator_output_compressed_air">Potência de saída de ar comprimido</string>
+	<string name="poi_generator_output_compressed_air_yes">Saída: ar comprimido</string>
+	<string name="poi_generator_output_vacuum_yes">Saída: vácuo</string>
+	<string name="poi_generator_output_biogas">Potência de saída do biogás</string>
+	<string name="poi_generator_output_biogas_yes">Saída: biogás</string>
+
+	<string name="poi_pumping_station">Estação de bombeamento</string>
+
+	<string name="poi_display_sundial_yes">Relógio de sol</string>
+
+	<string name="poi_hygrometer_yes">Higrômetro</string>
+	<string name="poi_hygrometer_no">Higrômetro: não</string>
+	<string name="poi_date_yes">Exibição de data</string>
+	<string name="poi_date_no">Exibição de data: não</string>
+
+	<string name="poi_support_pole">Suporte: poste</string>
+	<string name="poi_support_wall_mounted">Suporte: parede</string>
+	<string name="poi_support_tree">Suporte: árvore</string>
+	<string name="poi_support_pedestal">Suporte: pedestal</string>
+	<string name="poi_support_ground">Suporte: de chão</string>
+	<string name="poi_support_billboard">Suporte: outdoor</string>
+	<string name="poi_support_ceiling">Suporte: teto</string>
+	<string name="poi_support_suspended">Suporte: suspenso</string>
+	<string name="poi_support_roof">Suporte: telhado</string>
+	<string name="poi_support_tower">Suporte: torre</string>
+
+	<string name="poi_passenger_information_display_yes">Exibição de informação ao passageiro: sim</string>
+	<string name="poi_passenger_information_display_no">Exibição de informação ao passageiro: não</string>
+
+	<string name="poi_aquaculture">Aquicultura</string>
+	<string name="poi_aquaculture_shrimp">Aquicultura: camarão</string>
+	<string name="poi_aquaculture_fish">Aquicultura: peixes</string>
+	<string name="poi_aquaculture_mussels">Aquicultura: mexilhões</string>
+
+	<string name="poi_traffic_mirror">Espelho de tráfego</string>
+
+	<string name="poi_xmas">Natal</string>
+	<string name="poi_xmas_event">Evento natalino</string>
+	<string name="poi_xmas_market">Mercado natalino</string>
+	<string name="poi_water_purification_none">Nenhum</string>
+	<string name="poi_water_purification_chlorine">Cloro</string>
+	<string name="poi_water_purification_reverse_osmosis">Osmose reversa</string>
+	<string name="poi_water_purification_aquatabs">Pastilha purificadora</string>
+
+	<string name="poi_water_supply_water_well">Poço de água</string>
+	<string name="poi_water_supply_pipeline">Tubulação</string>
+	<string name="poi_water_supply_running_water">Água corrente</string>
+	<string name="poi_water_supply_pump">Bomba</string>
+	<string name="poi_water_supply_borehole">Poço artesiano</string>
+	<string name="poi_water_supply_water_trucking">Caminhão pipa</string>
+	<string name="poi_water_supply_water_tank">Tanque de água</string>
+	<string name="poi_water_supply_bottled_water">Água engarrafada</string>
+
+	<string name="poi_water_place_access_community">Comunidade</string>
+	<string name="poi_water_place_access_family">Família</string>
+	<string name="poi_water_place_access_multifamilies">Multifamília</string>
+
+	<string name="poi_car_yes">Carro: sim</string>
+	<string name="poi_car_no">Carro: não</string>
+	<string name="poi_bicycle_yes">Bicicleta: sim</string>
+	<string name="poi_bicycle_no">Bicicleta: não</string>
+	<string name="poi_scooter_yes">Scooter: sim</string>
+	<string name="poi_scooter_no">Scooter: não</string>
+	<string name="poi_truck_yes">Caminhão: sim</string>
+	<string name="poi_truck_no">Caminhão: não</string>
+
+	<string name="poi_parking_fee_yes">Taxa de estacionamento: sim</string>
+	<string name="poi_parking_fee_no">Taxa de estacionamento: não</string>
+	<string name="poi_parking_fee">Taxa de estacionamento</string>
+
+	<string name="poi_amperage">Amperagem</string>
+	<string name="poi_charging_station_output">Saída do eletroposto</string>
+
+	<string name="poi_map_type_topo">Tipo de mapa: topo</string>
+	<string name="poi_map_type_street">Tipo de mapa: rua</string>
+	<string name="poi_map_type_scheme">Tipo de mapa: esquema</string>
+	<string name="poi_map_type_toposcope">Tipo de mapa: toposcópio</string>
+	<string name="poi_map_size_site">Tamanho do mapa: local</string>
+	<string name="poi_map_size_city">Tamanho do mapa: cidade</string>
+	<string name="poi_map_size_region">Tamanho do mapa: região</string>
+
+	<string name="poi_charging_station_filter">Eletroposto</string>
+
+	<string name="poi_depot">Depósito</string>
+
+	<string name="poi_letter_box">Caixa postal</string>
+	<string name="poi_post_street">Rua</string>
+	<string name="poi_post_housenumber">Número da casa</string>
+	<string name="poi_post_flats">Apartamento</string>
+
+	<string name="poi_payment_centre">Centro de pagamento</string>
+	<string name="poi_money_transfer">Transferência de dinheiro</string>
+
+<string name="poi_office_therapist">Escritório de terapeuta</string>
+	<string name="poi_office_podologist">Escritório de podologista</string>
+	<string name="poi_office_healer">Escritório de curandeiro</string>
+	<string name="poi_office_psychologist">Escritório de psicólogo</string>
+	<string name="poi_office_midwife">Escritório de parteira</string>
+
+	<string name="poi_payment_troika_no">Cartão Troika não aceito</string>
+
+	<string name="poi_mdf">Quadro de distribuição principal</string>
+	<string name="poi_diplomatic_ambassadors_residence">Residência do embaixador</string>
+	<string name="poi_diplomatic_high_commission">Alto comissariado</string>
+
+	<string name="poi_fire_operator">Operador do corpo de bombeiros</string>
+
+	<string name="poi_xmas_pyramid">Pirâmide de Natal</string>
+	<string name="poi_xmas_shop">Loja de Natal</string>
+	<string name="poi_xmas_shop_christmas_tree">Loja de árvores de Natal</string>
+	<string name="poi_xmas_tree">Árvore de Natal</string>
+	<string name="poi_xmas_day_date">Natal: período para o evento</string>
+	<string name="poi_xmas_note">Natal: nota</string>
+	<string name="poi_xmas_opening_hours">Natal: horário de abertura</string>
+	<string name="poi_xmas_location">Natal: localização</string>
+	<string name="poi_xmas_url">Natal: site</string>
+
+	<string name="poi_public_bookcase">Estante pública</string>
+	<string name="poi_public_bookcase_type_phone_box">Tipo: cabine telefônica</string>
+	<string name="poi_public_bookcase_type_reading_box">Tipo: caixa de leitura</string>
+	<string name="poi_public_bookcase_type_wooden_cabinet">Tipo: gabinete de madeira</string>
+	<string name="poi_public_bookcase_type_metal_cabinet">Tipo: gabinete de metal</string>
+	<string name="poi_public_bookcase_type_shelf">Tipo: prateleira</string>
+
+	<string name="poi_cuisine_pizza">Pizza</string>
+	<string name="poi_cuisine_burger">Hambúrguer</string>
+	<string name="poi_cuisine_coffee">Café</string>
+	<string name="poi_cuisine_sandwich">Sanduíche</string>
+	<string name="poi_cuisine_kebab">Kebab</string>
+	<string name="poi_cuisine_doner">Döner kebab (shawarma)</string>
+	<string name="poi_cuisine_chicken">Frango</string>
+	<string name="poi_cuisine_ice_cream">Sorvete</string>
+	<string name="poi_cuisine_sushi">Sushi</string>
+	<string name="poi_cuisine_fish_and_chips">Peixes e fritas</string>
+	<string name="poi_cuisine_seafood">Frutos do mar</string>
+	<string name="poi_cuisine_barbecue">Churrasco</string>
+	<string name="poi_cuisine_noodle">Macarrão</string>
+	<string name="poi_cuisine_donut">Donut</string>
+	<string name="poi_cuisine_ramen">Ramen</string>
+	<string name="poi_cuisine_crepe">Crepe</string>
+	<string name="poi_cuisine_breakfast">Café da manhã</string>
+	<string name="poi_cuisine_beef_bowl">Gyudon</string>
+	<string name="poi_cuisine_steak">Bife</string>
+	<string name="poi_cuisine_tapas">Tapas</string>
+	<string name="poi_cuisine_gastropub">Gastropub</string>
+	<string name="poi_cuisine_heuriger">Heuriger</string>
+	<string name="poi_cuisine_curry">Curry</string>
+	<string name="poi_cuisine_buschenschank">Buschenschank</string>
+	<string name="poi_cuisine_grill">Grill</string>
+	<string name="poi_cuisine_bagel">Bagel</string>
+	<string name="poi_cuisine_diner">Diner</string>
+	<string name="poi_cuisine_sausage">Linguiças</string>
+	<string name="poi_cuisine_cake">Bolos</string>
+	<string name="poi_cuisine_pancake">Panquecas</string>
+	<string name="poi_cuisine_pasta">Massas</string>
+	<string name="poi_cuisine_fast_food">Fast food</string>
+	<string name="poi_cuisine_juice">Sucos</string>
+	<string name="poi_cuisine_soba">Soba</string>
+	<string name="poi_cuisine_fine_dining">Jantar fino</string>
+	<string name="poi_cuisine_tea">Chás</string>
+	<string name="poi_cuisine_tea_shop">Loja de chás</string>
+	<string name="poi_cuisine_soup">Sopas</string>
+	<string name="poi_cuisine_pie">Tortas</string>
+	<string name="poi_cuisine_hotdog">Cachorro-quente</string>
+	<string name="poi_cuisine_deli">Delicatesse</string>
+	<string name="poi_cuisine_salad">Saladas</string>
+	<string name="poi_cuisine_frozen_yogurt">Iogurte gelado</string>
+	<string name="poi_cuisine_fried_food">Comida frita</string>
+	<string name="poi_cuisine_savory_pancakes">Panquecas salgadas</string>
+	<string name="poi_cuisine_bistro">Bistrô</string>
+	<string name="poi_cuisine_bakery">Padaria</string>
+	<string name="poi_cuisine_couscous">Cuscuz</string>
+	<string name="poi_cuisine_fried_chicken">Frango frito</string>
+	<string name="poi_cuisine_dessert">Sobremesas</string>
+	<string name="poi_cuisine_canteen">Cantina</string>
+	<string name="poi_cuisine_tacos">Tacos</string>
+	<string name="poi_cuisine_piadina">Piadina</string>
+	<string name="poi_cuisine_falafel">Falafel</string>
+	<string name="poi_cuisine_smoothie">Smoothie</string>
+	<string name="poi_cuisine_souvlaki">Souvlaki</string>
+	<string name="poi_cuisine_snack">Salgados</string>
+	<string name="poi_cuisine_yogurt">Iogurtes</string>
+	<string name="poi_cuisine_gyros">Gyros</string>
+	<string name="poi_cuisine_empanada">Empanadas</string>
+	<string name="poi_cuisine_crepes">Crepes</string>
+	<string name="poi_cuisine_yakiniku">Yakiniku</string>
+	<string name="poi_cuisine_suki">Suki</string>
+	<string name="poi_cuisine_udon">Udon</string>
+	<string name="poi_cuisine_brasserie">Brasserie</string>
+	<string name="poi_cuisine_bubble_tea">Chá de bolhas</string>
+	<string name="poi_cuisine_yakitori">Yakitori</string>
+	<string name="poi_cuisine_sagardotegia">Sagardotegia</string>
+	<string name="poi_cuisine_meat">Carnes</string>
+	<string name="poi_cuisine_wings">Asas</string>
+	<string name="poi_cuisine_waffle">Waffles</string>
+	<string name="poi_cuisine_chocolate">Chocolate</string>
+	<string name="poi_cuisine_wine">Vinhos</string>
+	<string name="poi_cuisine_potato">Batatas</string>
+	<string name="poi_cuisine_brunch">Brunch</string>
+	<string name="poi_cuisine_sub">Sub</string>
+	<string name="poi_cuisine_pita">Pita</string>
+	<string name="poi_cuisine_fondue">Fondue</string>
+	<string name="poi_cuisine_baguette">Baguetes</string>
+	<string name="poi_cuisine_pastel">Pastel</string>
+	<string name="poi_cuisine_burrito">Burritos</string>
+	<string name="poi_cuisine_teriyaki">Teriyaki</string>
+	<string name="poi_cuisine_shawarma">Xauarma</string>
+
+	<string name="poi_cuisine_regional">Regional</string>
+	<string name="poi_cuisine_italian">Italiana</string>
+	<string name="poi_cuisine_chinese">Chinês</string>
+	<string name="poi_cuisine_mexican">Mexicana</string>
+	<string name="poi_cuisine_japanese">Japonesa</string>
+	<string name="poi_cuisine_german">Alemã</string>
+	<string name="poi_cuisine_indian">Indiana</string>
+	<string name="poi_cuisine_american">Americana</string>
+	<string name="poi_cuisine_asian">Asiática</string>
+	<string name="poi_cuisine_french">Francesa</string>
+	<string name="poi_cuisine_greek">Grega</string>
+	<string name="poi_cuisine_thai">Tailandesa</string>
+	<string name="poi_cuisine_international">Internacional</string>
+	<string name="poi_cuisine_turkish">Turca</string>
+	<string name="poi_cuisine_spanish">Espanhola</string>
+	<string name="poi_cuisine_vietnamese">Vietnamita</string>
+	<string name="poi_cuisine_korean">Coreana</string>
+	<string name="poi_cuisine_mediterranean">Mediterrânea</string>
+	<string name="poi_cuisine_bavarian">Bávara</string>
+	<string name="poi_cuisine_lebanese">Libanesa</string>
+	<string name="poi_cuisine_russian">Russa</string>
+	<string name="poi_cuisine_filipino">Filipina</string>
+	<string name="poi_cuisine_portuguese">Portuguesa</string>
+	<string name="poi_cuisine_georgian">Georgiana</string>
+	<string name="poi_cuisine_polish">Polonesa</string>
+	<string name="poi_cuisine_brazilian">Brasileira</string>
+	<string name="poi_cuisine_arab">Árabe</string>
+	<string name="poi_cuisine_danish">Dinamarquesa</string>
+	<string name="poi_cuisine_indonesian">Indonésia</string>
+	<string name="poi_cuisine_african">Africana</string>
+	<string name="poi_cuisine_caribbean">Caribenha</string>
+	<string name="poi_cuisine_argentinian">Argentina</string>
+	<string name="poi_cuisine_balkan">Balcã</string>
+	<string name="poi_cuisine_peruvian">Peruana</string>
+	<string name="poi_cuisine_croatian">Croata</string>
+	<string name="poi_cuisine_bolivian">Boliviana</string>
+	<string name="poi_cuisine_malagasy">Malgaxe</string>
+	<string name="poi_cuisine_persian">Persa</string>
+	<string name="poi_cuisine_moroccan">Marroquina</string>
+	<string name="poi_cuisine_austrian">Austríaca</string>
+	<string name="poi_cuisine_malaysian">Malaia</string>
+	<string name="poi_cuisine_irish">Irlandesa</string>
+	<string name="poi_cuisine_ethiopian">Etíope</string>
+	<string name="poi_cuisine_hungarian">Húngara</string>
+	<string name="poi_cuisine_lao">Laociana</string>
+	<string name="poi_cuisine_european">Europeia</string>
+	<string name="poi_cuisine_uzbek">Uzbeque</string>
+	<string name="poi_cuisine_czech">Tcheca</string>
+	<string name="poi_cuisine_cuban">Cubana</string>
+	<string name="poi_cuisine_british">Britânica</string>
+	<string name="poi_cuisine_latin_american">Latino-americana</string>
+	<string name="poi_cuisine_nepalese">Nepalesa</string>
+	<string name="poi_cuisine_mongolian">Mongol</string>
+	<string name="poi_cuisine_middle_eastern">Oriente Médio</string>
+	<string name="poi_cuisine_ukrainian">Ucraniana</string>
+	<string name="poi_cuisine_afghan">Afegã</string>
+	<string name="poi_cuisine_belgian">Belga</string>
+	<string name="poi_cuisine_basque">Basca</string>
+	<string name="poi_cuisine_swiss">Suíça</string>
+	<string name="poi_cuisine_cantonese">Cantonesa</string>
+	<string name="poi_cuisine_swedish">Sueca</string>
+	<string name="poi_cuisine_jamaican">Jamaicana</string>
+	<string name="poi_cuisine_armenian">Armênia</string>
+	<string name="poi_cuisine_hawaiian">Havaiana</string>
+	<string name="poi_cuisine_english">Inglesa</string>
+	<string name="poi_cuisine_pakistani">Paquistanesa</string>
+	<string name="poi_cuisine_taiwanese">Taiwanesa</string>
+	<string name="poi_cuisine_tex_mex">Tex-mex</string>
+	<string name="poi_cuisine_dutch">Holandesa</string>
+	<string name="poi_cuisine_syrian">Síria</string>
+	<string name="poi_cuisine_australian">Australiana</string>
+	<string name="poi_cuisine_cajun">Cajun</string>
+	<string name="poi_cuisine_egyptian">Egípcio</string>
+	<string name="poi_cuisine_senegalese">Senegalesa</string>
+	<string name="poi_cuisine_jewish">Judaica</string>
+	<string name="poi_cuisine_bulgarian">Búlgara</string>
+	<string name="poi_cuisine_tibetan">Tibetana</string>
+
+	<string name="poi_feeding_place">Lugar para alimentação de animais</string>
+
+	<string name="poi_party">Artigos de festas</string>
+	<string name="poi_electrical">Loja de materiais elétricos</string>
+	<string name="poi_locksmith">Chaveiro</string>
+	<string name="poi_lottery">Casa lotérica</string>
+	<string name="poi_gambling_type">Tipo</string>
+	<string name="poi_gambling_lottery">Loteria</string>
+	<string name="poi_locomotive">Locovotiva</string>
+
+	<string name="poi_nutrition_supplements">Suplementos de nutrição</string>
+	<string name="poi_photo_studio">Estúdio de fotografia</string>
+
+	<string name="poi_cliff">Penhasco</string>
+
+	<string name="poi_animal_keeping">Viveiro de animais</string>
+	<string name="poi_animal_keeping_horse">Viveiro de animais: cavalo</string>
+	<string name="poi_animal_keeping_sheep">Viveiro de animais: ovelha</string>
+	<string name="poi_animal_keeping_type_paddock">Tipo: cercado</string>
+	<string name="poi_animal_keeping_type_open_stable">Tipo: estábulo aberto</string>
+
+	<string name="poi_tower_construction_lattice">Construção: treliça</string>
+	<string name="poi_tower_construction_freestanding">Construção: autônoma</string>
+	<string name="poi_tower_construction_dish">Construção: parabólica</string>
+	<string name="poi_tower_construction_dome">Construção: cúpula</string>
+	<string name="poi_tower_construction_concealed">Construção: escondido</string>
+
+	<string name="poi_railway_yard">Pátio ferroviário</string>
+
+	<string name="poi_fast_food_cafeteria">Sim</string>
+
+	<string name="poi_drink_wine_yes">Vinho: sim</string>
+	<string name="poi_drink_wine_retail">Vinho: varejo</string>
+	<string name="poi_drink_wine_served">Vinho servido</string>
+
+	<string name="poi_energy_supplier">Escritório de fornecedor de energia</string>
+
+	<string name="poi_electronics_repair_computer">Reparo de eletrônicos: computadores</string>
+	<string name="poi_electronics_repair_appliance">Reparo de eletrônicos: eletrodomésticos</string>
+	<string name="poi_electronics_repair_phone">Reparo de eletrônicos: telefone</string>
+	<string name="poi_electronics_repair_tv">Reparo de eletrônicos: TV</string>
+
+	<string name="poi_resort_kids_camp">Acampamento de crianças</string>
+	<string name="poi_music_school">Escola de música</string>
+	<string name="poi_language_school">Escola de idiomas</string>
+
+	<string name="poi_lighting">Luminárias</string>
+	<string name="poi_gambling">Local de jogos de azar</string>
+
+	<string name="poi_gambling_pachinko">Pachinko</string>
+	<string name="poi_gambling_slot_machines">Caça-niqueis</string>
+	<string name="poi_gambling_betting">Apostas</string>
+	<string name="poi_gambling_bingo">Bingo</string>
+
+	<string name="poi_e_cigarette">Loja de cigarros eletrônicos</string>
+
+	<string name="poi_coworking_space">Espaço de coworking</string>
+
+	<string name="poi_life_ring">Boia salva-vidas</string>
+
+	<string name="poi_zoo_petting_zoo">Zoológico interativo</string>
+	<string name="poi_zoo_wildlife_park">Reserva natural</string>
+	<string name="poi_zoo_enclosure">Cativeiro</string>
+	<string name="poi_zoo_safari_park">Parque safári</string>
+	<string name="poi_zoo_birds">Aves</string>
+	<string name="poi_zoo_aviary">Aviário</string>
+	<string name="poi_zoo_falconry">Falcoaria</string>
+	<string name="poi_zoo_reptile">Répteis</string>
+
+	<string name="poi_stands">Estandes</string>
+
+	<string name="poi_motorcycle_sales_yes">Vendas</string>
+	<string name="poi_motorcycle_sales_no">Vendas: não</string>
+	<string name="poi_motorcycle_sales_yes_used">Vendas: sim; usado</string>
+	<string name="poi_motorcycle_sales_used">Vendas: usado</string>
+	<string name="poi_motorcycle_rental_yes">Locação</string>
+	<string name="poi_motorcycle_rental_no">Locação: não</string>
+	<string name="poi_motorcycle_repair_yes">Reparo</string>
+	<string name="poi_motorcycle_repair_no">Reparo: não</string>
+	<string name="poi_motorcycle_parts_yes">Peças</string>
+	<string name="poi_motorcycle_parts_no">Peças: não</string>
+	<string name="poi_motorcycle_tyres_yes">Pneus</string>
+	<string name="poi_motorcycle_tyres_no">Pneus: não</string>
+	<string name="poi_motorcycle_clothes_yes">Roupas para moto</string>
+	<string name="poi_motorcycle_clothes_no">Roupas para moto: não</string>
+	<string name="poi_motorcycle_type_scooter">Lambreta</string>
+	<string name="poi_motorcycle_type_sportbike">Esportiva</string>
+	<string name="poi_motorcycle_type_chopper">Chopper</string>
+	<string name="poi_motorcycle_type_offroad">Off-road</string>
+	<string name="poi_motorcycle_type_dualsport">Trail</string>
+	<string name="poi_motorcycle_type_standard">Comum</string>
+
+	<string name="poi_generator_output_electricity_no">Saída (eletricidade): não</string>
+
+	<string name="poi_owner">Proprietário</string>
+
+	<string name="poi_animal_shelter_purpose_adoption_yes">Adoção: sim</string>
+	<string name="poi_animal_shelter_purpose_adoption_no">Adoção: não</string>
+	<string name="poi_animal_shelter_purpose_release_yes">Soltura: sim</string>
+	<string name="poi_animal_shelter_purpose_release_no">Soltura: não</string>
+
+	<string name="poi_spaceport">Bases de lançamento</string>
+
+	<string name="poi_direction_n">Direção: norte</string>
+	<string name="poi_direction_nne">Direção: norte-nordeste</string>
+	<string name="poi_direction_ne">Direção: nordeste</string>
+	<string name="poi_direction_ene">Direção: leste-nordeste</string>
+	<string name="poi_direction_e">Direção: leste</string>
+	<string name="poi_direction_ese">Direção: leste-sudeste</string>
+	<string name="poi_direction_se">Direção: sudeste</string>
+	<string name="poi_direction_sse">Direção: sul-sudeste</string>
+	<string name="poi_direction_s">Direção: sul</string>
+	<string name="poi_direction_ssw">Direção: sul-sudeste</string>
+	<string name="poi_direction_sw">Direção: sudoeste</string>
+	<string name="poi_direction_wsw">Direção: oeste-sudoeste</string>
+	<string name="poi_direction_w">Direção: oeste</string>
+	<string name="poi_direction_wnw">Direção: oeste-noroeste</string>
+	<string name="poi_direction_nw">Direcção: noroeste</string>
+	<string name="poi_direction_nnw">Direção: norte-noroeste</string>
+	<string name="poi_direction_forward">Direção: para frente</string>
+	<string name="poi_direction_backward">Direção: para trás</string>
+	<string name="poi_direction_clockwise">Direção: sentido horário</string>
+	<string name="poi_direction_anticlockwise">Direção: sentido anti-horário</string>
+	<string name="poi_direction_up">Direção: para cima</string>
+	<string name="poi_direction_down">Direção: para baixo</string>
+	<string name="poi_direction_entrance">Direção: entrada</string>
+	<string name="poi_direction_exit">Direção: saída</string>
+	<string name="poi_direction_all">Direção: todas</string>
+
+	<string name="poi_reservation_required">Reserva: requerida</string>
+	<string name="poi_reservation_recommended">Reserva: recomendada</string>
+	<string name="poi_reservation_yes">Reserva: sim</string>
+	<string name="poi_reservation_no">Reserva: não</string>
+	<string name="poi_reservation_members_only">Reserva: somente membros</string>
+
+	<string name="poi_beds">Leitos</string>
+
+	<string name="poi_boat_rental">Locação de barcos</string>
+	<string name="poi_government_treasury">Tesouro</string>
 	</resources>
diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 2ba307cb8c..49b8489c9d 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -43,9 +43,9 @@
     <string name="osm_changes_added_to_local_edits">Mudanças no OSM adicionadas ao conjunto de alterações locais</string>
    	<string name="mark_to_delete">Selecione para apagar</string>
 	<string name="osmo_grop_name_length_alert">O nome do grupo deve ter pelo menos 3 caracteres!</string>
-	<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d mudanças ao OSM. Tem certeza?</string>
+	<string name="local_osm_changes_upload_all_confirm">Você enviará %1$d alterações ao OSM. Tem certeza?</string>
     <string name="confirmation_to_clear_history">Você quer limpar o histórico?</string>
-    <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer na tela de planejamento de rota</string>
+    <string name="delay_to_start_navigation_descr">Especifique o tempo de espera para permanecer na tela de planejamento de rota.</string>
     <string name="delay_to_start_navigation">Iniciar navegação curva a curva depois de…</string>
     <string name="shared_string_go">Ir</string>
 	<string name="osmand_parking_overdue">vencido</string>
@@ -62,8 +62,9 @@
     <string name="waypoint_visit_before">Passar antes</string>
     <string name="simulate_your_location">Simular rota</string>
     <string name="drawer">Lista simples</string>
-    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
-    <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras</string>
+    <string name="short_location_on_map">Lat %1$s
+\nLon %2$s</string>
+    <string name="tips_and_tricks_descr">Respostas às perguntas frequentes, mudanças recentes e outras.</string>
     <string name="routing_settings_2">Configurações de navegação</string>
     <string name="general_settings_2">Configurações gerais</string>
 	<string name="shared_string_ellipsis">…</string>
@@ -2228,7 +2229,7 @@ Pôr do Sol: %2$s</string>
     <string name="private_access_routing_req">Seu destino está localizado em uma área de acesso privado. Você quer permitir acesso à estradas privadas para esta viagem?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
     <string name="increase_search_radius">Aumentar o raio de busca</string>
-    <string name="nothing_found">Não encontrou nada :(</string>
+    <string name="nothing_found">Nada encontrado :(</string>
     <string name="nothing_found_descr">Modificar o texto da pesquisa ou aumentar o raio de busca.</string>
     <string name="quick_action_showhide_osmbugs_title">Mostrar/ocultar Anotações do OSM</string>
     <string name="quick_action_osmbugs_show">Mostrar Anotações do OSM</string>
@@ -2507,11 +2508,11 @@ Pôr do Sol: %2$s</string>
     <string name="context_menu_read_full_article">Leia o artigo completo</string>
     <string name="context_menu_read_article">Leia o artigo</string>
     <string name="context_menu_points_of_group">Todos os pontos do grupo</string>
-    <string name="opened_from">Aberto a partir de</string>
-    <string name="opened_till">Aberto até</string>
-    <string name="will_be_closed_at">Fechará às</string>
-    <string name="will_be_opened_at">Abrirá às</string>
-    <string name="will_be_opened_on">Ficará aberto aos/às</string>
+    <string name="open_from">Aberto a partir de</string>
+    <string name="open_till">Aberto até</string>
+    <string name="will_close_at">Fechará às</string>
+    <string name="will_open_at">Abrirá às</string>
+    <string name="will_open_on">Ficará aberto aos/às</string>
     <string name="additional_actions">Ações adicionais</string>
     <string name="av_locations_selected_desc">Arquivo GPX com coordenadas e dados das notas selecionadas.</string>
     <string name="shared_string_actions">Ações</string>
@@ -2696,4 +2697,5 @@ Pôr do Sol: %2$s</string>
     <string name="import_track">Importar trajeto</string>
     <string name="move_point">Mover Ponto</string>
     <string name="osm_recipients_label">Destinatários OSM</string>
+    <string name="osmand_plus_extended_description_part6">Recursos de ciclismo e pedestre • Visualização de caminhos a pé, pistas de caminhadas e ciclovias, ideal para atividades ao ar livre • Roteamento e modos de exibição especiais para bicicleta e pedestres • Paradas de transporte público opcionais (ônibus, troleibus, trem) incluindo nomes de linhas • Gravação opcional de viagem para arquivo GPX local ou serviço on-line • Exibição opcional de velocidade e altitudes • Exibição de curvas de nível e sombreamento de relevo (via plugin adicional)</string>
     </resources>
diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index d5f81e40fb..f09b98da08 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1903,7 +1903,7 @@
     <string name="rendering_value__name">По умолчанию</string>
     <string name="rendering_value_highContrastRoads_name">Высокий контраст</string>
     <string name="storage_directory_default">Внутренняя память</string>
-    <string name="specified_directiory_not_writeable">Не возможно создать карты в указанном каталоге</string>
+    <string name="specified_directiory_not_writeable">Невозможно создать карты в указанном каталоге</string>
     <string name="copying_osmand_file_failed">Не удалось переместить файлы</string>
     <string name="storage_directory_external">Внешнее хранилище</string>
     <string name="storage_directory_multiuser">Многопользовательское хранилище</string>
@@ -2799,11 +2799,11 @@
     <string name="context_menu_read_full_article">Читать статью целиком</string>
     <string name="context_menu_read_article">Читать статью</string>
     <string name="context_menu_points_of_group">Все точки группы</string>
-    <string name="opened_from">Открыто с</string>
-    <string name="opened_till">Открыто до</string>
-    <string name="will_be_closed_at">Закроется в</string>
-    <string name="will_be_opened_at">Откроется в</string>
-    <string name="will_be_opened_on">Откроется</string>
+    <string name="open_from">Открыто с</string>
+    <string name="open_till">Открыто до</string>
+    <string name="will_close_at">Закроется в</string>
+    <string name="will_open_at">Откроется в</string>
+    <string name="will_open_on">Откроется</string>
     <string name="additional_actions">Дополнительные действия</string>
     <string name="shared_string_actions">Действия</string>
     <string name="shared_string_marker">Маркер</string>
diff --git a/OsmAnd/res/values-sc/strings.xml b/OsmAnd/res/values-sc/strings.xml
index d05b0d7aec..67877e97a9 100644
--- a/OsmAnd/res/values-sc/strings.xml
+++ b/OsmAnd/res/values-sc/strings.xml
@@ -2899,11 +2899,11 @@ Pro praghere iscrie su còdighe intreu</string>
     <string name="context_menu_read_full_article">Leghe s\'artìculu intreu</string>
     <string name="context_menu_read_article">Leghe s\'artìculu</string>
     <string name="context_menu_points_of_group">Totu sos puntos de su grupu</string>
-    <string name="opened_from">Abertu dae sas</string>
-    <string name="opened_till">Abertu finas a sas</string>
-    <string name="will_be_closed_at">At a serrare a sas</string>
-    <string name="will_be_opened_at">At a abèrrere a sas</string>
-    <string name="will_be_opened_on">At a èssere abertu</string>
+    <string name="open_from">Abertu dae sas</string>
+    <string name="open_till">Abertu finas a sas</string>
+    <string name="will_close_at">At a serrare a sas</string>
+    <string name="will_open_at">At a abèrrere a sas</string>
+    <string name="will_open_on">At a èssere abertu</string>
     <string name="additional_actions">Atziones additzionales</string>
     <string name="av_locations_selected_desc">Documentu GPX cun coordinatas e datos de sas notas ichertadas.</string>
     <string name="av_locations_all_desc">Documentu GPX cun coordinatas e datos de totu sas notas.</string>
diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 189709d370..7135f2e016 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2996,11 +2996,11 @@ Zodpovedá oblasti: %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Prečítať celý článok</string>
     <string name="context_menu_read_article">Prečítať článok</string>
     <string name="context_menu_points_of_group">Všetky body skupiny</string>
-    <string name="opened_from">Otvorené od</string>
-    <string name="opened_till">Otvorené do</string>
-    <string name="will_be_closed_at">Bude zatvorené o</string>
-    <string name="will_be_opened_at">Bude otvorené o</string>
-    <string name="will_be_opened_on">Bude otvorené v</string>
+    <string name="open_from">Otvorené od</string>
+    <string name="open_till">Otvorené do</string>
+    <string name="will_close_at">Bude zatvorené o</string>
+    <string name="will_open_at">Bude otvorené o</string>
+    <string name="will_open_on">Bude otvorené v</string>
     <string name="additional_actions">Ďalšie akcie</string>
     <string name="av_locations_selected_desc">Súbor GPX so súradnicami a údajmi vybraných poznámok.</string>
     <string name="av_locations_all_desc">Súbor GPX so súradnicami a údajmi všetkých poznámok.</string>
diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml
index d0dcf58502..d963750132 100644
--- a/OsmAnd/res/values-sl/strings.xml
+++ b/OsmAnd/res/values-sl/strings.xml
@@ -2984,11 +2984,11 @@ Koda predstavlja območje: %1$s x %2$s</string>
     <string name="context_menu_read_full_article">Preberi celotno objavo</string>
     <string name="context_menu_read_article">Preberi objavo</string>
     <string name="context_menu_points_of_group">Vse točke skupine</string>
-    <string name="opened_from">Odprto od</string>
-    <string name="opened_till">Odprto do</string>
-    <string name="will_be_closed_at">Zapre se ob</string>
-    <string name="will_be_opened_at">Odpre se ob</string>
-    <string name="will_be_opened_on">Odprto bo na</string>
+    <string name="open_from">Odprto od</string>
+    <string name="open_till">Odprto do</string>
+    <string name="will_close_at">Zapre se ob</string>
+    <string name="will_open_at">Odpre se ob</string>
+    <string name="will_open_on">Odprto bo na</string>
     <string name="additional_actions">Dodatna dejanja</string>
     <string name="av_locations_selected_desc">Datoteka GPX s koordinatami in podatki izbranih sporočil.</string>
     <string name="av_locations_all_desc">Datoteka GPX s koordinatami in podatki vseh sporočil.</string>
diff --git a/OsmAnd/res/values-sr/phrases.xml b/OsmAnd/res/values-sr/phrases.xml
index a6b3daec93..e00d19cc75 100644
--- a/OsmAnd/res/values-sr/phrases.xml
+++ b/OsmAnd/res/values-sr/phrases.xml
@@ -1,2 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="poi_fuel_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_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_highway_crossing_type">Врста</string>
+	<string name="poi_service_car">Одржавање</string>
+	</resources>
diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index d30261fc5a..c5b85ce304 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -1100,8 +1100,8 @@
     <string name="osmo_share_location">Дели</string>
     <string name="osmo_pause_location">Застанак</string>
     <string name="osmo_service_running">Услуга ОсМа ради</string>
-    <string name="trip_rec_notification_settings">Снимање путовања (без података)</string>
-    <string name="trip_rec_notification_settings_desc">Приказуј обавештење које омогућава снимање путовања притиском на дугме Снимај</string>
+    <string name="trip_rec_notification_settings">Омогући снимање почетка кретања</string>
+    <string name="trip_rec_notification_settings_desc">Приказуј обавештење које омогућава покретање снимања путовања.</string>
     <string name="shared_string_notifications">Обавештења</string>
     <string name="shared_string_continue">Настави</string>
     <string name="shared_string_pause">Застанак</string>
@@ -1112,11 +1112,11 @@
     <string name="release_2_5"/>
     <string name="rendering_attr_contourColorScheme_description">Образац боја линија обриса</string>
     <string name="save_track_min_speed">Најмања брзина бележења</string>
-    <string name="save_track_min_speed_descr">Филтер: Постави најмању брзину при којој ће тачка бити записана</string>
+    <string name="save_track_min_speed_descr">Услов: Постави најмању брзину при којој ће тачка бити записана</string>
     <string name="save_track_min_distance">Најмањи померај бележења</string>
-    <string name="save_track_min_distance_descr">Филтер: Постави најмање растојање од последњег положаја за бележење тачке</string>
+    <string name="save_track_min_distance_descr">Услов: Постави најмање растојање од последњег положаја за бележење тачке.</string>
     <string name="save_track_precision">Најмања тачност бележења</string>
-    <string name="save_track_precision_descr">Постави најмању прецизност за бележење тачке</string>
+    <string name="save_track_precision_descr">Постави најмању прецизност за бележење тачке.</string>
     <string name="christmas_poi">Божићне тачке</string>
     <string name="christmas_desc">Учешће у празницима Божића и Нове Године, можете изабрати приказ тачака занимања придружених Божићу: Бадњаке, јелке, трговине, итд.</string>
     <string name="christmas_desc_q">Приказуј божићне тачке занимања?</string>
@@ -1168,7 +1168,7 @@
     <string name="update_all_maps_now">Желите ли освежити све карте сада?</string>
     <string name="clear_tile_data">Очисти све плочице</string>
     <string name="routing_attr_short_way_name">Пут који штеди гориво</string>
-    <string name="routing_attr_short_way_description">Користи пут који штеди гориво (обично краћи)</string>
+    <string name="routing_attr_short_way_description">Користи пут који штеди гориво (обично краћи).</string>
     <string name="replace_favorite_confirmation">Да ли сте сигурни да желите заменити омиљени %1$s?</string>
     <string name="rendering_attr_hideOverground_name">Надземне грађевине</string>
     <string name="shared_string_change">Измени</string>
@@ -1276,7 +1276,7 @@
     <string name="shared_string_toolbar">Трака прибора</string>
     <string name="shared_string_widgets">Справице</string>
     <string name="upload_osm_note_description">Можете отпремити своју белешку ОСМ-а тајно коришћењем свог налога OpenStreetMap.org-а.</string>
-    <string name="show_legacy_search_desc">Дозволи стару претрагу у списку полице</string>
+    <string name="show_legacy_search_desc">Дозволи стару претрагу у списку полице.</string>
     <string name="routing_attr_allow_motorway_name">Дозволи употребу путева за моторна возила</string>
     <string name="routing_attr_allow_motorway_description">Дозволи употребу путева за моторна возила</string>
     <string name="map_widget_magnetic_bearing">Магнетно вретено</string>
@@ -1374,14 +1374,14 @@
     <string name="favorite_group_name">Име групе</string>
     <string name="change_color">Промени боју</string>
     <string name="edit_name">Промени име</string>
-    <string name="animate_my_location">Симулирај моју позицију</string>
+    <string name="animate_my_location">Оживи мој положај</string>
     <string name="shared_string_install">Угради</string>
     <string name="online_photos">Слике на мрежи</string>
     <string name="shared_string_add_photos">Додај слике</string>
-    <string name="no_photos_descr">Нема слика овог положаја</string>
+    <string name="no_photos_descr">Нема слика овог положаја.</string>
     <string name="mapillary_action_descr">Учествујте својим прегледима на нивоу улица овог положаја са Мапиларом.</string>
     <string name="mapillary_widget">Справица Мапилара</string>
-    <string name="mapillary_widget_descr">Омогућава брзи допринос Мапилару</string>
+    <string name="mapillary_widget_descr">Омогућава брзи допринос Мапилару.</string>
     <string name="open_mapillary">Отвори Мапилар</string>
     <string name="mapillary_descr">Мрежне слике улица за све. Откријте места, сарађујте, освојите свет.</string>
     <string name="mapillary">Мапилар</string>
@@ -1390,7 +1390,7 @@
     <string name="restart_search">Препокрени претрагу</string>
     <string name="increase_search_radius">Повећај област претраге</string>
     <string name="nothing_found">Нема ничег пронађеног :(</string>
-    <string name="nothing_found_descr">Преправите упит претраге или увећајте област претраге</string>
+    <string name="nothing_found_descr">Преправите упит претраге или увећајте област претраге.</string>
     <string name="quick_action_showhide_osmbugs_title">Приказ/скривање белешки ОСМ-а</string>
     <string name="quick_action_osmbugs_show">Прикажи белешке ОСМ-а</string>
     <string name="quick_action_osmbugs_hide">Сакриј белешке ОСМ-а</string>
@@ -1403,8 +1403,8 @@
     <string name="srtm_color_scheme">Образац боја</string>
     <string name="show_from_zoom_level">Приказ од разине увећања</string>
     <string name="routing_attr_allow_private_name">Дозволи лични приступ</string>
-    <string name="routing_attr_allow_private_description">Дозволи приступ области личне својине</string>
-    <string name="animate_my_location_desc">Омогући оживљавање мог положаја за време навођења</string>
+    <string name="routing_attr_allow_private_description">Дозволи приступ областима личних поседа.</string>
+    <string name="animate_my_location_desc">Омогући оживљавање мог положаја за време навођења.</string>
     <string name="shared_string_overview">Сажетак</string>
     <string name="select_street">Изаберите улицу</string>
     <string name="shared_string_in_name">у %1$s</string>
@@ -1437,7 +1437,7 @@
     <string name="do_not_send_anonymous_app_usage">Не шаљи безимене податке о коришћеном програму</string>
     <string name="do_not_send_anonymous_app_usage_desc">Османд прикупља податке о томе које делове програма отварате. Ваш положај се не шаље, нити ишта што унесете у програм нити појединости о областима које видите, тражите или преузмете.</string>
     <string name="do_not_show_startup_messages">Не приказуј поруке при покретању</string>
-    <string name="do_not_show_startup_messages_desc">Потискује приказ попуста у програму и посебне месне поруке догађаја</string>
+    <string name="do_not_show_startup_messages_desc">Потискује приказ попуста у програму и посебне обласне поруке догађаја.</string>
     <string name="parking_options">Могућности паркирања</string>
     <string name="full_version_thanks">Хвала Вам за куповину пуног издања Османда!</string>
     <string name="routing_attr_relief_smoothness_factor_hills_name">Брдовито</string>
@@ -1446,7 +1446,7 @@
     <string name="routing_attr_driving_style_speed_name">Краће руте</string>
     <string name="routing_attr_driving_style_balance_name">Уравнотежено</string>
     <string name="routing_attr_driving_style_safety_name">Преферирај споредне</string>
-    <string name="relief_smoothness_factor_descr">Омиљени терен: равно или брдовито</string>
+    <string name="relief_smoothness_factor_descr">Омиљени терен: равно или брдовито.</string>
     <string name="shared_string_slope">Нагиб</string>
     <string name="add_new_folder">Додај нови омот</string>
     <string name="points_delete_multiple_succesful">Тачка(е) је успешно избрисана.</string>
@@ -1475,7 +1475,7 @@
     <string name="total_distance">Укупно растојање</string>
     <string name="routing_attr_relief_smoothness_factor_name">Изаберите висинско одступање</string>
     <string name="routing_attr_height_obstacles_name">Користи податке о висини</string>
-    <string name="rendering_attr_depthContours_description">Приказуј обрисе и тачке дубине</string>
+    <string name="rendering_attr_depthContours_description">Приказуј обрисе и тачке дубине.</string>
     <string name="rendering_attr_depthContours_name">Обриси поморске дубине</string>
     <string name="shared_string_paused">Заустављено</string>
     <string name="appearance_on_the_map">Изглед на мапи</string>
@@ -1496,4 +1496,97 @@
     <string name="offline_edition">Уређивање ван мреже</string>
     <string name="quick_action_new_action">Додај акцију</string>
     <string name="quick_action_add_favorite">Додај омиљено</string>
+    <string name="what_is_here">Овде су:</string>
+    <string name="parked_at">остављена у</string>
+    <string name="pick_up_till">Покупити до</string>
+    <string name="without_time_limit">Без временског ограничења</string>
+    <string name="context_menu_read_full_article">Читати цео чланак</string>
+    <string name="context_menu_read_article">Читати чланак</string>
+    <string name="context_menu_points_of_group">Све тачке групе</string>
+    <string name="open_from">Отворено од</string>
+    <string name="open_till">Отворено до</string>
+    <string name="will_close_at">Биће затворено у</string>
+    <string name="will_open_at">Биће отворено у</string>
+    <string name="will_open_on">Биће отворено у</string>
+    <string name="additional_actions">Додатне радње</string>
+    <string name="av_locations_selected_desc">Датотека ГПИкс-а са координатама и подацима изабране белешке.</string>
+    <string name="av_locations_all_desc">Датотека ГПИкс-а са координатама и подацима свих бележака.</string>
+    <string name="modify_the_search_query">Измените упит претраге.</string>
+    <string name="shared_string_actions">Радње</string>
+    <string name="shared_string_marker">Ознака</string>
+    <string name="empty_state_osm_edits">Стварајте или мењајте предмете ОСМ-а</string>
+    <string name="empty_state_osm_edits_descr">Стварајте или мењајте тачке занимања ОСМ-а, отворите или мењајте белешке ОСМ-а, и учествујте у снимању датотека ГПИкс-а.</string>
+    <string name="shared_string_deleted">Избрисано</string>
+    <string name="shared_string_edited">Уређено</string>
+    <string name="shared_string_added">Додато</string>
+    <string name="marker_activated">Белешка</string>
+    <string name="one_tap_active_descr">Тупните ознаку на карти ради њеног померања на врх покренутих ознака без отварања приручног изборника.</string>
+    <string name="one_tap_active">Покретање на туп</string>
+    <string name="empty_state_av_notes">Хватајте белешке!</string>
+    <string name="empty_state_av_notes_desc">Додај снимак, звучну или сликовну белешку на сваку тачку карте, помоћу справице или приручног изборника.</string>
+    <string name="notes_by_date">Белешке по данима</string>
+    <string name="by_date">По дану</string>
+    <string name="by_type">По врсти</string>
+    <string name="looking_for_tracks_with_waypoints">Претрага за путањама са пролазним тачкама</string>
+    <string name="shared_string_more_without_dots">Још</string>
+    <string name="add_track_to_markers_descr">Изаберите путању за додавање пролазних тачака на њене ознаке. (Само путање са пролазним тачкама се листају)</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="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="show_number_pad">Приказуј бројчану ставку</string>
+    <string name="shared_string_paste">Налепи</string>
+    <string name="coordinate_input_accuracy_description">Самостално пређи на следеће поље после уноса</string>
+    <string name="rename_marker">Преименуј ознаку</string>
+    <string name="tap_on_map_to_hide_interface_descr">Тупкање на карту је прекидач управљачких дугмади и справица.</string>
+    <string name="mark_passed">Ознака је проминута</string>
+    <string name="import_gpx_file_description">мо</string>
+    <string name="import_as_gpx">Увези као датотеку ГПИкс-а</string>
+    <string name="import_as_favorites">Увези као омиљено</string>
+    <string name="import_file">Увези датотеку</string>
+	<string name="wrong_input">Погрешан унос</string>
+	<string name="enter_new_name">Унесите ново име</string>
+	<string name="shared_string_back">Назад</string>
+	<string name="view">Преглед</string>
+	<string name="waypoints_added_to_map_markers">Пролазне тачке додате ознакама на карти</string>
+	<string name="wrong_format">Погрешан облик</string>
+    <string name="shared_string_road">Пут</string>
+    <string name="show_map">Прикажи карту</string>
+    <string name="route_is_calculated">Пут је срачунат</string>
+    <string name="round_trip">Испрекидано путовање</string>
+    <string name="plan_route_no_markers_toast">Морате додати најмање једну ознаку за коришћење ове могућности</string>
+    <string name="osn_modify_dialog_error">Десила се грешка: белешка није измењена</string>
+    <string name="osn_modify_dialog_title">Измени белешку</string>
+    <string name="context_menu_item_modify_note">Измените белешку ОСМ-а</string>
+    <string name="make_round_trip_descr">Додајте умножак почетне тачке као одредиште.</string>
+    <string name="shared_string_markers">Ознаке</string>
+    <string name="coordinates_format">Облик координата</string>
+    <string name="use_system_keyboard">Користи системску тастатуру</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="use_location">Користи положај</string>
+    <string name="add_location_as_first_point_descr">Додајте свој положај као почетну тачку плана савршеног путовања.</string>
+    <string name="my_location">Мој положај</string>
+    <string name="shared_string_finish">Крај</string>
+    <string name="plan_route">План путовања</string>
+    <string name="shared_string_sort">Распореди</string>
+    <string name="coordinate_input">Унос координата</string>
+    <string name="is_saved">је сачуван</string>
+    <string name="marker_save_as_track_descr">Извезите ознаке у датотку коју можете навести овде:</string>
+    <string name="marker_save_as_track">Сачувај као путању</string>
+    <string name="move_to_history">Премести у историју</string>
+    <string name="descendingly">силазно</string>
+    <string name="ascendingly">узлазно</string>
+    <string name="order_by">Распореди по:</string>
     </resources>
diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index d435b11f2f..1267e4b8ea 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -2691,4 +2691,9 @@ Vänligen tillhandahåll fullständig kod</string>
     <string name="looking_for_tracks_with_waypoints">Söker spår med waypoints</string>
     <string name="shared_string_more_without_dots">Mer</string>
     <string name="appearance_on_the_map">Utseende på kartan</string>
+    <string name="what_is_here">Det som finns här:</string>
+    <string name="parked_at">Parkerad på</string>
+    <string name="without_time_limit">Utan tidsbegränsning</string>
+    <string name="context_menu_read_full_article">Läs hela artikeln</string>
+    <string name="context_menu_read_article">Läs artikel</string>
     </resources>
diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml
index c0966b660d..a1bbad5f7f 100644
--- a/OsmAnd/res/values-uk/strings.xml
+++ b/OsmAnd/res/values-uk/strings.xml
@@ -3144,11 +3144,11 @@
     <string name="context_menu_read_full_article">Читайте повну статтю</string>
     <string name="context_menu_read_article">Читати статтю</string>
     <string name="context_menu_points_of_group">Всі пункти групи</string>
-    <string name="opened_from">Відкрито з</string>
-    <string name="opened_till">Відкрито до</string>
-    <string name="will_be_closed_at">Буде закрито в</string>
-    <string name="will_be_opened_at">Буде відкрито в</string>
-    <string name="will_be_opened_on">Буде відкрито</string>
+    <string name="open_from">Відкрито з</string>
+    <string name="open_till">Відкрито до</string>
+    <string name="will_close_at">Буде закрито в</string>
+    <string name="will_open_at">Буде відкрито в</string>
+    <string name="will_open_on">Буде відкрито</string>
     <string name="additional_actions">Додаткові дії</string>
     <string name="av_locations_selected_desc">Файл GPX з координатами та даними вибраних нотаток.</string>
     <string name="av_locations_all_desc">Файл GPX з координатами та даними всіх нотаток.</string>
diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 239b0c9896..1adbd9a5b1 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2986,13 +2986,13 @@ OsmAnd (Automated Navigation Directions) 是一個地圖和導航的應用程式
     <string name="context_menu_read_full_article">閱讀全文</string>
     <string name="context_menu_read_article">閱讀文章</string>
     <string name="context_menu_points_of_group">群組的全部標點</string>
-    <string name="opened_from">已開啟自</string>
-    <string name="opened_till">已開啟直到</string>
-    <string name="will_be_closed_at">將關閉于</string>
-    <string name="will_be_opened_at">將開啟于</string>
+    <string name="open_from">已開啟自</string>
+    <string name="open_till">已開啟直到</string>
+    <string name="will_close_at">將關閉于</string>
+    <string name="will_open_at">將開啟于</string>
+    <string name="will_open_on">將被開啟</string>
     <string name="what_is_here">這裡的內容：</string>
     <string name="pick_up_till">取得直到</string>
-    <string name="will_be_opened_on">將被開啟</string>
     <string name="additional_actions">輔助的操作</string>
     <string name="shared_string_actions">操作</string>
     <string name="shared_string_marker">標記</string>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 68fe9d8c22..2780b25267 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -16,11 +16,11 @@
     <string name="context_menu_read_full_article">Read full article</string>
     <string name="context_menu_read_article">Read article</string>
     <string name="context_menu_points_of_group">All points of the group</string>
-    <string name="opened_from">Opened from</string>
-    <string name="opened_till">Opened till</string>
-    <string name="will_be_closed_at">Will be closed at</string>
-    <string name="will_be_opened_at">Will be opened at</string>
-    <string name="will_be_opened_on">Will be opened on</string>
+    <string name="open_from">Open from</string>
+    <string name="open_till">Open till</string>
+    <string name="will_close_at">Will close at</string>
+    <string name="will_open_at">Will open at</string>
+    <string name="will_open_on">Will open on</string>
     <string name="additional_actions">Additional actions</string>
     <string name="av_locations_selected_desc">GPX file with coordinates and data of the selected notes.</string>
     <string name="av_locations_all_desc">GPX file with coordinates and data of all notes.</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index a5dd7bc149..b3fe484df3 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -132,7 +132,6 @@
         <item name="dashboard_button">@drawable/dashboard_button_light</item>
         <item name="ctx_menu_info_view_bg">@color/ctx_menu_info_view_bg_light</item>
         <item name="ctx_menu_controller_bg">@drawable/context_menu_controller_bg_light</item>
-        <item name="ctx_menu_controller_text_color">@drawable/context_menu_controller_text_color_light</item>
         <item name="ctx_menu_divider">@color/ctx_menu_buttons_divider_light</item>
         <item name="search_background">@color/search_background_dark</item>
         <item name="actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
@@ -256,6 +255,7 @@
     </style>
 
     <style name="OsmandLightTheme.BottomSheet">
+        <item name="android:windowIsFloating">true</item>
         <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
         <item name="android:windowBackground">@color/color_transparent</item>
         <item name="android:backgroundDimAmount">0.3</item>
@@ -263,6 +263,7 @@
     </style>
 
     <style name="OsmandDarkTheme.BottomSheet">
+        <item name="android:windowIsFloating">true</item>
         <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
         <item name="android:windowBackground">@color/color_transparent</item>
         <item name="android:backgroundDimAmount">0.3</item>
@@ -320,7 +321,6 @@
         <item name="dashboard_button">@drawable/dashboard_button_dark</item>
         <item name="ctx_menu_info_view_bg">@color/ctx_menu_info_view_bg_dark</item>
         <item name="ctx_menu_controller_bg">@drawable/context_menu_controller_bg_dark</item>
-        <item name="ctx_menu_controller_text_color">@drawable/context_menu_controller_text_color_dark</item>
         <item name="ctx_menu_divider">@color/ctx_menu_buttons_divider_dark</item>
         <item name="search_background">@color/color_white</item>
         <item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 930de97418..8456023fa7 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -7,8 +7,12 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.StateListDrawable;
 import android.os.Build;
 import android.os.IBinder;
+import android.support.annotation.DrawableRes;
+import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.util.DisplayMetrics;
@@ -114,6 +118,23 @@ public class AndroidUtils {
 		return null;
 	}
 
+	public static StateListDrawable createStateListDrawable(Context ctx, boolean night,
+															@DrawableRes int lightNormal, @DrawableRes int lightPressed,
+															@DrawableRes int darkNormal, @DrawableRes int darkPressed) {
+		return createStateListDrawable(night,
+				ContextCompat.getDrawable(ctx, lightNormal), ContextCompat.getDrawable(ctx, lightPressed),
+				ContextCompat.getDrawable(ctx, darkNormal), ContextCompat.getDrawable(ctx, darkPressed));
+	}
+
+	public static StateListDrawable createStateListDrawable(boolean night,
+															Drawable lightNormal, Drawable lightPressed,
+															Drawable darkNormal, Drawable darkPressed) {
+		StateListDrawable res = new StateListDrawable();
+		res.addState(new int[]{android.R.attr.state_pressed}, night ? darkPressed : lightPressed);
+		res.addState(new int[]{}, night ? darkNormal : lightNormal);
+		return res;
+	}
+
 	@SuppressLint("NewApi")
 	@SuppressWarnings("deprecation")
 	public static void setBackground(Context ctx, View view, boolean night, int lightResId, int darkResId) {
diff --git a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialog.java b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialog.java
new file mode 100644
index 0000000000..5485f6cdea
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialog.java
@@ -0,0 +1,127 @@
+package net.osmand.plus.base;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import net.osmand.plus.R;
+
+public class BottomSheetDialog extends Dialog {
+
+	private boolean cancelable = true;
+	private boolean canceledOnTouchOutside = true;
+	private boolean canceledOnTouchOutsideSet;
+
+	public BottomSheetDialog(@NonNull Context context) {
+		this(context, 0);
+	}
+
+	public BottomSheetDialog(@NonNull Context context, int themeResId) {
+		super(context, themeResId);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+	}
+
+	protected BottomSheetDialog(@NonNull Context context, boolean cancelable, @Nullable OnCancelListener cancelListener) {
+		super(context, cancelable, cancelListener);
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		this.cancelable = cancelable;
+	}
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Window window = getWindow();
+		if (window != null) {
+			if (Build.VERSION.SDK_INT >= 21) {
+				window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+				window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+			}
+			window.setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+		}
+	}
+
+	@Override
+	public void setContentView(int layoutResID) {
+		super.setContentView(wrapInContainer(layoutResID, null, null));
+	}
+
+	@Override
+	public void setContentView(@NonNull View view) {
+		super.setContentView(wrapInContainer(0, view, null));
+	}
+
+	@Override
+	public void setContentView(@NonNull View view, @Nullable LayoutParams params) {
+		super.setContentView(wrapInContainer(0, view, params));
+	}
+
+	@Override
+	public void setCancelable(boolean flag) {
+		super.setCancelable(flag);
+		cancelable = flag;
+	}
+
+	@Override
+	public void setCanceledOnTouchOutside(boolean cancel) {
+		super.setCanceledOnTouchOutside(cancel);
+		if (cancel && !cancelable) {
+			cancelable = true;
+		}
+		canceledOnTouchOutside = cancel;
+		canceledOnTouchOutsideSet = true;
+	}
+
+	@NonNull
+	private View wrapInContainer(int layoutResId, View view, LayoutParams params) {
+		final View res = View.inflate(getContext(), R.layout.bottom_sheet_dialog, null);
+		final FrameLayout container = (FrameLayout) res.findViewById(R.id.content_container);
+
+		if (layoutResId != 0 && view == null) {
+			view = getLayoutInflater().inflate(layoutResId, container, false);
+		}
+		if (params == null) {
+			container.addView(view);
+		} else {
+			container.addView(view, params);
+		}
+
+		res.findViewById(R.id.touch_outside).setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				if (cancelable && isShowing() && shouldWindowCloseOnTouchOutside()) {
+					cancel();
+				}
+			}
+		});
+
+		container.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View view, MotionEvent motionEvent) {
+				// Consume the event and prevent it from falling through
+				return true;
+			}
+		});
+
+		return res;
+	}
+
+	private boolean shouldWindowCloseOnTouchOutside() {
+		if (!canceledOnTouchOutsideSet) {
+			TypedArray a = getContext().obtainStyledAttributes(new int[]{android.R.attr.windowCloseOnTouchOutside});
+			canceledOnTouchOutside = a.getBoolean(0, true);
+			a.recycle();
+			canceledOnTouchOutsideSet = true;
+		}
+		return canceledOnTouchOutside;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
index cb3aeed683..152c458cda 100644
--- a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
@@ -5,14 +5,13 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.DialogFragment;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.view.WindowManager;
 
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
@@ -20,19 +19,18 @@ import net.osmand.plus.R;
 
 public abstract class BottomSheetDialogFragment extends DialogFragment {
 
+	@NonNull
 	@Override
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
-		boolean isLightTheme = getMyApplication()
-				.getSettings().OSMAND_THEME.get() == OsmandSettings.OSMAND_LIGHT_THEME;
-		int themeId = isLightTheme ? R.style.OsmandLightTheme_BottomSheet
-				: R.style.OsmandDarkTheme_BottomSheet;
-		final Dialog dialog = new Dialog(getActivity(), themeId);
-		dialog.setCanceledOnTouchOutside(true);
-		dialog.getWindow().requestFeature(Window.FEATURE_NO_TITLE);
-		if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get()) {
-			dialog.getWindow().getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
+		OsmandSettings settings = getMyApplication().getSettings();
+		int themeId = settings.isLightContent() ? R.style.OsmandLightTheme_BottomSheet : R.style.OsmandDarkTheme_BottomSheet;
+
+		BottomSheetDialog dialog = new BottomSheetDialog(getContext(), themeId);
+		Window window = dialog.getWindow();
+		if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get() && window != null) {
+			window.getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;
 		}
-		dialog.setCanceledOnTouchOutside(true);
+
 		return dialog;
 	}
 
@@ -40,21 +38,6 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
 	@Override
 	public abstract View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState);
 
-	@Override
-	public void onStart() {
-		super.onStart();
-
-		if (getDialog() != null) {
-			final Window window = getDialog().getWindow();
-			WindowManager.LayoutParams params = window.getAttributes();
-			params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
-			params.gravity = Gravity.BOTTOM;
-			params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-			window.setAttributes(params);
-		}
-	}
-
-
 	protected OsmandApplication getMyApplication() {
 		return (OsmandApplication) getActivity().getApplication();
 	}
@@ -66,5 +49,4 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
 	protected Drawable getContentIcon(@DrawableRes int drawableRes) {
 		return getMyApplication().getIconsCache().getThemedIcon(drawableRes);
 	}
-
 }
diff --git a/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
new file mode 100644
index 0000000000..ee01299b40
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
@@ -0,0 +1,848 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.osmand.plus.widgets.tools;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+import android.support.annotation.VisibleForTesting;
+import android.support.design.R;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.v4.math.MathUtils;
+import android.support.v4.view.AbsSavedState;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.ViewDragHelper;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.ref.WeakReference;
+
+import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+
+
+/**
+ * An interaction behavior plugin for a child view of {@link CoordinatorLayout} to make it work as
+ * a bottom sheet.
+ */
+public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayout.Behavior<V> {
+
+	/**
+	 * Callback for monitoring events about bottom sheets.
+	 */
+	public abstract static class BottomSheetCallback {
+
+		/**
+		 * Called when the bottom sheet changes its state.
+		 *
+		 * @param bottomSheet The bottom sheet view.
+		 * @param newState    The new state. This will be one of {@link #STATE_DRAGGING},
+		 *                    {@link #STATE_SETTLING}, {@link #STATE_EXPANDED},
+		 *                    {@link #STATE_COLLAPSED}, or {@link #STATE_HIDDEN}.
+		 */
+		public abstract void onStateChanged(@NonNull View bottomSheet, @State int newState);
+
+		/**
+		 * Called when the bottom sheet is being dragged.
+		 *
+		 * @param bottomSheet The bottom sheet view.
+		 * @param slideOffset The new offset of this bottom sheet within [-1,1] range. Offset
+		 *                    increases as this bottom sheet is moving upward. From 0 to 1 the sheet
+		 *                    is between collapsed and expanded states and from -1 to 0 it is
+		 *                    between hidden and collapsed states.
+		 */
+		public abstract void onSlide(@NonNull View bottomSheet, float slideOffset);
+	}
+
+	/**
+	 * The bottom sheet is dragging.
+	 */
+	public static final int STATE_DRAGGING = 1;
+
+	/**
+	 * The bottom sheet is settling.
+	 */
+	public static final int STATE_SETTLING = 2;
+
+	/**
+	 * The bottom sheet is expanded.
+	 */
+	public static final int STATE_EXPANDED = 3;
+
+	/**
+	 * The bottom sheet is collapsed.
+	 */
+	public static final int STATE_COLLAPSED = 4;
+
+	/**
+	 * The bottom sheet is hidden.
+	 */
+	public static final int STATE_HIDDEN = 5;
+
+	/**
+	 * The bottom sheet is manually opened to a certain height.
+	 */
+	public static final int STATE_MANUALLY_MOVED = 6;
+
+	/**
+	 * @hide
+	 */
+	@RestrictTo(LIBRARY_GROUP)
+	@IntDef({STATE_EXPANDED, STATE_COLLAPSED, STATE_DRAGGING, STATE_SETTLING, STATE_HIDDEN, STATE_MANUALLY_MOVED})
+	@Retention(RetentionPolicy.SOURCE)
+	public @interface State {
+	}
+
+	/**
+	 * Peek at the 16:9 ratio keyline of its parent.
+	 * <p>
+	 * <p>This can be used as a parameter for {@link #setPeekHeight(int)}.
+	 * {@link #getPeekHeight()} will return this when the value is set.</p>
+	 */
+	public static final int PEEK_HEIGHT_AUTO = -1;
+
+	private static final float HIDE_THRESHOLD = 0.5f;
+
+	private static final float HIDE_FRICTION = 0.1f;
+
+	private static final float MIN_VELOCITY_FOR_SLIDE = 2000;
+
+	private float mMaximumVelocity;
+
+	private int mPeekHeight;
+
+	private boolean mPeekHeightAuto;
+
+	private int mPeekHeightMin;
+
+	int mMinOffset;
+
+	int mMaxOffset;
+
+	boolean mHideable;
+
+	private boolean mSkipCollapsed;
+
+	@State
+	int mState = STATE_COLLAPSED;
+
+	ViewDragHelper mViewDragHelper;
+
+	private boolean mIgnoreEvents;
+
+	private int mLastNestedScrollDy;
+
+	private boolean mNestedScrolled;
+
+	int mParentHeight;
+
+	WeakReference<V> mViewRef;
+
+	WeakReference<View> mNestedScrollingChildRef;
+
+	private BottomSheetCallback mCallback;
+
+	private VelocityTracker mVelocityTracker;
+
+	int mActivePointerId;
+
+	private int mInitialY;
+
+	boolean mTouchingScrollingChild;
+
+	/**
+	 * Default constructor for instantiating BottomSheetBehaviors.
+	 */
+	public ExtendedBottomSheetBehavior() {
+	}
+
+	/**
+	 * Default constructor for inflating BottomSheetBehaviors from layout.
+	 *
+	 * @param context The {@link Context}.
+	 * @param attrs   The {@link AttributeSet}.
+	 */
+	public ExtendedBottomSheetBehavior(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		TypedArray a = context.obtainStyledAttributes(attrs,
+				R.styleable.BottomSheetBehavior_Layout);
+		TypedValue value = a.peekValue(R.styleable.BottomSheetBehavior_Layout_behavior_peekHeight);
+		if (value != null && value.data == PEEK_HEIGHT_AUTO) {
+			setPeekHeight(value.data);
+		} else {
+			setPeekHeight(a.getDimensionPixelSize(
+					R.styleable.BottomSheetBehavior_Layout_behavior_peekHeight, PEEK_HEIGHT_AUTO));
+		}
+		setHideable(a.getBoolean(R.styleable.BottomSheetBehavior_Layout_behavior_hideable, false));
+		setSkipCollapsed(a.getBoolean(R.styleable.BottomSheetBehavior_Layout_behavior_skipCollapsed,
+				false));
+		a.recycle();
+		ViewConfiguration configuration = ViewConfiguration.get(context);
+		mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
+	}
+
+	@Override
+	public Parcelable onSaveInstanceState(CoordinatorLayout parent, V child) {
+		return new SavedState(super.onSaveInstanceState(parent, child), mState);
+	}
+
+	@Override
+	public void onRestoreInstanceState(CoordinatorLayout parent, V child, Parcelable state) {
+		SavedState ss = (SavedState) state;
+		super.onRestoreInstanceState(parent, child, ss.getSuperState());
+		// Intermediate states are restored as collapsed state
+		if (ss.state == STATE_DRAGGING || ss.state == STATE_SETTLING) {
+			mState = STATE_COLLAPSED;
+		} else {
+			mState = ss.state;
+		}
+	}
+
+	@Override
+	public boolean onLayoutChild(CoordinatorLayout parent, V child, int layoutDirection) {
+		if (ViewCompat.getFitsSystemWindows(parent) && !ViewCompat.getFitsSystemWindows(child)) {
+			ViewCompat.setFitsSystemWindows(child, true);
+		}
+		int savedTop = child.getTop();
+		// First let the parent lay it out
+		parent.onLayoutChild(child, layoutDirection);
+		// Offset the bottom sheet
+		mParentHeight = parent.getHeight();
+		int peekHeight;
+		if (mPeekHeightAuto) {
+			if (mPeekHeightMin == 0) {
+				mPeekHeightMin = parent.getResources().getDimensionPixelSize(
+						R.dimen.design_bottom_sheet_peek_height_min);
+			}
+			peekHeight = Math.max(mPeekHeightMin, mParentHeight - parent.getWidth() * 9 / 16);
+		} else {
+			peekHeight = mPeekHeight;
+		}
+		mMinOffset = Math.max(0, mParentHeight - child.getHeight());
+		mMaxOffset = Math.max(mParentHeight - peekHeight, mMinOffset);
+		if (mState == STATE_EXPANDED) {
+			ViewCompat.offsetTopAndBottom(child, mMinOffset);
+		} else if (mHideable && mState == STATE_HIDDEN) {
+			ViewCompat.offsetTopAndBottom(child, mParentHeight);
+		} else if (mState == STATE_COLLAPSED) {
+			ViewCompat.offsetTopAndBottom(child, mMaxOffset);
+		} else if (mState == STATE_DRAGGING || mState == STATE_SETTLING) {
+			ViewCompat.offsetTopAndBottom(child, savedTop - child.getTop());
+		}
+		if (mViewDragHelper == null) {
+			mViewDragHelper = ViewDragHelper.create(parent, mDragCallback);
+		}
+		mViewRef = new WeakReference<>(child);
+		mNestedScrollingChildRef = new WeakReference<>(findScrollingChild(child));
+		return true;
+	}
+
+	@Override
+	public boolean onInterceptTouchEvent(CoordinatorLayout parent, V child, MotionEvent event) {
+		if (!child.isShown()) {
+			mIgnoreEvents = true;
+			return false;
+		}
+		int action = event.getActionMasked();
+		// Record the velocity
+		if (action == MotionEvent.ACTION_DOWN) {
+			reset();
+		}
+		if (mVelocityTracker == null) {
+			mVelocityTracker = VelocityTracker.obtain();
+		}
+		mVelocityTracker.addMovement(event);
+		switch (action) {
+			case MotionEvent.ACTION_UP:
+			case MotionEvent.ACTION_CANCEL:
+				mTouchingScrollingChild = false;
+				mActivePointerId = MotionEvent.INVALID_POINTER_ID;
+				// Reset the ignore flag
+				if (mIgnoreEvents) {
+					mIgnoreEvents = false;
+					return false;
+				}
+				break;
+			case MotionEvent.ACTION_DOWN:
+				int initialX = (int) event.getX();
+				mInitialY = (int) event.getY();
+				View scroll = mNestedScrollingChildRef != null
+						? mNestedScrollingChildRef.get() : null;
+				if (scroll != null && parent.isPointInChildBounds(scroll, initialX, mInitialY)) {
+					mActivePointerId = event.getPointerId(event.getActionIndex());
+					mTouchingScrollingChild = true;
+				}
+				mIgnoreEvents = mActivePointerId == MotionEvent.INVALID_POINTER_ID &&
+						!parent.isPointInChildBounds(child, initialX, mInitialY);
+				break;
+		}
+		if (!mIgnoreEvents && mViewDragHelper.shouldInterceptTouchEvent(event)) {
+			return true;
+		}
+		// We have to handle cases that the ViewDragHelper does not capture the bottom sheet because
+		// it is not the top most view of its parent. This is not necessary when the touch event is
+		// happening over the scrolling content as nested scrolling logic handles that case.
+		View scroll = mNestedScrollingChildRef.get();
+		return action == MotionEvent.ACTION_MOVE && scroll != null &&
+				!mIgnoreEvents && mState != STATE_DRAGGING &&
+				!parent.isPointInChildBounds(scroll, (int) event.getX(), (int) event.getY()) &&
+				Math.abs(mInitialY - event.getY()) > mViewDragHelper.getTouchSlop();
+	}
+
+	@Override
+	public boolean onTouchEvent(CoordinatorLayout parent, V child, MotionEvent event) {
+		if (!child.isShown()) {
+			return false;
+		}
+		int action = event.getActionMasked();
+		if (mState == STATE_DRAGGING && action == MotionEvent.ACTION_DOWN) {
+			return true;
+		}
+		mViewDragHelper.processTouchEvent(event);
+		// Record the velocity
+		if (action == MotionEvent.ACTION_DOWN) {
+			reset();
+		}
+		if (mVelocityTracker == null) {
+			mVelocityTracker = VelocityTracker.obtain();
+		}
+		mVelocityTracker.addMovement(event);
+		// The ViewDragHelper tries to capture only the top-most View. We have to explicitly tell it
+		// to capture the bottom sheet in case it is not captured and the touch slop is passed.
+		if (action == MotionEvent.ACTION_MOVE && !mIgnoreEvents) {
+			if (Math.abs(mInitialY - event.getY()) > mViewDragHelper.getTouchSlop()) {
+				mViewDragHelper.captureChildView(child, event.getPointerId(event.getActionIndex()));
+			}
+		}
+		return !mIgnoreEvents;
+	}
+
+	@Override
+	public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, V child,
+									   View directTargetChild, View target, int nestedScrollAxes) {
+		mLastNestedScrollDy = 0;
+		mNestedScrolled = false;
+		return (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
+	}
+
+	@Override
+	public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, V child, View target, int dx,
+								  int dy, int[] consumed) {
+		View scrollingChild = mNestedScrollingChildRef.get();
+		if (target != scrollingChild) {
+			return;
+		}
+		int currentTop = child.getTop();
+		int newTop = currentTop - dy;
+		if (dy > 0) { // Upward
+			if (newTop < mMinOffset) {
+				consumed[1] = currentTop - mMinOffset;
+				ViewCompat.offsetTopAndBottom(child, -consumed[1]);
+				setStateInternal(STATE_EXPANDED);
+			} else {
+				consumed[1] = dy;
+				ViewCompat.offsetTopAndBottom(child, -dy);
+				setStateInternal(STATE_DRAGGING);
+			}
+		} else if (dy < 0) { // Downward
+			if (!target.canScrollVertically(-1)) {
+				if (newTop <= mMaxOffset || mHideable) {
+					consumed[1] = dy;
+					ViewCompat.offsetTopAndBottom(child, -dy);
+					setStateInternal(STATE_DRAGGING);
+				} else {
+					consumed[1] = currentTop - mMaxOffset;
+					ViewCompat.offsetTopAndBottom(child, -consumed[1]);
+					setStateInternal(STATE_COLLAPSED);
+				}
+			}
+		}
+		dispatchOnSlide(child.getTop());
+		mLastNestedScrollDy = dy;
+		mNestedScrolled = true;
+	}
+
+	@Override
+	public void onStopNestedScroll(CoordinatorLayout coordinatorLayout, V child, View target) {
+		if (child.getTop() == mMinOffset) {
+			setStateInternal(STATE_EXPANDED);
+			return;
+		}
+		if (mNestedScrollingChildRef == null || target != mNestedScrollingChildRef.get()
+				|| !mNestedScrolled) {
+			return;
+		}
+		int top;
+		int targetState;
+		if (mLastNestedScrollDy > 0) {
+			if (Math.abs(getYVelocity()) > MIN_VELOCITY_FOR_SLIDE) {
+				top = mMinOffset;
+				targetState = STATE_EXPANDED;
+			} else {
+				top = child.getTop();
+				targetState = STATE_MANUALLY_MOVED;
+			}
+		} else if (mHideable && shouldHide(child, getYVelocity())) {
+			top = mParentHeight;
+			targetState = STATE_HIDDEN;
+		} else if (mLastNestedScrollDy == 0) {
+			int currentTop = child.getTop();
+			if (Math.abs(currentTop - mMinOffset) < Math.abs(currentTop - mMaxOffset)) {
+				top = mMinOffset;
+				targetState = STATE_EXPANDED;
+			} else {
+				top = mMaxOffset;
+				targetState = STATE_COLLAPSED;
+			}
+		} else {
+			if (Math.abs(getYVelocity()) > MIN_VELOCITY_FOR_SLIDE) {
+				top = mMaxOffset;
+				targetState = STATE_COLLAPSED;
+			} else {
+				top = child.getTop();
+				targetState = STATE_MANUALLY_MOVED;
+			}
+		}
+		if (mViewDragHelper.smoothSlideViewTo(child, child.getLeft(), top)) {
+			setStateInternal(STATE_SETTLING);
+			ViewCompat.postOnAnimation(child, new SettleRunnable(child, targetState));
+		} else {
+			setStateInternal(targetState);
+		}
+		mNestedScrolled = false;
+	}
+
+	@Override
+	public boolean onNestedPreFling(CoordinatorLayout coordinatorLayout, V child, View target,
+									float velocityX, float velocityY) {
+		return target == mNestedScrollingChildRef.get() &&
+				(mState != STATE_EXPANDED ||
+						super.onNestedPreFling(coordinatorLayout, child, target,
+								velocityX, velocityY));
+	}
+
+	/**
+	 * Sets the height of the bottom sheet when it is collapsed.
+	 *
+	 * @param peekHeight The height of the collapsed bottom sheet in pixels, or
+	 *                   {@link #PEEK_HEIGHT_AUTO} to configure the sheet to peek automatically
+	 *                   at 16:9 ratio keyline.
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_peekHeight
+	 */
+	public final void setPeekHeight(int peekHeight) {
+		boolean layout = false;
+		if (peekHeight == PEEK_HEIGHT_AUTO) {
+			if (!mPeekHeightAuto) {
+				mPeekHeightAuto = true;
+				layout = true;
+			}
+		} else if (mPeekHeightAuto || mPeekHeight != peekHeight) {
+			mPeekHeightAuto = false;
+			mPeekHeight = Math.max(0, peekHeight);
+			mMaxOffset = mParentHeight - peekHeight;
+			layout = true;
+		}
+		if (layout && mState == STATE_COLLAPSED && mViewRef != null) {
+			V view = mViewRef.get();
+			if (view != null) {
+				view.requestLayout();
+			}
+		}
+	}
+
+	/**
+	 * Gets the height of the bottom sheet when it is collapsed.
+	 *
+	 * @return The height of the collapsed bottom sheet in pixels, or {@link #PEEK_HEIGHT_AUTO}
+	 * if the sheet is configured to peek automatically at 16:9 ratio keyline
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_peekHeight
+	 */
+	public final int getPeekHeight() {
+		return mPeekHeightAuto ? PEEK_HEIGHT_AUTO : mPeekHeight;
+	}
+
+	/**
+	 * Sets whether this bottom sheet can hide when it is swiped down.
+	 *
+	 * @param hideable {@code true} to make this bottom sheet hideable.
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_hideable
+	 */
+	public void setHideable(boolean hideable) {
+		mHideable = hideable;
+	}
+
+	/**
+	 * Gets whether this bottom sheet can hide when it is swiped down.
+	 *
+	 * @return {@code true} if this bottom sheet can hide.
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_hideable
+	 */
+	public boolean isHideable() {
+		return mHideable;
+	}
+
+	/**
+	 * Sets whether this bottom sheet should skip the collapsed state when it is being hidden
+	 * after it is expanded once. Setting this to true has no effect unless the sheet is hideable.
+	 *
+	 * @param skipCollapsed True if the bottom sheet should skip the collapsed state.
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_skipCollapsed
+	 */
+	public void setSkipCollapsed(boolean skipCollapsed) {
+		mSkipCollapsed = skipCollapsed;
+	}
+
+	/**
+	 * Sets whether this bottom sheet should skip the collapsed state when it is being hidden
+	 * after it is expanded once.
+	 *
+	 * @return Whether the bottom sheet should skip the collapsed state.
+	 * @attr ref android.support.design.R.styleable#BottomSheetBehavior_Layout_behavior_skipCollapsed
+	 */
+	public boolean getSkipCollapsed() {
+		return mSkipCollapsed;
+	}
+
+	/**
+	 * Sets a callback to be notified of bottom sheet events.
+	 *
+	 * @param callback The callback to notify when bottom sheet events occur.
+	 */
+	public void setBottomSheetCallback(BottomSheetCallback callback) {
+		mCallback = callback;
+	}
+
+	/**
+	 * Sets the state of the bottom sheet. The bottom sheet will transition to that state with
+	 * animation.
+	 *
+	 * @param state One of {@link #STATE_COLLAPSED}, {@link #STATE_EXPANDED}, or
+	 *              {@link #STATE_HIDDEN}.
+	 */
+	public final void setState(final @State int state) {
+		if (state == mState) {
+			return;
+		}
+		if (mViewRef == null) {
+			// The view is not laid out yet; modify mState and let onLayoutChild handle it later
+			if (state == STATE_COLLAPSED || state == STATE_EXPANDED ||
+					(mHideable && state == STATE_HIDDEN)) {
+				mState = state;
+			}
+			return;
+		}
+		final V child = mViewRef.get();
+		if (child == null) {
+			return;
+		}
+		// Start the animation; wait until a pending layout if there is one.
+		ViewParent parent = child.getParent();
+		if (parent != null && parent.isLayoutRequested() && ViewCompat.isAttachedToWindow(child)) {
+			child.post(new Runnable() {
+				@Override
+				public void run() {
+					startSettlingAnimation(child, state);
+				}
+			});
+		} else {
+			startSettlingAnimation(child, state);
+		}
+	}
+
+	/**
+	 * Gets the current state of the bottom sheet.
+	 *
+	 * @return One of {@link #STATE_EXPANDED}, {@link #STATE_COLLAPSED}, {@link #STATE_DRAGGING},
+	 * and {@link #STATE_SETTLING}.
+	 */
+	@State
+	public final int getState() {
+		return mState;
+	}
+
+	void setStateInternal(@State int state) {
+		if (mState == state) {
+			return;
+		}
+		mState = state;
+		View bottomSheet = mViewRef.get();
+		if (bottomSheet != null && mCallback != null) {
+			mCallback.onStateChanged(bottomSheet, state);
+		}
+	}
+
+	private void reset() {
+		mActivePointerId = ViewDragHelper.INVALID_POINTER;
+		if (mVelocityTracker != null) {
+			mVelocityTracker.recycle();
+			mVelocityTracker = null;
+		}
+	}
+
+	boolean shouldHide(View child, float yvel) {
+		if (mSkipCollapsed) {
+			return true;
+		}
+		if (child.getTop() < mMaxOffset) {
+			// It should not hide, but collapse.
+			return false;
+		}
+		final float newTop = child.getTop() + yvel * HIDE_FRICTION;
+		return Math.abs(newTop - mMaxOffset) / (float) mPeekHeight > HIDE_THRESHOLD;
+	}
+
+	@VisibleForTesting
+	View findScrollingChild(View view) {
+		if (ViewCompat.isNestedScrollingEnabled(view)) {
+			return view;
+		}
+		if (view instanceof ViewGroup) {
+			ViewGroup group = (ViewGroup) view;
+			for (int i = 0, count = group.getChildCount(); i < count; i++) {
+				View scrollingChild = findScrollingChild(group.getChildAt(i));
+				if (scrollingChild != null) {
+					return scrollingChild;
+				}
+			}
+		}
+		return null;
+	}
+
+	private float getYVelocity() {
+		mVelocityTracker.computeCurrentVelocity(1000, mMaximumVelocity);
+		return mVelocityTracker.getYVelocity(mActivePointerId);
+	}
+
+	void startSettlingAnimation(View child, int state) {
+		int top;
+		if (state == STATE_COLLAPSED) {
+			top = mMaxOffset;
+		} else if (state == STATE_EXPANDED) {
+			top = mMinOffset;
+		} else if (mHideable && state == STATE_HIDDEN) {
+			top = mParentHeight;
+		} else {
+			throw new IllegalArgumentException("Illegal state argument: " + state);
+		}
+		if (mViewDragHelper.smoothSlideViewTo(child, child.getLeft(), top)) {
+			setStateInternal(STATE_SETTLING);
+			ViewCompat.postOnAnimation(child, new SettleRunnable(child, state));
+		} else {
+			setStateInternal(state);
+		}
+	}
+
+	private final ViewDragHelper.Callback mDragCallback = new ViewDragHelper.Callback() {
+
+		@Override
+		public boolean tryCaptureView(View child, int pointerId) {
+			if (mState == STATE_DRAGGING) {
+				return false;
+			}
+			if (mTouchingScrollingChild) {
+				return false;
+			}
+			if (mState == STATE_EXPANDED && mActivePointerId == pointerId) {
+				View scroll = mNestedScrollingChildRef.get();
+				if (scroll != null && scroll.canScrollVertically(-1)) {
+					// Let the content scroll up
+					return false;
+				}
+			}
+			return mViewRef != null && mViewRef.get() == child;
+		}
+
+		@Override
+		public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
+			dispatchOnSlide(top);
+		}
+
+		@Override
+		public void onViewDragStateChanged(int state) {
+			if (state == ViewDragHelper.STATE_DRAGGING) {
+				setStateInternal(STATE_DRAGGING);
+			}
+		}
+
+		@Override
+		public void onViewReleased(View releasedChild, float xvel, float yvel) {
+			int top;
+			@State int targetState;
+			if (yvel < 0) { // Moving up
+				top = mMinOffset;
+				targetState = STATE_EXPANDED;
+			} else if (mHideable && shouldHide(releasedChild, yvel)) {
+				top = mParentHeight;
+				targetState = STATE_HIDDEN;
+			} else if (yvel == 0.f) {
+				int currentTop = releasedChild.getTop();
+				if (Math.abs(currentTop - mMinOffset) < Math.abs(currentTop - mMaxOffset)) {
+					top = mMinOffset;
+					targetState = STATE_EXPANDED;
+				} else {
+					top = mMaxOffset;
+					targetState = STATE_COLLAPSED;
+				}
+			} else {
+				top = mMaxOffset;
+				targetState = STATE_COLLAPSED;
+			}
+			if (mViewDragHelper.settleCapturedViewAt(releasedChild.getLeft(), top)) {
+				setStateInternal(STATE_SETTLING);
+				ViewCompat.postOnAnimation(releasedChild,
+						new SettleRunnable(releasedChild, targetState));
+			} else {
+				setStateInternal(targetState);
+			}
+		}
+
+		@Override
+		public int clampViewPositionVertical(View child, int top, int dy) {
+			return MathUtils.clamp(top, mMinOffset, mHideable ? mParentHeight : mMaxOffset);
+		}
+
+		@Override
+		public int clampViewPositionHorizontal(View child, int left, int dx) {
+			return child.getLeft();
+		}
+
+		@Override
+		public int getViewVerticalDragRange(View child) {
+			if (mHideable) {
+				return mParentHeight - mMinOffset;
+			} else {
+				return mMaxOffset - mMinOffset;
+			}
+		}
+	};
+
+	void dispatchOnSlide(int top) {
+		View bottomSheet = mViewRef.get();
+		if (bottomSheet != null && mCallback != null) {
+			if (top > mMaxOffset) {
+				mCallback.onSlide(bottomSheet, (float) (mMaxOffset - top) /
+						(mParentHeight - mMaxOffset));
+			} else {
+				mCallback.onSlide(bottomSheet,
+						(float) (mMaxOffset - top) / ((mMaxOffset - mMinOffset)));
+			}
+		}
+	}
+
+	@VisibleForTesting
+	int getPeekHeightMin() {
+		return mPeekHeightMin;
+	}
+
+	private class SettleRunnable implements Runnable {
+
+		private final View mView;
+
+		@State
+		private final int mTargetState;
+
+		SettleRunnable(View view, @State int targetState) {
+			mView = view;
+			mTargetState = targetState;
+		}
+
+		@Override
+		public void run() {
+			if (mViewDragHelper != null && mViewDragHelper.continueSettling(true)) {
+				ViewCompat.postOnAnimation(mView, this);
+			} else {
+				setStateInternal(mTargetState);
+			}
+		}
+	}
+
+	protected static class SavedState extends AbsSavedState {
+		@State
+		final int state;
+
+		public SavedState(Parcel source) {
+			this(source, null);
+		}
+
+		public SavedState(Parcel source, ClassLoader loader) {
+			super(source, loader);
+			//noinspection ResourceType
+			state = source.readInt();
+		}
+
+		public SavedState(Parcelable superState, @State int state) {
+			super(superState);
+			this.state = state;
+		}
+
+		@Override
+		public void writeToParcel(Parcel out, int flags) {
+			super.writeToParcel(out, flags);
+			out.writeInt(state);
+		}
+
+		public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
+			@Override
+			public SavedState createFromParcel(Parcel in, ClassLoader loader) {
+				return new SavedState(in, loader);
+			}
+
+			@Override
+			public SavedState createFromParcel(Parcel in) {
+				return new SavedState(in, null);
+			}
+
+			@Override
+			public SavedState[] newArray(int size) {
+				return new SavedState[size];
+			}
+		};
+	}
+
+	/**
+	 * A utility function to get the {@link ExtendedBottomSheetBehavior} associated with the {@code view}.
+	 *
+	 * @param view The {@link View} with {@link ExtendedBottomSheetBehavior}.
+	 * @return The {@link ExtendedBottomSheetBehavior} associated with the {@code view}.
+	 */
+	@SuppressWarnings("unchecked")
+	public static <V extends View> ExtendedBottomSheetBehavior<V> from(V view) {
+		ViewGroup.LayoutParams params = view.getLayoutParams();
+		if (!(params instanceof CoordinatorLayout.LayoutParams)) {
+			throw new IllegalArgumentException("The view is not a child of CoordinatorLayout");
+		}
+		CoordinatorLayout.Behavior behavior = ((CoordinatorLayout.LayoutParams) params)
+				.getBehavior();
+		if (!(behavior instanceof ExtendedBottomSheetBehavior)) {
+			throw new IllegalArgumentException(
+					"The view is not associated with BottomSheetBehavior");
+		}
+		return (ExtendedBottomSheetBehavior<V>) behavior;
+	}
+
+}