diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index db7a5e04b6..38d0fb5889 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">إلغاء التنزيل</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">حذف</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">حذف الخرائط القديمة و المتابعة</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">لا تسئلني مرة أخرى</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">ميل</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">موقعي</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">لم يتم اكتشاف أي اتصال مع الانترنت</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">لم يتم العثور على أي اتصال واي فاي. هل ترغب باستخدام حزمة البيانات الخليوية (GPRS ، EDGE ، 3G أو LTE) من أجل تنزيل %s؟</string>
 	<string name="ok">موافق</string>
@@ -73,8 +69,6 @@
 	<string name="search">البحث</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">ابحث في الخريطة</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">لا يوجد مساحة كافية على القرص</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">انقر للتنزيل</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -425,13 +419,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">إصدار MAPS.ME الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">تحديث الكل</string>
+	<string name="downloader_update_all_button">تحديث الكل</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">إلغاء الكل</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">المُنزَّلة</string>
+	<string name="downloader_downloaded_subtitle">تم تنزيلها</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">مَصْفوف</string>
+	<string name="downloader_near_me_subtitle">بالقرب مني</string>
+	<string name="downloader_status_maps">الخرائط: %s</string>
+	<string name="downloader_download_all_button">تنزيل الكل</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">عند إنشاء مسارات الطرق في تطبيق MAPS.ME، يرجى أخذ التالي في الحسبان:\n\n  - المسارات المقترحة تعتبر مجرد اقتراحات فقط.\n - حالة الطريق وقوانينه والإشارات الموجودة فيه لها الأولولية أثناء تقديم نصائح الملاحة.\n - قد تكون الخريطة خاطئة أو قديمة، لذا فإنه يمكن ألا تُرسم المسارات بالشكل الأمثل.\n\n  كن آمنا على الطريق وانتبه لتفسك!</string>
 	<!-- Outdated maps category -->
@@ -825,8 +822,6 @@
 	<string name="p2p_only_from_current">تتوافر إمكانية التنقل فقط من خلال موقعك الحالي. هل تريد أن نخطط لك طريقاً بديلاً؟</string>
 	<string name="p2p_reroute_from_current">هل ترغب في أن نرسم مسار لك من موقعك الحالي؟</string>
 	<string name="whats_new_next_button">التالي</string>
-	<string name="whats_new_night_caption">وضع التجول الليلي</string>
-	<string name="whats_new_night_body">لتسهيل استخدام MAPS.ME أثناء القيادة في الظلام، فقد أضفنا وضع التجول الليلي. إنه يعمل تلقائيا بعد غروب الشمس.</string>
 	<string name="editor_time_add">إضافة جدول</string>
 	<string name="editor_time_delete">حذف جدول</string>
 	<!-- Text for allday switch. -->
@@ -842,9 +837,6 @@
 	<string name="editor_correct_mistake">تصحيح الخطأ</string>
 	<string name="editor_correct_mistake_message">قمت بخطأ في التحرير. يرجى تصحيح الخطأ أو التبديل إلى الوضع البسيط.</string>
 	<string name="migrate_title">هام!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">لقد قسمنا الخرائط إلى أجزاء. الآن يمكنك تنزيل مناطق منفصلة، وليس البلد بأكمله. قبل البدء في تنزيل الخرائط الجديدة، يرجى إزالة النسخ القديمة.</string>
-	<string name="youve_been_asking">لقد طلبتم ذلك، وها نحن قد لبينا طلبكم</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">تنزيل الكل</string>
 	<string name="delete_all">حذف الكل</string>
@@ -908,6 +900,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">البريد الإلكتروني أو اسم المستخدم</string>
 	<string name="phone">الهاتف</string>
-	<string name="whats_new_editor_caption">حرر خريطتك على MAPS.ME</string>
-	<string name="whats_new_editor_message">تغييراتك سوف تساعد الملايين من المستخدمين. هيا نطور من العالم سويا!</string>
+	<string name="please_note">يرجى العلم أنه،</string>
+	<string name="common_no_wifi_dialog">لا يوجد اتصال واي فاي. هل ترغب في استخدام بيانات الهاتف للاتصال؟</string>
+	<string name="downloader_delete_map_dialog">سيتم حذف جميع التغييرات بالخريطة بالإضافة إلى حذف الخريطة نفسها.</string>
+	<string name="downloader_update_maps">تحديث الخرائط</string>
+	<string name="downloader_mwm_migration_dialog">لإنشاء مسار، فأنت تحتاج إلى تحديث كافة الخرائط ثم إعادة تخطيط المسار مرة أخرى.</string>
+	<string name="downloader_search_field_hint">اعثر على الخريطة</string>
+	<string name="migration_update_all_button">تحديث جميع الخرائط</string>
+	<string name="migration_delete_all_download_current_button">تنزيل الخريطة الحالية وحذف الخرائط القديمة</string>
+	<string name="migration_prefetch_status">جار الإعداد لتحديث الخرائط…</string>
+	<string name="migration_download_error_dialog">خطأ بالتنزيل</string>
+	<string name="common_check_internet_connection_dialog">يرجى التحقق من الإعدادات والتأكد من اتصال جهازك بالإنترنت.</string>
+	<string name="downloader_no_space_title">مساحة غير كافية</string>
+	<string name="downloader_no_space_message">من فضلك، قم بإزالة البيانات غير الضرورية</string>
+	<string name="editor_general_auth_error_dialog">خطأ بتسجيل الدخول العام.</string>
+	<string name="editor_login_error_dialog">خطأ في تسجيل الدخول.</string>
+	<string name="editor_login_failed_dialog">فشل تسجيل الدخول</string>
+	<string name="editor_username_error_dialog">اسم المستخدم غير صحيح</string>
+	<string name="editor_place_edited_dialog">لقد قمت بتعديل هدف!</string>
+	<string name="editor_login_with_osm">تسجيل الدخول عبر OpenStreetMap</string>
+	<string name="editor_profile_changes">التغيرات:</string>
+	<string name="editor_profile_unsent_changes">لم ترسل</string>
+	<string name="editor_focus_map_on_location">اسحب الخريطة لتحدد الموقع الصحيح للهدف.</string>
+	<string name="editor_add_select_category">اختر الفئة</string>
+	<string name="editor_add_select_category_popular_subtitle">شائع</string>
+	<string name="editor_add_select_category_all_subtitle">جميع الفئات</string>
+	<string name="editor_edit_place_title">تعديل</string>
+	<string name="editor_add_place_title">إٍضافة</string>
+	<string name="editor_edit_place_name_hint">اسم المكان</string>
+	<string name="editor_edit_place_category_title">الفئة</string>
+	<string name="placepage_add_place_button">إضافة مكان</string>
+	<string name="placepage_report_problem_button">الإبلاغ عن مشكلة</string>
+	<string name="whatsnew_smallmwm_header">لقد طلبتم ذلك، وها نحن قد لبينا طلبكم</string>
+	<string name="whatsnew_smallmwm_message">لقد قسمنا الخرائط إلى أجزاء. الآن يمكنك تنزيل مناطق منفصلة، وليس البلد بأكمله.</string>
+	<string name="whatsnew_search_message">لقد طورنا كليا البحث بالعنوان. فلترى بنفسك.</string>
+	<string name="whatsnew_editor_title">تعديل الخريطة *</string>
+	<string name="whatsnew_editor_message_1">قم بإضافة أماكن جديدة للخريطة، وعدل أماكن حالية مباشرة من التطبيق.</string>
+	<string name="whatsnew_editor_message_2">*تستخدم MAPS.ME البيانات الخاصة بخريطة OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">لن تضل الطريق أبدا بعد الآن</string>
+	<string name="onboarding_offline_navigation_message">قم بتخطيط أفضل طرق السيارات والمشاة، حتى مع عدم وجود اتصال بالإنترنت!</string>
+	<string name="onboarding_offline_navigation_title_2">الملاحة في وضع غير متصل</string>
+	<string name="onboarding_offline_navigation_message_2">خطط أفضل طرق السيارات والمشاة.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME – خرائط غير متصلة بالإنترنت</string>
+	<string name="onboarding_offline_maps_message">قم بتنزيل خرائط للمنطقة المطلوب مرة واحدة، واستخدم وظائف الملاحة والبحث دون الحاجة للاتصال بالإنترنت.</string>
+	<string name="onboarding_notifications_message">تابع إخطارات التحديث للحصول على أحدث الخرائط</string>
+	<string name="onboarding_notifications_title">تفعيل إخطارات التحديث</string>
+	<string name="onboarding_location_title">ساعدنا في العثور عليك</string>
+	<string name="onboarding_location_message">لاستخدام الملاحة والميزات الأخرى، فنحن بحاجة إلى تحديد موقعك الجغرافي.</string>
 </resources>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index a276f4e6fe..c4636b999b 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Zrušit stahování</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Smazat</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Smazat staré mapy a pokračovat</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Už se neptat</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Míle</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Moje poloha</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Připojení k Internetu nenalezeno</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Připojení k WiFi nenalezeno. Chcete použít mobilní sítě (GPRS, EDGE, 3G nebo LTE) pro stažení %s?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Hledat</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Prohledat mapu</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Nedostatek volného úložného prostoru</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Klepněte pro stažení</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -426,13 +420,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Nová verze MAPS.ME umožňuje vytvářet trasy z vaší aktuální polohy do cílového bodu. Chcete-li tuto funkci používat, aktualizujte mapy.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Aktualizovat vše</string>
+	<string name="downloader_update_all_button">Aktualizovat vše</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Zrušit vše</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Stažené</string>
+	<string name="downloader_downloaded_subtitle">Staženo</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">ve frontě</string>
+	<string name="downloader_near_me_subtitle">Poblíž mě</string>
+	<string name="downloader_status_maps">Mapy: %s</string>
+	<string name="downloader_download_all_button">Stáhnout vše</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Při vytváření tras v aplikaci MAPS.ME mějte, prosím, na paměti následující:\n\n • Navrhované trasy lze brát jen jako doporučení.\n • Pravidla silničního provozu, aktuální podmínky na silnici a dopravní značení mají přednost před údaji z navigace.\n • Mapa může být nepřesná nebo zastaralá a navržené cesty nemusí být ideální.\n\nCestujte bezpečně a ohleduplně. Šťastnou cestu!</string>
 	<!-- Outdated maps category -->
@@ -826,8 +823,6 @@
 	<string name="p2p_only_from_current">Navigace je dostupná pouze z vašeho současného umístění.</string>
 	<string name="p2p_reroute_from_current">Chcete, abychom naplánovali trasu z vašeho současného umístění?</string>
 	<string name="whats_new_next_button">Další</string>
-	<string name="whats_new_night_caption">Navigace v nočním režimu</string>
-	<string name="whats_new_night_body">Přidali jsme noční režim, abyste mohli MAPS.ME používat při řízení v noci. Zapíná se automaticky po západu slunce.</string>
 	<string name="editor_time_add">Přidat rozvrh</string>
 	<string name="editor_time_delete">Smazat rozvrh</string>
 	<!-- Text for allday switch. -->
@@ -843,9 +838,6 @@
 	<string name="editor_correct_mistake">Opravit chybu</string>
 	<string name="editor_correct_mistake_message">Při úpravách jste udělali chybu. Opravte ji prosím, nebo přepněte do jednoduchého režimu.</string>
 	<string name="migrate_title">Důležité!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Rozdělili jsme mapy na části. Nyní si můžete stáhnout jednotlivé regiony namísto celé země. Než začnete stahovat nové mapy, prosím, odstraňte ty staré.</string>
-	<string name="youve_been_asking">Říkali jste si o to, a my to udělali</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Stáhnout vše</string>
 	<string name="delete_all">Odstranit vše</string>
@@ -909,6 +901,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail nebo uživatelské jméno</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Upravujte mapu přímo z MAPS.ME</string>
-	<string name="whats_new_editor_message">Vaše změny pomůžou miliónům uživatelů. Pojďme společně vylepšit svět!</string>
+	<string name="please_note">Vezměte prosím na vědomí</string>
+	<string name="common_no_wifi_dialog">Žádné Wi-Fi připojení. Chcete pokračovat s mobilními daty?</string>
+	<string name="downloader_delete_map_dialog">Zároveň s touto mapou budou odstraněny také všechny změny na této mapě.</string>
+	<string name="downloader_update_maps">Aktualizujte mapy</string>
+	<string name="downloader_mwm_migration_dialog">Chcete-li vytvořit trasu, pak musíte aktualizovat všechny mapy a poté trasu naplánovat znovu.</string>
+	<string name="downloader_search_field_hint">Najít mapu</string>
+	<string name="migration_update_all_button">Aktualizovat všechny mapy</string>
+	<string name="migration_delete_all_download_current_button">Stáhněte si aktuální mapu a odstraňte staré</string>
+	<string name="migration_prefetch_status">Probíhá příprava na aktualizace map…</string>
+	<string name="migration_download_error_dialog">Chyba při stahování</string>
+	<string name="common_check_internet_connection_dialog">Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu.</string>
+	<string name="downloader_no_space_title">Nedostatek místa</string>
+	<string name="downloader_no_space_message">Odstraňte prosím nepotřebná data</string>
+	<string name="editor_general_auth_error_dialog">Obecná chyba při přihlašování.</string>
+	<string name="editor_login_error_dialog">Chyba při přihlašování.</string>
+	<string name="editor_login_failed_dialog">Přihlašování selhalo</string>
+	<string name="editor_username_error_dialog">Uživatelské jméno není platné</string>
+	<string name="editor_place_edited_dialog">Upravili jste objekt!</string>
+	<string name="editor_login_with_osm">Přihlásit se pomocí OpenStreetMap</string>
+	<string name="editor_profile_changes">Změny:</string>
+	<string name="editor_profile_unsent_changes">Neodesláno</string>
+	<string name="editor_focus_map_on_location">Táhněte mapu, abyste vybrali správné umístění objektu.</string>
+	<string name="editor_add_select_category">Vyberte kategorii</string>
+	<string name="editor_add_select_category_popular_subtitle">Populární</string>
+	<string name="editor_add_select_category_all_subtitle">Všechny kategorie</string>
+	<string name="editor_edit_place_title">Probíhají úpravy</string>
+	<string name="editor_add_place_title">Probíhá přidávání</string>
+	<string name="editor_edit_place_name_hint">Název místa</string>
+	<string name="editor_edit_place_category_title">Kategorie</string>
+	<string name="placepage_add_place_button">Přidat místo</string>
+	<string name="placepage_report_problem_button">Nahlásit problém</string>
+	<string name="whatsnew_smallmwm_header">Říkali jste si o to, a my to udělali</string>
+	<string name="whatsnew_smallmwm_message">Rozdělili jsme mapy na části. Nyní si můžete stáhnout jednotlivé regiony namísto celé země.</string>
+	<string name="whatsnew_search_message">Výrazně jsme vylepšili vyhledávání podle adresy. Podívejte se sami.</string>
+	<string name="whatsnew_editor_title">Upravit mapu*</string>
+	<string name="whatsnew_editor_message_1">Přidejte na mapu nová místa a upravte existující místa přímo z aplikace.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME používá komunitní data OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Již nikdy nezabloudíte</string>
+	<string name="onboarding_offline_navigation_message">Naplánujte si optimální trasy pro auto nebo pěší chůzi, i když tam nebude připojení k internetu!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigace</string>
+	<string name="onboarding_offline_navigation_message_2">Naplánujte si optimální trasy pro auto nebo pěší chůzi.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline mapy</string>
+	<string name="onboarding_offline_maps_message">Stáhněte si jednou mapy požadované oblasti a poté používejte navigaci a vyhledávací funkce bez připojení k internetu.</string>
+	<string name="onboarding_notifications_message">Chcete-li získat nejnovější mapy, pak zapněte upozornění na aktualizace</string>
+	<string name="onboarding_notifications_title">Povolit upozornění na aktualizace</string>
+	<string name="onboarding_location_title">Pomozte nám vás najít</string>
+	<string name="onboarding_location_message">Chcete-li používat navigaci a další funkce, pak potřebujeme přístup k vaší zeměpisné poloze.</string>
 </resources>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 31709f034e..fbd780a7ea 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Annuller download</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Slet</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Slet gamle kort og gå videre</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Spørg mig ikke igen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -50,8 +48,6 @@
 	<string name="miles">Mil</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Min position</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Ingen internetforbindelse registreret</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Ingen WiFi forbindelse registreret. Vil du bruge mobildata (GPRS, EDGE, 3G eller LTE) til download %s?</string>
 	<string name="ok">Ok</string>
@@ -71,8 +67,6 @@
 	<string name="search">Søg</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Søg kort</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Der er ikke nok ledig plads på telefonen</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Tryk for at downloade</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -423,13 +417,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Den nye version af MAPS.ME gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Opdater alle</string>
+	<string name="downloader_update_all_button">Opdatér alle</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Aflys Alt</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Downloadede</string>
+	<string name="downloader_downloaded_subtitle">Downloadet</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">i kø</string>
+	<string name="downloader_near_me_subtitle">I nærheden</string>
+	<string name="downloader_status_maps">Kort: %s</string>
+	<string name="downloader_download_all_button">Download alle</string>
 	<!-- Outdated maps category -->
 	<string name="downloader_outdated_maps">Uddateret</string>
 	<!-- Up to date maps category -->
@@ -821,8 +818,6 @@
 	<string name="p2p_only_from_current">Navigation er kun tilgængelig fra din nuværende lokalitet.</string>
 	<string name="p2p_reroute_from_current">Ønsker du, at vi planlægger en rute fra din nuværende placering?</string>
 	<string name="whats_new_next_button">Næste</string>
-	<string name="whats_new_night_caption">Navigering i nattilstand</string>
-	<string name="whats_new_night_body">For at hjælpe med brugen af MAPS.ME ved kørsel om natten har vi tilføjet nattilstand. Den slår automatisk til efter solnedgang.</string>
 	<string name="editor_time_add">Tilføj tidsplan</string>
 	<string name="editor_time_delete">Slet tidsplan</string>
 	<!-- Text for allday switch. -->
@@ -838,9 +833,6 @@
 	<string name="editor_correct_mistake">Ret fejl</string>
 	<string name="editor_correct_mistake_message">Du har lavet en redigeringsfejl. Ret den, eller skift til enkel tilstand.</string>
 	<string name="migrate_title">Vigtigt!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Vi har delt kort op i dele. Nu kan man downloade separate regioner, ikke hele landet. Før du begynder på at downloade nye kort, så venligst fjern de gamle.</string>
-	<string name="youve_been_asking">I har bedt om det, og vi har gjort det</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Download alle</string>
 	<string name="delete_all">Slet alle</string>
@@ -904,6 +896,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail eller brugernavn</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Redigér kortet direkte fra MAPS.ME</string>
-	<string name="whats_new_editor_message">Dine ændringer vil hjælpe millioner af brugere. Lad os forbedre verden sammen!</string>
+	<string name="please_note">Bemærk venligst</string>
+	<string name="common_no_wifi_dialog">Ingen WiFi-forbindelse. Vil du fortsætte med mobildata?</string>
+	<string name="downloader_delete_map_dialog">Alle kortændringer vil blive slettet sammen med kortet.</string>
+	<string name="downloader_update_maps">Opdatér kort</string>
+	<string name="downloader_mwm_migration_dialog">For at oprette en rute skal du opdatere alle kort og så planlægge ruten igen.</string>
+	<string name="downloader_search_field_hint">Find kortet</string>
+	<string name="migration_update_all_button">Opdatér alle kort</string>
+	<string name="migration_delete_all_download_current_button">Download aktuelt kort og slet de gamle</string>
+	<string name="migration_prefetch_status">Forbereder kortopdatering…</string>
+	<string name="migration_download_error_dialog">Fejl ved download</string>
+	<string name="common_check_internet_connection_dialog">Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet.</string>
+	<string name="downloader_no_space_title">Ikke nok plads</string>
+	<string name="downloader_no_space_message">Fjern unødvendig data</string>
+	<string name="editor_general_auth_error_dialog">Generel fejl ved login.</string>
+	<string name="editor_login_error_dialog">Login-fejl.</string>
+	<string name="editor_login_failed_dialog">Login mislykkedes</string>
+	<string name="editor_username_error_dialog">Ugyldigt brugernavn</string>
+	<string name="editor_place_edited_dialog">Du har redigeret et objekt!</string>
+	<string name="editor_login_with_osm">Login med OpenStreetMap</string>
+	<string name="editor_profile_changes">Ændringer:</string>
+	<string name="editor_profile_unsent_changes">Ikke sendt</string>
+	<string name="editor_focus_map_on_location">Træk kortet for at vælge objektets korrekte placering.</string>
+	<string name="editor_add_select_category">Vælg kategori</string>
+	<string name="editor_add_select_category_popular_subtitle">Populær</string>
+	<string name="editor_add_select_category_all_subtitle">Alle kategorier</string>
+	<string name="editor_edit_place_title">Redigerer</string>
+	<string name="editor_add_place_title">Tilføjer</string>
+	<string name="editor_edit_place_name_hint">Stedets navn</string>
+	<string name="editor_edit_place_category_title">Kategori</string>
+	<string name="placepage_add_place_button">Tilføj et sted</string>
+	<string name="placepage_report_problem_button">Anmeld et problem</string>
+	<string name="whatsnew_smallmwm_header">I har bedt om det, og vi har gjort det</string>
+	<string name="whatsnew_smallmwm_message">Vi har delt kort op i dele. Nu kan man downloade separate regioner, ikke hele landet.</string>
+	<string name="whatsnew_search_message">Vi har forbedret søgningen efter adresse betydeligt. Se selv.</string>
+	<string name="whatsnew_editor_title">Redigér kortet*</string>
+	<string name="whatsnew_editor_message_1">Tilføj nye steder til kortet og redigér eksisterende direkte fra app\&#39;en.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME bruger fællesskabsdata fra OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Du vil aldrig fare vild igen</string>
+	<string name="onboarding_offline_navigation_message">Planlæg de optimale ruter i bil og til fods selv uden internetforbindelse!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigering</string>
+	<string name="onboarding_offline_navigation_message_2">Planlæg de optimale ruter i bil og til fods.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline kort</string>
+	<string name="onboarding_offline_maps_message">Download kortene til det ønskede område en gang, og brug navigerings- og søgefunktionerne uden internetforbindelse.</string>
+	<string name="onboarding_notifications_message">For at modtage de nyeste kort kan du få opdateringsnotifikationer</string>
+	<string name="onboarding_notifications_title">Aktivér opdateringsnotifikationer</string>
+	<string name="onboarding_location_title">Hjælp os med at finde dig</string>
+	<string name="onboarding_location_message">For at bruge navigering og andre funktioner skal vi have adgang til din geolokation.</string>
 </resources>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 8503efc6eb..03696299d0 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Herunterladen abbrechen</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Löschen</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Alte Karten löschen und fortsetzen</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Nicht mehr fragen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Meilen</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Mein Standort</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Keine Internetverbindung</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Keine WLAN-Verbindung. Möchten Sie %s über das Mobilnetz (GPRS, EDGE, 3G oder LTE) herunterladen?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Suche</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Auf der Karte suchen</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Speicherplatz reicht nicht aus</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Antippen, um herunterzuladen</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -441,13 +435,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Karten, um diese Funktion nutzen zu können.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Alles aktualisieren</string>
+	<string name="downloader_update_all_button">Alle aktualisieren</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Alle abbrechen</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Heruntergeladen</string>
+	<string name="downloader_downloaded_subtitle">Heruntergeladen</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">in der Warteschlange</string>
+	<string name="downloader_near_me_subtitle">In meiner Nähe</string>
+	<string name="downloader_status_maps">Karten: %s</string>
+	<string name="downloader_download_all_button">Alle herunterladen</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Beim Erstellen von Routen mit der MAPS.ME-App sollten Sie Folgendes beachten:\n\n  - Vorgeschlagenen Routen können nur als Empfehlungen angesehen werden.\n - Straßenbedingungen, Verkehrsregeln und Schilder haben höhere Priorität als Navigationsratschläge.\n - Die Karte kann falsch oder veraltet sein und Routen könnten somit nicht auf die bestmögliche Weise erstellt worden sein.\n\n  Bleiben Sie auf der Straße sicher und achten Sie auf sich selbst!</string>
 	<!-- Outdated maps category -->
@@ -841,8 +838,6 @@
 	<string name="p2p_only_from_current">Die Navigation ist nur von Ihrem aktuellen Standort verfügbar.</string>
 	<string name="p2p_reroute_from_current">Soll eine Route von Ihrem aktuellen Standort aus berechnet werden?</string>
 	<string name="whats_new_next_button">Weiter</string>
-	<string name="whats_new_night_caption">Nachtmodus-Navigation</string>
-	<string name="whats_new_night_body">Um die Nutzung von MAPS.ME beim Fahren im Dunkeln zu erleichtern, haben wir den Nachtmodus hinzugefügt. Dieser wird automatisch nach Sonnenuntergang aktiviert.</string>
 	<string name="editor_time_add">Zeitplan hinzufügen</string>
 	<string name="editor_time_delete">Zeitplan löschen</string>
 	<!-- Text for allday switch. -->
@@ -858,9 +853,6 @@
 	<string name="editor_correct_mistake">Fehler korrigieren</string>
 	<string name="editor_correct_mistake_message">Es ist ein Bearbeitungsfehler aufgetreten. Bitte korrigieren oder zum Einfachmodus wechseln.</string>
 	<string name="migrate_title">Wichtig!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Wir haben die Karten aufgeteilt. Jetzt können Sie einzelne Regionen herunterladen, ohne das ganze Land herunterzuladen. Bevor Sie damit beginnen, neue Karten herunterzuladen, löschen Sie bitte Ihre alten Karten.</string>
-	<string name="youve_been_asking">Sie haben darum gebeten, und wir haben es geschafft</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Alle herunterladen</string>
 	<string name="delete_all">Alle löschen</string>
@@ -924,6 +916,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-Mail oder Benutzername</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Bearbeiten der Karte direkt in MAPS.ME</string>
-	<string name="whats_new_editor_message">Ihre Veränderungen werden Millionen von Benutzern helfen. Lasst uns zusammen die Welt verbessern!</string>
+	<string name="please_note">Bitte beachten</string>
+	<string name="common_no_wifi_dialog">Keine WLAN-Verbindung. Möchten Sie mit mobilen Daten fortfahren?</string>
+	<string name="downloader_delete_map_dialog">Alle Kartenänderungen werden zusammen mit der Karte gelöscht.</string>
+	<string name="downloader_update_maps">Karten aktualisieren</string>
+	<string name="downloader_mwm_migration_dialog">Um eine Strecke zu erstellen, müssen Sie alle Karten aktualisieren und dann die Strecken erneut planen.</string>
+	<string name="downloader_search_field_hint">Karte finden</string>
+	<string name="migration_update_all_button">Alle Karten aktualisieren</string>
+	<string name="migration_delete_all_download_current_button">Laden Sie die aktuelle Karte herunter und löschen Sie alte Karten</string>
+	<string name="migration_prefetch_status">Karten-Update wird vorbereitet …</string>
+	<string name="migration_download_error_dialog">Download-Fehler</string>
+	<string name="common_check_internet_connection_dialog">Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass Ihr Gerät mit dem Internet verbunden ist.</string>
+	<string name="downloader_no_space_title">Nicht genügend Platz</string>
+	<string name="downloader_no_space_message">Bitte entfernen Sie unnötige Daten</string>
+	<string name="editor_general_auth_error_dialog">Allgemeiner Login-Fehler.</string>
+	<string name="editor_login_error_dialog">Login-Fehler.</string>
+	<string name="editor_login_failed_dialog">Login fehlgeschlagen</string>
+	<string name="editor_username_error_dialog">Benutzername ist ungültig</string>
+	<string name="editor_place_edited_dialog">Sie haben ein Objekt bearbeitet!</string>
+	<string name="editor_login_with_osm">Mit OpenStreetMap anmelden</string>
+	<string name="editor_profile_changes">Änderungen:</string>
+	<string name="editor_profile_unsent_changes">Nicht gesendet</string>
+	<string name="editor_focus_map_on_location">Ziehen Sie die Karte, um den Standort des Objektes zu korrigieren.</string>
+	<string name="editor_add_select_category">Kategorie auswählen</string>
+	<string name="editor_add_select_category_popular_subtitle">Beliebt</string>
+	<string name="editor_add_select_category_all_subtitle">Alle Kategorien</string>
+	<string name="editor_edit_place_title">Wird bearbeitet</string>
+	<string name="editor_add_place_title">Wird hinzugefügt</string>
+	<string name="editor_edit_place_name_hint">Name des Orts</string>
+	<string name="editor_edit_place_category_title">Kategorie</string>
+	<string name="placepage_add_place_button">Einen Ort hinzufügen</string>
+	<string name="placepage_report_problem_button">Problem melden</string>
+	<string name="whatsnew_smallmwm_header">Sie haben darum gebeten, und wir haben es geschafft</string>
+	<string name="whatsnew_smallmwm_message">Wir haben die Karten aufgeteilt. Jetzt können Sie einzelne Regionen herunterladen, ohne das ganze Land herunterzuladen.</string>
+	<string name="whatsnew_search_message">Wir haben die Adresssuche dramatisch verbessert. Sehen Sie selbst.</string>
+	<string name="whatsnew_editor_title">Karte bearbeiten*</string>
+	<string name="whatsnew_editor_message_1">Fügen Sie auf der Karte einen neuen Ort hinzu und bearbeiten Sie existierende Ort direkt in der App.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME verwendet Community-Daten von OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Sie werden sich nie wieder verfahren oder verlaufen</string>
+	<string name="onboarding_offline_navigation_message">Planen Sie die optimalen Auto- und Fußgängerstrecken, selbst wenn es keine Internetverbindung gibt!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline-Navigation</string>
+	<string name="onboarding_offline_navigation_message_2">Planen Sie optimale Auto- und Fußgängerstrecken.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - Offline-Karten</string>
+	<string name="onboarding_offline_maps_message">Laden Sie die Karten für das gewünschte Gebiet auf einmal herunter und verwenden Sie die Navigation- und Such-Funktion ohne eine Internetverbindung.</string>
+	<string name="onboarding_notifications_message">Um die neuesten Karten zu erhalten, aktivieren Sie bitte die Update-Benachrichtigungen</string>
+	<string name="onboarding_notifications_title">Update-Benachrichtigungen aktualisieren</string>
+	<string name="onboarding_location_title">Helfen Sie uns dabei, Sie zu finden</string>
+	<string name="onboarding_location_message">Um Navigation und andere Funktionen zu verwenden, brauchen wir Zugriff auf Ihren Geo-Standort.</string>
 </resources>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 942fcbcc5d..d26c148588 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Cancelar descarga</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Eliminar</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Eliminar mapas antiguos y seguir</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">No volver a preguntar</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Milla</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Mi posición</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">No hay conexión al Internet</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">No hay conexión Wifi. ¿Quieres descargar el mapa con tu plan de datos móviles?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -66,8 +62,6 @@
 	<string name="search">Buscar</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Buscar en el mapa</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">No hay suficiente espacio libre</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Presionar para descargar</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -412,13 +406,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Actualizar todos</string>
+	<string name="downloader_update_all_button">Actualizar todos</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Cancelar todo</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Descargados</string>
+	<string name="downloader_downloaded_subtitle">Descargado</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">En cola</string>
+	<string name="downloader_near_me_subtitle">Cerca de mí</string>
+	<string name="downloader_status_maps">Mapas: %s</string>
+	<string name="downloader_download_all_button">Descarar todos</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Creando rutas en la aplicación MAPS.ME, por favor, tenga en cuenta lo siguiente:\n\n  - Las rutas sugeridas se pueden considerar únicamente como recomendaciones.\n - Las condiciones de la carretera, las normas y las señales de tráfico tienen mayor prioridad que el consejo de navegación.\n - El mapa podría ser incorrecto o estar obsoleto y las rutas pueden no crear el mejor camino posible.\n\n  ¡Esté seguro en las carreteras y cuídese!</string>
 	<!-- Outdated maps category -->
@@ -814,8 +811,6 @@
 	<string name="p2p_only_from_current">La navegación solo está disponible desde tu ubicación actual.</string>
 	<string name="p2p_reroute_from_current">¿Quieres que planeemos un ruta desde tu ubicación actual?</string>
 	<string name="whats_new_next_button">Siguiente</string>
-	<string name="whats_new_night_caption">Navegación en modo nocturno</string>
-	<string name="whats_new_night_body">Para facilitar el uso de MAPS.ME al conducir en la oscuridad, hemos añadido el modo nocturno. Este se activa automáticamente tras el atardecer.</string>
 	<string name="editor_time_add">Añadir horario</string>
 	<string name="editor_time_delete">Eliminar horario</string>
 	<!-- Text for allday switch. -->
@@ -831,9 +826,6 @@
 	<string name="editor_correct_mistake">Corregir error</string>
 	<string name="editor_correct_mistake_message">Ha cometido un error de edición. Por favor, corríjalo o cambie a modo sencillo.</string>
 	<string name="migrate_title">¡Importante!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Hemos dividido el mapa por partes. Ahora, puedes descargar regiones individuales, en vez de el país entero. Antes de empezar a descargar mapas nuevos, por favor, elimina los anteriores.</string>
-	<string name="youve_been_asking">Llevas tiempo pidiéndolo y lo hemos hecho</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Descargar todos</string>
 	<string name="delete_all">Eliminar todos</string>
@@ -897,6 +889,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">Correo electrónico o usuario</string>
 	<string name="phone">Teléfono</string>
-	<string name="whats_new_editor_caption">Edita el mapa directamente desde MAPS.ME</string>
-	<string name="whats_new_editor_message">Tus cambios ayudarán a millones de usuarios. ¡Vamos a mejorar juntos el mundo!</string>
+	<string name="please_note">Aviso</string>
+	<string name="common_no_wifi_dialog">No hay conexión Wi-Fi. ¿Quieres continuar con los datos móviles?</string>
+	<string name="downloader_delete_map_dialog">Todos los cambios en los mapas se borrarán junto con el mapa.</string>
+	<string name="downloader_update_maps">Autodescarga de mapas</string>
+	<string name="downloader_mwm_migration_dialog">Los mapas empiezan a descargarse automáticamente cuando te aproximas al mapa.</string>
+	<string name="downloader_search_field_hint">Encontrar el mapa</string>
+	<string name="migration_update_all_button">Actualizar todos los mapas</string>
+	<string name="migration_delete_all_download_current_button">Descargar el mapa actual y eliminar los mapas antiguos</string>
+	<string name="migration_prefetch_status">Preparando la actualización de mapas…</string>
+	<string name="migration_download_error_dialog">Error de descarga</string>
+	<string name="common_check_internet_connection_dialog">Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet.</string>
+	<string name="downloader_no_space_title">Sin espacio suficiente</string>
+	<string name="downloader_no_space_message">Por favor, elimina los datos innecesarios</string>
+	<string name="editor_general_auth_error_dialog">Error general de inicio de sesión.</string>
+	<string name="editor_login_error_dialog">Error de inicio de sesión.</string>
+	<string name="editor_login_failed_dialog">Error al iniciar sesión</string>
+	<string name="editor_username_error_dialog">Usuario no válido</string>
+	<string name="editor_place_edited_dialog">¡Has editado un objeto!</string>
+	<string name="editor_login_with_osm">Iniciar sesión con OpenStreetMap</string>
+	<string name="editor_profile_changes">Cambios:</string>
+	<string name="editor_profile_unsent_changes">No enviado</string>
+	<string name="editor_focus_map_on_location">Arrastra el mapa para seleccionar la ubicación correcta del objeto.</string>
+	<string name="editor_add_select_category">Seleccionar categoría</string>
+	<string name="editor_add_select_category_popular_subtitle">Popular</string>
+	<string name="editor_add_select_category_all_subtitle">Todas las categorías</string>
+	<string name="editor_edit_place_title">Editar</string>
+	<string name="editor_add_place_title">Añadir</string>
+	<string name="editor_edit_place_name_hint">Nombre del lugar</string>
+	<string name="editor_edit_place_category_title">Categoría</string>
+	<string name="placepage_add_place_button">Añadir un lugar</string>
+	<string name="placepage_report_problem_button">Informar de un problema</string>
+	<string name="whatsnew_smallmwm_header">Llevas tiempo pidiéndolo y lo hemos hecho</string>
+	<string name="whatsnew_smallmwm_message">Hemos dividido el mapa por partes. Ahora, puedes descargar regiones individuales, en vez de el país entero.</string>
+	<string name="whatsnew_search_message">Hemos mejorado notablemente la búsqueda por dirección. Compruébalo.</string>
+	<string name="whatsnew_editor_title">Editar el mapa*</string>
+	<string name="whatsnew_editor_message_1">Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME utiliza datos de la comunidad de OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Nunca volverás a perderte</string>
+	<string name="onboarding_offline_navigation_message">Planifica rutas óptimas en coche y a pie, ¡incluso si no hay conexión a Internet!</string>
+	<string name="onboarding_offline_navigation_title_2">Navegación fuera de línea</string>
+	<string name="onboarding_offline_navigation_message_2">Planifica rutas óptimas en coche y a pie.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - mapas sin conexión</string>
+	<string name="onboarding_offline_maps_message">Descarga una vez los mapas para el área deseada, y utiliza las funciones de navegación y búsqueda sin conexión a Internet.</string>
+	<string name="onboarding_notifications_message">Para recibir los mapas más recientes, obtén las notificaciones de actualización</string>
+	<string name="onboarding_notifications_title">Permitir notificaciones de actualización</string>
+	<string name="onboarding_location_title">Ayúdanos a encontrarte</string>
+	<string name="onboarding_location_message">Para utilizar la navegación y otras funciones, necesitamos acceso a tu geolocalización.</string>
 </resources>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index fe4d0f82fb..599ebfc413 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Peruuta lataus</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Poista</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Poista vanhat kartat ja jatka</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Älä kysy uudelleen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Mailit</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Sijaintini</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Internet-yhteyttä ei havaittu</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">WiFi-yhteyttä ei havaittu. Haluatko käyttää mobiilidataa (GPRS, EDGE, 3G tai LTE) ladataksesi tiedoston %s?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Haku</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Hae kartalta</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Ei tarpeeksi tyhjää levytilaa</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Lataa koskettamalla</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -419,13 +413,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Uusi MAPS.ME -versio mahdollistaa reittien luonnin nykyisestä sijainnista määränpäähäsi.Päivitä kartat käyttääksesi tätä ominaisuutta.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Päivitä kaikki</string>
+	<string name="downloader_update_all_button">Päivitä kaikki</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Peruuta kaikki</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Ladattu</string>
+	<string name="downloader_downloaded_subtitle">Ladatut</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">jonossa</string>
+	<string name="downloader_near_me_subtitle">Minun lähelläni</string>
+	<string name="downloader_status_maps">Kartat: %s</string>
+	<string name="downloader_download_all_button">Lataa kaikki</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Pidä mielessä seuraavat seikat luodessasi reittejä MAPS.ME -sovelluksella:\n\n- Ehdotettuja reittejä tulee pitää vain suosituksina.\n- Teiden kunto, liikennesäännöt ja -merkit on aina otettava huomioon navigointiehdotuksista huolimatta.\n - Kartassa saattaa olla virheitä, tai se saattaa olla vanhentunut, eikä reittejä sen takia voida luoda parhaalla mahdollisella tavalla.\n\nPysy valppaana liikenteessä ja pidä huolta itsestäsi!</string>
 	<!-- Outdated maps category -->
@@ -819,8 +816,6 @@
 	<string name="p2p_only_from_current">Navigointi onnistuu vain nykyisestä sijainnistasi.</string>
 	<string name="p2p_reroute_from_current">Haluatko valita vaihtoehtoisen reitin?</string>
 	<string name="whats_new_next_button">Seuraava</string>
-	<string name="whats_new_night_caption">Yötilanavigaatio</string>
-	<string name="whats_new_night_body">Olemme lisänneet yötilan helpottaaksemme MAPS.ME:n käyttöä pimeällä ajettaessa. Se menee automaattisesti päälle auringonlaskun jälkeen.</string>
 	<string name="editor_time_add">Lisää aikataulu</string>
 	<string name="editor_time_delete">Poista aikataulu</string>
 	<!-- Text for allday switch. -->
@@ -836,9 +831,6 @@
 	<string name="editor_correct_mistake">Korjaa virhe</string>
 	<string name="editor_correct_mistake_message">Teit muokkausvirheen. Korjaa se tai vaihda yksinkertaiseen malliin.</string>
 	<string name="migrate_title">Tärkeää!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Olemme jakaneet kartat osiin, joten voitkin nyt ladata pelkkiä alueita lataamatta koko maan karttaa. Ennen uusien karttojen lataamista tulee sinun kuitenkin poistaa vanhat kartat laitteeltasi.</string>
-	<string name="youve_been_asking">Sitä on pyydetty, ja nyt se on tarjolla</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Lataa kaikki</string>
 	<string name="delete_all">Poista kaikki</string>
@@ -902,6 +894,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">Sähköposti tai käyttäjätunnus</string>
 	<string name="phone">Puhelinnumero</string>
-	<string name="whats_new_editor_caption">Muokkaa karttoja suoraan MAPS.ME -sovelluksessa</string>
-	<string name="whats_new_editor_message">Muokkauksesi auttavat miljoonia käyttäjiä — parannetaan maailmaa yhdessä!</string>
+	<string name="please_note">Huomaathan, että</string>
+	<string name="common_no_wifi_dialog">Ei Wi-Fi -yhteyttä. Haluatko jatkaa mobiilidatan avulla?</string>
+	<string name="downloader_delete_map_dialog">Kaikki karttaan tehdyt muutokset poistetaan kartan mukana.</string>
+	<string name="downloader_update_maps">Päivitä kartat</string>
+	<string name="downloader_mwm_migration_dialog">Sinun täytyy päivittää kaikki kartat ja suunnitella reitti uudelleen luodaksesi uuden reitin.</string>
+	<string name="downloader_search_field_hint">Etsi kartta</string>
+	<string name="migration_update_all_button">Päivitä kaikki kartat</string>
+	<string name="migration_delete_all_download_current_button">Lataa nykyinen kartta ja poista kaikki vanhat kartat</string>
+	<string name="migration_prefetch_status">Karttojen päivitystä ladataan…</string>
+	<string name="migration_download_error_dialog">Latausvirhe</string>
+	<string name="common_check_internet_connection_dialog">Tarkista asetuksesi ja varmista, että laitteesi on yhteydessä Internetiin.</string>
+	<string name="downloader_no_space_title">Ei tarpeeksi tilaa</string>
+	<string name="downloader_no_space_message">Poista tarpeeton data</string>
+	<string name="editor_general_auth_error_dialog">Yleinen kirjautumisvirhe.</string>
+	<string name="editor_login_error_dialog">Kirjautumisvirhe.</string>
+	<string name="editor_login_failed_dialog">Kirjautuminen epäonnistui</string>
+	<string name="editor_username_error_dialog">Käyttäjätunnus on virheellinen</string>
+	<string name="editor_place_edited_dialog">Olet muokannut kohdetta!</string>
+	<string name="editor_login_with_osm">Kirjaudu sisään OpenStreetMapissa</string>
+	<string name="editor_profile_changes">Muutokset:</string>
+	<string name="editor_profile_unsent_changes">Ei lähetetty</string>
+	<string name="editor_focus_map_on_location">Vedä karttaa valitaksesi kohteelle oikean sijainnin.</string>
+	<string name="editor_add_select_category">Valitse kategoria</string>
+	<string name="editor_add_select_category_popular_subtitle">Suositut</string>
+	<string name="editor_add_select_category_all_subtitle">Kaikki kategoriat</string>
+	<string name="editor_edit_place_title">Muokkaus</string>
+	<string name="editor_add_place_title">Lisääminen</string>
+	<string name="editor_edit_place_name_hint">Paikan nimi</string>
+	<string name="editor_edit_place_category_title">Kategoria</string>
+	<string name="placepage_add_place_button">Lisää paikka</string>
+	<string name="placepage_report_problem_button">Ilmoita ongelmasta</string>
+	<string name="whatsnew_smallmwm_header">Sitä on pyydetty, ja nyt se on tarjolla</string>
+	<string name="whatsnew_smallmwm_message">Olemme jakaneet kartat osiin, joten voitkin nyt ladata pelkkiä alueita lataamatta koko maan karttaa.</string>
+	<string name="whatsnew_search_message">Olemme selkeästi parantaneet osoitehakua - kokeile vaikka itse.</string>
+	<string name="whatsnew_editor_title">Muokkaa karttaa*</string>
+	<string name="whatsnew_editor_message_1">Lisää karttaan uusia paikkoja ja muokkaa sovelluksessa olevia karttoja suoraan sovelluksessa.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME käyttää OpenStreetMap -yhteisön dataa.</string>
+	<string name="onboarding_offline_navigation_title">Et eksy enää koskaan</string>
+	<string name="onboarding_offline_navigation_message">Suunnittele ihanteellinen autoilu- tai kävelyreitti jopa ilman Internet-yhteyttä!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline-navigointi</string>
+	<string name="onboarding_offline_navigation_message_2">Suunnittele ihanteelliset autoilu- ja kävelyreitit.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline-kartat</string>
+	<string name="onboarding_offline_maps_message">Lataa haluamasi alueen kartat yhden kerran ja voit käyttää navigointi- ja hakutoimintoja ilman Internet-yhteyttä.</string>
+	<string name="onboarding_notifications_message">Ota päivitysilmoitukset käyttöön saadaksesi tuoreimmat kartat</string>
+	<string name="onboarding_notifications_title">Ota päivitysilmoitukset käyttöön</string>
+	<string name="onboarding_location_title">Auta meitä löytämään sinut</string>
+	<string name="onboarding_location_message">Tarvitsemme sijaintisi käyttääksemme navigointia ja muita ominaisuuksia.</string>
 </resources>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index bd718a68a6..f4ae5f1287 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Annuler le téléchargement</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Supprimer</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Supprimer les anciennes cartes et continuer</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Ne plus me demander</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Miles</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Ma position</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Aucune connexion Internet détectée</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Aucun connexion Wi-Fi détectée. Désirez-vous utiliser les données mobiles (GPRS, EDGE, 3G ou LTE) pour télécharger %s ?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -72,8 +68,6 @@
 	<string name="search">Recherche</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Rechercher sur la carte</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Il n\&#39;y a pas assez d\&#39;espace disque libre</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Toucher pour télécharger</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -430,13 +424,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Tout mettre à jour</string>
+	<string name="downloader_update_all_button">Mettre à jour tout</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Tout annuler</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Téléchargé</string>
+	<string name="downloader_downloaded_subtitle">Téléchargé</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">en file d\&#39;attente</string>
+	<string name="downloader_near_me_subtitle">Près de moi</string>
+	<string name="downloader_status_maps">Cartes : %s</string>
+	<string name="downloader_download_all_button">Télécharger tout</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Quand vous créez des itinéraires sur l\&#39;application MAPS.ME, veuillez garder à l\&#39;esprit les points suivants :\n\n  - Les itinéraires suggérés ne doivent être considérés que comme des recommandations.\n\n  - Les conditions des routes, les règlementations de circulations et les panneaux sont prioritaires sur les conseils de navigation.\n\n  - Il est possible qu\&#39;une carte soit incorrecte ou obsolète, et les itinéraires ne sont pas toujours créés de la meilleure façon possible.\n\n  Soyez prudents sur les routes et prenez soin de vous.</string>
 	<!-- Outdated maps category -->
@@ -830,8 +827,6 @@
 	<string name="p2p_only_from_current">La navigation est uniquement disponible à partir de votre emplacement actuel.</string>
 	<string name="p2p_reroute_from_current">Souhaitez-vous que nous planifiions un itinéraire à partir de votre emplacement actuel ?</string>
 	<string name="whats_new_next_button">Neste</string>
-	<string name="whats_new_night_caption">Navigation en mode nuit</string>
-	<string name="whats_new_night_body">Pour faciliter l\&#39;utilisation de MAPS.ME en conduisant dans l\&#39;obscurité, nous avons ajouté le mode nuit. Il se met automatiquement en marche après le coucher du soleil.</string>
 	<string name="editor_time_add">Ajouter au planning</string>
 	<string name="editor_time_delete">Supprimer du planning</string>
 	<!-- Text for allday switch. -->
@@ -847,9 +842,6 @@
 	<string name="editor_correct_mistake">Corriger l\&#39;erreur</string>
 	<string name="editor_correct_mistake_message">Vous avez fait une erreur d\&#39;édition. Veuillez la corriger ou passer en mode simple.</string>
 	<string name="migrate_title">Important !</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Nous avons divisé la carte en plusieurs parties. Désormais, vous pouvez télécharger des régions bien précises, et non plus le pays tout entier. Avant de commencer à télécharger de nouvelles cartes , veillez à effacer les anciennes.</string>
-	<string name="youve_been_asking">Vous avez été nombreux à nous le demander et nous avons satisfait votre requête.</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Tout télécharger</string>
 	<string name="delete_all">Supprimer tout</string>
@@ -913,6 +905,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail ou nom d\&#39;utilisateur</string>
 	<string name="phone">Numéro de téléphone</string>
-	<string name="whats_new_editor_caption">Modifiez la carte directement depuis MAPS.ME</string>
-	<string name="whats_new_editor_message">Vos modifications aideront des millions d\&#39;utilisateurs. Améliorons le monde ensemble !</string>
+	<string name="please_note">À noter</string>
+	<string name="common_no_wifi_dialog">Aucune connexion Wi-Fi. Voulez-vous continuer avec les données mobiles ?</string>
+	<string name="downloader_delete_map_dialog">Toutes les modifications de la carte seront supprimées avec elle.</string>
+	<string name="downloader_update_maps">Mettre à jour les cartes</string>
+	<string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\&#39;itinéraire.</string>
+	<string name="downloader_search_field_hint">Trouver la carte</string>
+	<string name="migration_update_all_button">Mettre à jour toutes les cartes</string>
+	<string name="migration_delete_all_download_current_button">Téléchargez la carte actuelle et supprimez les anciennes</string>
+	<string name="migration_prefetch_status">Préparation de la mise à jour des cartes…</string>
+	<string name="migration_download_error_dialog">Erreur de téléchargement</string>
+	<string name="common_check_internet_connection_dialog">Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet.</string>
+	<string name="downloader_no_space_title">Espace insuffisant</string>
+	<string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
+	<string name="editor_general_auth_error_dialog">Erreur générale de connexion.</string>
+	<string name="editor_login_error_dialog">Erreur de connexion.</string>
+	<string name="editor_login_failed_dialog">La connexion a échoué</string>
+	<string name="editor_username_error_dialog">Le nom d\&#39;utilisateur est invalide</string>
+	<string name="editor_place_edited_dialog">Vous avez modifié un objet !</string>
+	<string name="editor_login_with_osm">Connexion avec OpenStreetMap</string>
+	<string name="editor_profile_changes">Modifications :</string>
+	<string name="editor_profile_unsent_changes">Non envoyé</string>
+	<string name="editor_focus_map_on_location">Tirez la carte pour sélectionner la bonne position de l\&#39;objet.</string>
+	<string name="editor_add_select_category">Sélectionner une catégorie</string>
+	<string name="editor_add_select_category_popular_subtitle">Populaire</string>
+	<string name="editor_add_select_category_all_subtitle">Toutes les catégories</string>
+	<string name="editor_edit_place_title">Modification</string>
+	<string name="editor_add_place_title">Ajout</string>
+	<string name="editor_edit_place_name_hint">Nom du lieu</string>
+	<string name="editor_edit_place_category_title">Catégorie</string>
+	<string name="placepage_add_place_button">Ajouter une position</string>
+	<string name="placepage_report_problem_button">Signaler un problème</string>
+	<string name="whatsnew_smallmwm_header">Vous avez été nombreux à nous le demander et nous avons satisfait votre requête</string>
+	<string name="whatsnew_smallmwm_message">Nous avons divisé la carte en plusieurs parties. Désormais, vous pouvez télécharger des régions bien précises, et non plus le pays tout entier.</string>
+	<string name="whatsnew_search_message">Nous avons apporté des améliorations considérables à la recherche par adresse. Voyez par vous-même.</string>
+	<string name="whatsnew_editor_title">Modifier la carte*</string>
+	<string name="whatsnew_editor_message_1">Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l\&#39;appli.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME utilise les données de la communauté OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Vous ne vous perdrez plus jamais</string>
+	<string name="onboarding_offline_navigation_message">Planifiez des itinéraires optimaux en voiture ou à pied, même en l\&#39;absence de connexion Internet !</string>
+	<string name="onboarding_offline_navigation_title_2">Navigation hors-ligne</string>
+	<string name="onboarding_offline_navigation_message_2">Planifiez des itinéraires optimaux en voiture ou à pied.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME – cartes hors-ligne</string>
+	<string name="onboarding_offline_maps_message">Téléchargez une seule fois les cartes de la zone désirée, et utilisez les fonctions de navigation et de recherche sans connexion Internet.</string>
+	<string name="onboarding_notifications_message">Pour recevoir les dernières cartes, recevez des notifications de mise à jour</string>
+	<string name="onboarding_notifications_title">Activer les notifications de mise à jour</string>
+	<string name="onboarding_location_title">Aidez-nous à vous trouver</string>
+	<string name="onboarding_location_message">Pour utiliser la navigation et d\&#39;autres fonctionnalités, nous devons pouvoir accéder à votre position géographique.</string>
 </resources>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 187dac48a9..b4b216f507 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Letöltés megszakítása</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Törlés</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Régi térképek törlése és folytatás</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Ne kérdezze többször</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Mérföld</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Saját helyzet</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Nem találtam internet kapcsolatot</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Nem találtam WiFi kapcsolatot. Használjunk mobil kapcsolatot (GPRS, EDGE, 3G vagy LTE) %s letöltéséhez?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Keresés</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Keresés a térképen</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Nincs elég szabad hely a lemezen</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Érintse meg letöltéshez</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -420,13 +414,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">A MAPS.ME új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Mind frissítése</string>
+	<string name="downloader_update_all_button">Mindegyik frissítése</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Mindent visszavon</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Letöltve</string>
+	<string name="downloader_downloaded_subtitle">Letöltve</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">várólistás</string>
+	<string name="downloader_near_me_subtitle">A közelemben</string>
+	<string name="downloader_status_maps">Térképek: %s</string>
+	<string name="downloader_download_all_button">Mindegyik letöltése</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Amikor útvonalakat készít a MAPS.ME appban, kérjük, vegye figyelembe a következőket:\n\n  - Az ajánlott útvonalak csak javaslatoknak tekintendők.\n - Az utak kondíciója, a forgalmi szabályok és jelzőtáblák magasabb prioritásúak, mint a navigációs javaslatok.\n - A térkép lehet, hogy hibás vagy idejétmúlt, az útvonalak pedig lehet, hogy nem a lehető legjobb módon készülnek el.\n\n  Legyen óvatos az utakon és vigyázzon magára!</string>
 	<!-- Outdated maps category -->
@@ -820,8 +817,6 @@
 	<string name="p2p_only_from_current">A navigáció csak a jelenlegi helyzetéből érhető el.</string>
 	<string name="p2p_reroute_from_current">Szeretne útvonaltervet készíttetni a jelenlegi pozíciójától?</string>
 	<string name="whats_new_next_button">Következő</string>
-	<string name="whats_new_night_caption">Navigáció éjszakai módban</string>
-	<string name="whats_new_night_body">A MAPS.ME használatának sötétben való vezetés közbeni elősegítése érdekében hozzáadtuk a funkciókhoz az éjszakai módot. Naplemente után automatikusan bekapcsol.</string>
 	<string name="editor_time_add">Időrend felvitele</string>
 	<string name="editor_time_delete">Időrend törlése</string>
 	<!-- Text for allday switch. -->
@@ -837,9 +832,6 @@
 	<string name="editor_correct_mistake">Hiba javítása</string>
 	<string name="editor_correct_mistake_message">Szerkesztési hibát vétett. Javítsa ki vagy váltson egyszerű módba.</string>
 	<string name="migrate_title">Fontos!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Felosztottuk részekre a térképeket. Mostantól az egyes régiókat is letöltheted, nem csak az egész országot. Az új térképek letöltése előtt kérjük, távolítsd el a régieket.</string>
-	<string name="youve_been_asking">Te kérted, mi elkészítettük</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Összes letöltése</string>
 	<string name="delete_all">Összes térkép törlése</string>
@@ -903,6 +895,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail vagy felhasználónév</string>
 	<string name="phone">Telefonszám</string>
-	<string name="whats_new_editor_caption">Térkép szerkesztése közvetlenül a MAPS.ME-ből</string>
-	<string name="whats_new_editor_message">Javításaid felhasználóik millióinak fognak majd segíteni. Javítsunk együtt a világon!</string>
+	<string name="please_note">Megjegyzés</string>
+	<string name="common_no_wifi_dialog">Nincs WiFi-kapcsolat. Szeretnéd folytatni mobil adatforgalom használatával?</string>
+	<string name="downloader_delete_map_dialog">A térképekkel együtt minden rajtuk végzett módosítás is törlésre kerül.</string>
+	<string name="downloader_update_maps">Térképek frissítése</string>
+	<string name="downloader_mwm_migration_dialog">Útvonal létrehozásához frissítsd az összes térképet, majd tervezd meg újra az útvonalat.</string>
+	<string name="downloader_search_field_hint">Térkép keresése</string>
+	<string name="migration_update_all_button">Minden térkép frissítése</string>
+	<string name="migration_delete_all_download_current_button">Töltsd le a jelenlegi térképet és töröld a régieket</string>
+	<string name="migration_prefetch_status">Térképfrissítések előkészítése…</string>
+	<string name="migration_download_error_dialog">Letöltési hiba</string>
+	<string name="common_check_internet_connection_dialog">Kérjük, ellenőrizd a beállításaid és győződj meg arról, hogy a készüléked kapcsolódik az internethez.</string>
+	<string name="downloader_no_space_title">Nincs elegendő tárhely</string>
+	<string name="downloader_no_space_message">Kérjük, töröld a szükségtelen adatokat</string>
+	<string name="editor_general_auth_error_dialog">Általános bejelentkezési hiba.</string>
+	<string name="editor_login_error_dialog">Bejelentkezési hiba.</string>
+	<string name="editor_login_failed_dialog">Sikertelen bejelentkezés</string>
+	<string name="editor_username_error_dialog">Érvénytelen felhasználónév</string>
+	<string name="editor_place_edited_dialog">Szerkesztettél egy objektumot!</string>
+	<string name="editor_login_with_osm">Bejelentkezés OpenStreetMappel</string>
+	<string name="editor_profile_changes">Változások:</string>
+	<string name="editor_profile_unsent_changes">Nincs elküldve</string>
+	<string name="editor_focus_map_on_location">Húzd a térképet a megfelelő helyre az objektum helyes helyszínének kiválasztásához.</string>
+	<string name="editor_add_select_category">Válassz kategóriát</string>
+	<string name="editor_add_select_category_popular_subtitle">Népszerűek</string>
+	<string name="editor_add_select_category_all_subtitle">Minden kategória</string>
+	<string name="editor_edit_place_title">Szerkesztés</string>
+	<string name="editor_add_place_title">Hozzáadás</string>
+	<string name="editor_edit_place_name_hint">Hely neve</string>
+	<string name="editor_edit_place_category_title">Kategória</string>
+	<string name="placepage_add_place_button">Hely hozzáadása</string>
+	<string name="placepage_report_problem_button">Hibabejelentés</string>
+	<string name="whatsnew_smallmwm_header">Te kérted, mi elkészítettük</string>
+	<string name="whatsnew_smallmwm_message">Felosztottuk részekre a térképeket. Mostantól az egyes régiókat is letöltheted, nem csak az egész országot.</string>
+	<string name="whatsnew_search_message">Jelentősen javítottunk a címen alapuló keresésünkön. Nézd meg magadnak.</string>
+	<string name="whatsnew_editor_title">Térkép szerkesztése*</string>
+	<string name="whatsnew_editor_message_1">Adj hozzá új helyeket a térképhez, és szerkeszd a meglévőket közvetlenül az alkalmazásból.</string>
+	<string name="whatsnew_editor_message_2">* A MAPS.ME az OpenStreetMap közösség adatait használja.</string>
+	<string name="onboarding_offline_navigation_title">Többé nem fogsz eltévedni</string>
+	<string name="onboarding_offline_navigation_message">Tervezd meg az optimális autós és gyalogos útvonalakat, akkor is, ha nincs internetkapcsolat!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigáció</string>
+	<string name="onboarding_offline_navigation_message_2">Tervezd meg az optimális autós és gyalogos útvonalakat.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline térképek</string>
+	<string name="onboarding_offline_maps_message">Mindössze egyszer kell letöltened egy adott helyszín térképét, azt követően internetkapcsolat nélkül is használhatod a navigációs és keresési funkciókat.</string>
+	<string name="onboarding_notifications_message">Fogadj értesítő üzeneteket a legfrissebb térképekről</string>
+	<string name="onboarding_notifications_title">Értesítések engedélyezése</string>
+	<string name="onboarding_location_title">Segíts, hogy megtaláljunk</string>
+	<string name="onboarding_location_message">A navigáció és egyéb funkciók használatához hozzá kell férnünk a geolokációdhoz.</string>
 </resources>
diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml
index caffab99b3..770dd86799 100644
--- a/android/res/values-in/strings.xml
+++ b/android/res/values-in/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Batalkan Pengunduhan</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Hapus</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Hapus peta tua dan lanjutkan</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Jangan tanyai saya lagi</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Mil</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Posisi Saya</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Tidak ada koneksi internet yang terdeteksi</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Tidak ada koneksi WiFi yang terdeteksi. Apakah Anda ingin menggunakan paket data seluler (GPRS, EDGE, 3G or LTE) untuk mengunduh %s?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Cari</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Cari Peta</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Tidak ada ruang kosong yang cukup</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Sentuh untuk mengunduh</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -419,13 +413,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Versi MAPS.ME yang terbaru memungkinkan pembuatan rute dari posisi Anda saat itu ke titik tujuan. Mohon perbarui peta untuk menggunakan fitur ini.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Perbarui semuanya</string>
+	<string name="downloader_update_all_button">Perbarui semua</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Batalkan Semuanya</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Telah Diunduh</string>
+	<string name="downloader_downloaded_subtitle">Diunduh</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">telah diantrekan</string>
+	<string name="downloader_near_me_subtitle">Dekat saya</string>
+	<string name="downloader_status_maps">Peta: %s</string>
+	<string name="downloader_download_all_button">Unduh semua</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Dalam membuat rute di aplikasi MAPS.ME, mohon ingat:\n\n- Rute yang disarankan hanya dapat dianggap sebagai rekomendasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Peta bisa saja salah atau sudah usang, dan rute yang dibuat mungkin bukan yang terbaik.\n\nBerhati-hatilah di jalan dan jagalah diri Anda sendiri!</string>
 	<!-- Outdated maps category -->
@@ -818,8 +815,6 @@
 	<string name="p2p_only_from_current">Navigasi tersedia hanya dari lokasi Anda saat ini.</string>
 	<string name="p2p_reroute_from_current">Apakah Anda ingin kami merencanakan sebuah rute dari lokasi Anda saat ini?</string>
 	<string name="whats_new_next_button">Berikut</string>
-	<string name="whats_new_night_caption">Navigasi mode malam</string>
-	<string name="whats_new_night_body">Untuk memfasilitasi penggunaan MAPS.ME saat berkendara dalam gelap, kami telah menambahkan mode malam. Mode ini diaktifkan secara otomatis setelah matahari terbenam.</string>
 	<string name="editor_time_add">Tambah Jadwal</string>
 	<string name="editor_time_delete">Hapus Jadwal</string>
 	<!-- Text for allday switch. -->
@@ -835,9 +830,6 @@
 	<string name="editor_correct_mistake">Koreksi kesalahan</string>
 	<string name="editor_correct_mistake_message">Pengeditan salah. Koreksi atau ubah ke mode sederhana.</string>
 	<string name="migrate_title">Penting!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Kami telah membagi peta menjadi beberapa bagian. Sekarang Anda dapat mengunduh wilayah-wilayah yang terpisah, bukan seluruh negara. Sebelum Anda mulai mengunduh peta-peta baru, harap menghapus peta-peta yang lama.</string>
-	<string name="youve_been_asking">Anda memintanya dan kami telah malakukannya</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Unduh semua</string>
 	<string name="delete_all">Hapus semua</string>
@@ -901,6 +893,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">Surel atau nama pengguna</string>
 	<string name="phone">Telepon</string>
-	<string name="whats_new_editor_caption">Edit peta secara langsung dari MAPS.ME</string>
-	<string name="whats_new_editor_message">Perubahan yang anda lakukan akan membantu jutaan pengguna. Marilah meningkatkan dunia bersama-sama!</string>
+	<string name="please_note">Harap diperhatikan</string>
+	<string name="common_no_wifi_dialog">Tidak ada koneksi WiFi. Apakah Anda ingin melanjutkan dengan data seluler?</string>
+	<string name="downloader_delete_map_dialog">Semua perubahan peta akan dihapus bersama dengan peta.</string>
+	<string name="downloader_update_maps">Perbarui peta</string>
+	<string name="downloader_mwm_migration_dialog">Untuk membuat rute, Anda perlu memperbarui semua peta dan kemudian merencanakan rute tersebut lagi.</string>
+	<string name="downloader_search_field_hint">Temukan peta</string>
+	<string name="migration_update_all_button">Perbarui semua peta</string>
+	<string name="migration_delete_all_download_current_button">Unduh peta sekarang dan hapus peta lama</string>
+	<string name="migration_prefetch_status">Mempersiapkan pembaruan peta…</string>
+	<string name="migration_download_error_dialog">Unduh kesalahan</string>
+	<string name="common_check_internet_connection_dialog">Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.</string>
+	<string name="downloader_no_space_title">Tidak cukup ruang</string>
+	<string name="downloader_no_space_message">Harap menghapus data yang tidak diperlukan</string>
+	<string name="editor_general_auth_error_dialog">Kesalahan masuk umum.</string>
+	<string name="editor_login_error_dialog">Kesalahan masuk.</string>
+	<string name="editor_login_failed_dialog">Masuk gagal</string>
+	<string name="editor_username_error_dialog">Nama pengguna tidak benar</string>
+	<string name="editor_place_edited_dialog">Anda telah mengedit sebuah obyek!</string>
+	<string name="editor_login_with_osm">Masuk dengan OpenStreetMap</string>
+	<string name="editor_profile_changes">Perubahan:</string>
+	<string name="editor_profile_unsent_changes">Tidak terkirim</string>
+	<string name="editor_focus_map_on_location">Tarik peta untuk memilih lokasi yang benar dari obyek.</string>
+	<string name="editor_add_select_category">Pilih kategori</string>
+	<string name="editor_add_select_category_popular_subtitle">Populer</string>
+	<string name="editor_add_select_category_all_subtitle">Semua kategori</string>
+	<string name="editor_edit_place_title">Mengedit</string>
+	<string name="editor_add_place_title">Menambahkan</string>
+	<string name="editor_edit_place_name_hint">Nama tempat</string>
+	<string name="editor_edit_place_category_title">Kategori</string>
+	<string name="placepage_add_place_button">Tambahkan tempat</string>
+	<string name="placepage_report_problem_button">Laporkan masalah</string>
+	<string name="whatsnew_smallmwm_header">Anda memintanya dan kami telah malakukannya</string>
+	<string name="whatsnew_smallmwm_message">Kami telah membagi peta menjadi beberapa bagian. Sekarang Anda dapat mengunduh wilayah-wilayah yang terpisah, bukan seluruh negara.</string>
+	<string name="whatsnew_search_message">Kami secara signifikan telah meningkatkan pencarian menurut alamat. Lihat sendiri.</string>
+	<string name="whatsnew_editor_title">Edit peta*</string>
+	<string name="whatsnew_editor_message_1">Tambahkan tempat-tempat baru di peta, dan edit peta-peta yang ada langsung dari aplikasi.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME menggunakan data komunitas OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Anda tidak akan tersesat lagi</string>
+	<string name="onboarding_offline_navigation_message">Rencanakan rute mobil dan pejalan kaki yang optimal, meskipun tidak ada koneksi internet!</string>
+	<string name="onboarding_offline_navigation_title_2">Navigasi Offline</string>
+	<string name="onboarding_offline_navigation_message_2">Rencanakan rute mobil dan pejalan kaki yang optimal.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - peta offline</string>
+	<string name="onboarding_offline_maps_message">Unduh peta untuk daerah yang diinginkan sekali, dan gunakan navigasi dan fungsi pencarian tanpa koneksi internet.</string>
+	<string name="onboarding_notifications_message">Untuk menerima peta-peta terbaru, dapatkan pemberitahuan pembaruan</string>
+	<string name="onboarding_notifications_title">Aktifkan pemberitahuan pembaruan</string>
+	<string name="onboarding_location_title">Membantu kami menemukan Anda</string>
+	<string name="onboarding_location_message">Untuk menggunakan navigasi dan fitur-fitur lainnya, kami perlu mengakses geolokasi Anda.</string>
 </resources>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 501e441190..1df4d2722f 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Annulla il download</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Cancella</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Cancella le vecchie mappe e procedi</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Non me lo chiedere di nuovo</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Miglia</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">La mia posizione</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Non è stata rilevata alcuna connessione Internet</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Non è stata rilevata alcuna connessione WiFi. Vuoi utilizzare i dati cellulare (GPRS, EDGE, 3G o LTE) per scaricare %s?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Cerca</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Ricerca Mappa</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Non c\&#39;è abbastanza spazio libero su disco</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Tocca per scaricare</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -418,13 +412,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Aggiorna tutto</string>
+	<string name="downloader_update_all_button">Aggiorna tutte</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Annulla tutto</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Scaricate</string>
+	<string name="downloader_downloaded_subtitle">Scaricate</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">in coda</string>
+	<string name="downloader_near_me_subtitle">Vicino a me</string>
+	<string name="downloader_status_maps">Mappe: %s</string>
+	<string name="downloader_download_all_button">Scarica tutte</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Creando percorsi nell\&#39;app MAPS.ME tieni a mente quanto segue:\n\n  - I percorsi suggeriti possono essere considerati solo come consigliati.\n - Le condizioni della strada, le regole del traffico e i segnali hanno una priorità maggiore rispetto ai consigli sulla circolazione.\n - La mappa potrebbe essere scorretta o datata e i percorsi potrebbero non aver creato la strada migliore possibile.\n\n  Stai attento sulle strade e prenditi cura di te!</string>
 	<!-- Outdated maps category -->
@@ -818,8 +815,6 @@
 	<string name="p2p_only_from_current">La navigazione è disponibile solo dalla tua posizione attuale.</string>
 	<string name="p2p_reroute_from_current">Vuoi che impostiamo il percorso dalla tua posizione corrente?</string>
 	<string name="whats_new_next_button">Avanti</string>
-	<string name="whats_new_night_caption">Navigazione in modalità notturna</string>
-	<string name="whats_new_night_body">Per poter utilizzare al meglio MAPS.ME di sera o di notte, abbiamo aggiunto la modalità notturna. L\&#39;applicazione passerà automaticamente a questa modalità dopo il tramonto.</string>
 	<string name="editor_time_add">Aggiungi orari</string>
 	<string name="editor_time_delete">Elimina orari</string>
 	<!-- Text for allday switch. -->
@@ -835,9 +830,6 @@
 	<string name="editor_correct_mistake">Correggi errore</string>
 	<string name="editor_correct_mistake_message">Hai commesso un errore nella modifica. Correggerlo o passare alla modalità semplice.</string>
 	<string name="migrate_title">Importante!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Abbiamo diviso le mappe in parti. Ora puoi scaricare le regioni separate, non l\&#39;intero paese. Prima di iniziare lo scaricamento di nuove mappe, elimina quelle vecchie.</string>
-	<string name="youve_been_asking">Ce lo avete chiesto e noi lo abbiamo fatto</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Scarica tutto</string>
 	<string name="delete_all">Elimina tutti</string>
@@ -901,6 +893,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail o nome utente</string>
 	<string name="phone">Telefono</string>
-	<string name="whats_new_editor_caption">Modifica la mappa direttamente da MAPS.ME</string>
-	<string name="whats_new_editor_message">Le tue modifiche aiuteranno milioni di utenti. Cerchiamo di migliorare il mondo insieme!</string>
+	<string name="please_note">Si prega di notare</string>
+	<string name="common_no_wifi_dialog">Nessuna connessione WiFi. Vuoi continuare con la connessione dati?</string>
+	<string name="downloader_delete_map_dialog">Tutti i cambiamenti nella mappa saranno cancellati insieme alla mappa.</string>
+	<string name="downloader_update_maps">Aggiorna mappe</string>
+	<string name="downloader_mwm_migration_dialog">Per creare un percorso, devi aggiornare tutte le mappe e pianificare nuovamente il percorso.</string>
+	<string name="downloader_search_field_hint">Trova la mappa</string>
+	<string name="migration_update_all_button">Aggiorna tutte le mappe</string>
+	<string name="migration_delete_all_download_current_button">Scarica la mappa attuale e cancella quelle vecchie</string>
+	<string name="migration_prefetch_status">Preparazione aggiornamento delle mappe…</string>
+	<string name="migration_download_error_dialog">Errore nel download</string>
+	<string name="common_check_internet_connection_dialog">Sei pregato di verificare le tue impostazioni e assicurarti che il tuo dispositivo sia connesso a internet.</string>
+	<string name="downloader_no_space_title">Spazio insufficiente</string>
+	<string name="downloader_no_space_message">Si prega di rimuovere i dati non necessari</string>
+	<string name="editor_general_auth_error_dialog">Errore generale di accesso.</string>
+	<string name="editor_login_error_dialog">Errore accesso.</string>
+	<string name="editor_login_failed_dialog">Accesso fallito</string>
+	<string name="editor_username_error_dialog">Nome utente non valido</string>
+	<string name="editor_place_edited_dialog">Hai modificato un oggetto!</string>
+	<string name="editor_login_with_osm">Accedi con OpenStreetMap</string>
+	<string name="editor_profile_changes">Modifiche:</string>
+	<string name="editor_profile_unsent_changes">Non inviato</string>
+	<string name="editor_focus_map_on_location">Sposta la mappa per selezionare l’esatta posizione dell’oggetto.</string>
+	<string name="editor_add_select_category">Seleziona categoria</string>
+	<string name="editor_add_select_category_popular_subtitle">Popolari</string>
+	<string name="editor_add_select_category_all_subtitle">Tutte le categorie</string>
+	<string name="editor_edit_place_title">Modifica</string>
+	<string name="editor_add_place_title">Aggiunta</string>
+	<string name="editor_edit_place_name_hint">Nome del luogo</string>
+	<string name="editor_edit_place_category_title">Categoria</string>
+	<string name="placepage_add_place_button">Aggiungi un luogo</string>
+	<string name="placepage_report_problem_button">Riporta un problema</string>
+	<string name="whatsnew_smallmwm_header">Ce lo avete chiesto e noi lo abbiamo fatto</string>
+	<string name="whatsnew_smallmwm_message">Abbiamo diviso le mappe in parti. Ora puoi scaricare le regioni separate, non l\&#39;intero paese.</string>
+	<string name="whatsnew_search_message">Abbiamo migliorato significativamente la ricerca per indirizzo. Guarda tu stesso.</string>
+	<string name="whatsnew_editor_title">Modifica la mappa*</string>
+	<string name="whatsnew_editor_message_1">Aggiungi nuovi luoghi alla mappa, e modifica quelli già esistenti direttamente dall’app.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME usa i dati della community OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Non ti perderai mai più</string>
+	<string name="onboarding_offline_navigation_message">Pianifica percorsi ottimali in auto o a piedi, anche senza connessione internet!</string>
+	<string name="onboarding_offline_navigation_title_2">Navigazione offline</string>
+	<string name="onboarding_offline_navigation_message_2">Pianifica percorsi ottimali in auto o a piedi.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME – mappe offline</string>
+	<string name="onboarding_offline_maps_message">Scarica una volta le mappe per l’area desiderata e usa la navigazione e le funzioni di ricerca senza una connessione internet.</string>
+	<string name="onboarding_notifications_message">Per ricevere le mappe aggiornate, attiva le notifiche di aggiornamento</string>
+	<string name="onboarding_notifications_title">Attiva notifiche di aggiornamento</string>
+	<string name="onboarding_location_title">Aiutaci a trovarti</string>
+	<string name="onboarding_location_message">Per usare la navigazione e altri strumenti, dobbiamo accedere alla tua geolocalizzazione.</string>
 </resources>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 9021ce0084..b0629143c3 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">ダウンロードをキャンセル</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">削除</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">古いマップを削除して処理を続行</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">以後、このメッセージを表示しない</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">マイル</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">現在地</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">インターネットに接続されていません</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">WiFi接続が見つかりません。GPRS、EDGE、3G、LTE等の携帯電話回線で%sをダウンロードしますか？</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">検索</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">マップを検索</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">ディスクに十分な空き領域がありません</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">タッチしてダウンロード</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -418,13 +412,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">新バージョンのMAPS.MEは現在地から目的地までのルートを作成可能です。 この機能を使うためにマップを更新してください。</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">全てをアップデート</string>
+	<string name="downloader_update_all_button">全てをアップデート</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">すべてキャンセル</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">ダウンロード済</string>
+	<string name="downloader_downloaded_subtitle">ダウンロード済み</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">待ち行列型の</string>
+	<string name="downloader_near_me_subtitle">付近</string>
+	<string name="downloader_status_maps">地図: %s</string>
+	<string name="downloader_download_all_button">全てをダウンロード</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">MAPS.MEアプリでルートを作成する時は、以下のことに留意してください：\n\n  - 提案されたルートは推奨するだけです。\n - 道路状況、交通規則と標識はナビゲーションのアドバイスより優先度が高くなっています。\n - マップが不正確または古くなっている場合や、ルートが最適な方法で作成されていないことがあります。\n\n  安全運転でご自愛ください！</string>
 	<!-- Outdated maps category -->
@@ -818,8 +815,6 @@
 	<string name="p2p_only_from_current">ナビゲーションは現在位置からのみ利用できます。</string>
 	<string name="p2p_reroute_from_current">現在位置からのルートを作成しますか？</string>
 	<string name="whats_new_next_button">次へ</string>
-	<string name="whats_new_night_caption">夜間モードナビゲーション</string>
-	<string name="whats_new_night_body">MAPS.MEを夜間の運転中に使いやすくするため、夜間モードを追加しました。日の入り後に自動的に切り替わります。</string>
 	<string name="editor_time_add">スケジュール追加</string>
 	<string name="editor_time_delete">スケジュール削除</string>
 	<!-- Text for allday switch. -->
@@ -835,9 +830,6 @@
 	<string name="editor_correct_mistake">間違いの訂正</string>
 	<string name="editor_correct_mistake_message">編集の間違いがあります。訂正するか、シンプルモードに切り替えてください。</string>
 	<string name="migrate_title">重要！</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">マップを分割し、国全体でなく個別の地域をダウンロードできるようにしました。新しいマップをダウンロードする前に、古いものを削除してください。</string>
-	<string name="youve_been_asking">皆様のご要望にお応えして、実現を果たしました</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">全てをダウンロード</string>
 	<string name="delete_all">すべて削除</string>
@@ -901,6 +893,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">メールアドレスまたはユーザー名</string>
 	<string name="phone">電話</string>
-	<string name="whats_new_editor_caption">MAPS.MEで直接地図を編集可能</string>
-	<string name="whats_new_editor_message">地図を修正すると、何百万人ものユーザーの役に立ちます。一緒に世界を改善していきましょう！</string>
+	<string name="please_note">ご注意ください</string>
+	<string name="common_no_wifi_dialog">WiFi接続がありません。モバイルデータ通信を続行しますか?</string>
+	<string name="downloader_delete_map_dialog">この地図を削除すると、今まで行った変更の全ても一緒に削除されます。</string>
+	<string name="downloader_update_maps">地図をアップデート</string>
+	<string name="downloader_mwm_migration_dialog">ルートを作成するには、全ての地図をアップデートした後で再びルート計画を行う必要があります。</string>
+	<string name="downloader_search_field_hint">地図を検索</string>
+	<string name="migration_update_all_button">全ての地図をアップデート</string>
+	<string name="migration_delete_all_download_current_button">現在の地図をダウンロードして古い地図を削除</string>
+	<string name="migration_prefetch_status">地図のアップデートの準備中…</string>
+	<string name="migration_download_error_dialog">ダウンロードエラー</string>
+	<string name="common_check_internet_connection_dialog">設定をチェックし、デバイスがインターネットに接続されているか確認してください。</string>
+	<string name="downloader_no_space_title">十分な空き容量がありません</string>
+	<string name="downloader_no_space_message">不必要なデータを削除してください</string>
+	<string name="editor_general_auth_error_dialog">一般的なログインエラー。</string>
+	<string name="editor_login_error_dialog">ログインエラー。</string>
+	<string name="editor_login_failed_dialog">ログインに失敗しました</string>
+	<string name="editor_username_error_dialog">ユーザー名が無効です</string>
+	<string name="editor_place_edited_dialog">オブジェクトを編集しました!</string>
+	<string name="editor_login_with_osm">OpenStreetMapを使ってログイン</string>
+	<string name="editor_profile_changes">変更回数:</string>
+	<string name="editor_profile_unsent_changes">未送信</string>
+	<string name="editor_focus_map_on_location">地図をプルしてオブジェクトの正しい場所を選択します。</string>
+	<string name="editor_add_select_category">カテゴリを選択</string>
+	<string name="editor_add_select_category_popular_subtitle">人気</string>
+	<string name="editor_add_select_category_all_subtitle">全てのカテゴリ</string>
+	<string name="editor_edit_place_title">編集中</string>
+	<string name="editor_add_place_title">追加中</string>
+	<string name="editor_edit_place_name_hint">場所の名前</string>
+	<string name="editor_edit_place_category_title">カテゴリ</string>
+	<string name="placepage_add_place_button">場所を追加</string>
+	<string name="placepage_report_problem_button">問題を報告</string>
+	<string name="whatsnew_smallmwm_header">皆様のご要望にお応えして、実現を果たしました</string>
+	<string name="whatsnew_smallmwm_message">マップを分割し、国全体でなく個別の地域をダウンロードできるようにしました。</string>
+	<string name="whatsnew_search_message">住所での検索機能を大幅に改善しました。ご自身の目でご覧ください。</string>
+	<string name="whatsnew_editor_title">地図を編集*</string>
+	<string name="whatsnew_editor_message_1">アプリから直接地図に新しい場所を追加したり、既存の場所を編集できます。</string>
+	<string name="whatsnew_editor_message_2">* MAPS.MEはOpenStreetMapコミュニティのデータを使用しています。</string>
+	<string name="onboarding_offline_navigation_title">もう道に迷うことは絶対ありません</string>
+	<string name="onboarding_offline_navigation_message">インターネット接続がなくても、車や徒歩での最短ルートを計画できます!</string>
+	<string name="onboarding_offline_navigation_title_2">オフラインナビゲーション</string>
+	<string name="onboarding_offline_navigation_message_2">車や徒歩での最短ルートを計画できます。</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - オフライン地図</string>
+	<string name="onboarding_offline_maps_message">希望するエリアの地図を一回ダウンロードするだけで、インターネット接続なしでもナビゲーションや検索の機能を使用できます。</string>
+	<string name="onboarding_notifications_message">最新地図の入手のためにアップデート通知を受信</string>
+	<string name="onboarding_notifications_title">アップデート通知を有効にする</string>
+	<string name="onboarding_location_title">現在地判定のお手伝い</string>
+	<string name="onboarding_location_message">ナビゲーションやその他の機能の使用のために、アプリがGeolocationにアクセスする必要があります</string>
 </resources>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index b502a4127b..5a4560d8d1 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">다운로드 취소하기</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">삭제하기</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">이전의 지도를 삭제하고 진행하기</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">또 묻지 마세요.</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">마일</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">나의 위치</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">인터넷이 연결되지 않았습니다.</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">WiFi 연결이 감지되지 않았습니다. %s를 다운로드하기 위해 휴대 자료(GPRS, EDGE, 3G 혹은 LTE)를 사용하시겠습니까?</string>
 	<string name="ok">승인</string>
@@ -67,8 +63,6 @@
 	<string name="search">검색하기</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">지도 검색하기</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">디스크 공간이 부족합니다.</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">두드려 다운로드하세요</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -411,13 +405,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">MAPS.ME의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">모두 업데이트</string>
+	<string name="downloader_update_all_button">모두 업데이트</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">모두 취소</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">다운로드</string>
+	<string name="downloader_downloaded_subtitle">다운로드</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">대기</string>
+	<string name="downloader_near_me_subtitle">내 근처</string>
+	<string name="downloader_status_maps">지도: %s</string>
+	<string name="downloader_download_all_button">모두 다운로드</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">MAPS.ME 앱에서 경로를 작성할 때, 다음에 유의하시기 바랍니다:\n\n  - 추천 루트는 권장 사항으로만 간주될 수 있습니다.\n - 도로 조건, 교통 규칙 및 징후는 탐색 조언보다 더 높은 우선 순위를 갖습니다.\n -지도는 잘못되었거나 만료되었을 수 있으며, 경로는 최상의 방법을 만들어지지 않을 수 있습니다.\n\n  도로에서 안전하게 몸조심하세요!</string>
 	<!-- Outdated maps category -->
@@ -811,8 +808,6 @@
 	<string name="p2p_only_from_current">현재 위치에서만 네비게이션을 사용할 수 있습니다.</string>
 	<string name="p2p_reroute_from_current">현재 위치에서 경로를 계획하시겠습니까?</string>
 	<string name="whats_new_next_button">다음</string>
-	<string name="whats_new_night_caption">야간 모드 탐색</string>
-	<string name="whats_new_night_body">어두운 곳에서 운전할 때 MAPS.ME를 사용하는 걸 용이하게 하려면, 야간 모드에 추가됩니다. 이는 일몰 후 자동으로 전환됩니다.</string>
 	<string name="editor_time_add">스케줄 추가</string>
 	<string name="editor_time_delete">스케줄 삭제</string>
 	<!-- Text for allday switch. -->
@@ -828,9 +823,6 @@
 	<string name="editor_correct_mistake">입력 수정</string>
 	<string name="editor_correct_mistake_message">잘못 입력했습니다. 수정하거나 기본 모드로 전환하세요.</string>
 	<string name="migrate_title">중요!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">지도를 여러 부분으로 나눴습니다. 이제는 전체 국가가 아닌 개별 지역을 다운로드할 수 있습니다. 새 지도를 다운로드하기 전에 오래된 지도를 제거하십시오.</string>
-	<string name="youve_been_asking">여러분이 요청한 것을 저희가 해냈습니다</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">모두 다운로드</string>
 	<string name="delete_all">모두 삭제</string>
@@ -894,6 +886,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">이메일 또는 사용자 이름</string>
 	<string name="phone">전화</string>
-	<string name="whats_new_editor_caption">MAPS.ME 와 직접 지도 편집</string>
-	<string name="whats_new_editor_message">귀하의 변화는 수 백만 사용자를 도울 것입니다. 자 함께 세상의 발전을!</string>
+	<string name="please_note">참고 사항</string>
+	<string name="common_no_wifi_dialog">WiFi 연결이 없습니다. 모바일 데이터를 계속하시겠습니까?</string>
+	<string name="downloader_delete_map_dialog">모든 지도의 변경 사항은 지도와 함께 삭제됩니다.</string>
+	<string name="downloader_update_maps">지도 업데이트</string>
+	<string name="downloader_mwm_migration_dialog">경로를 만들려면, 모든 지도를 업데이트한 다음, 다시 경로를 계획해야 합니다.</string>
+	<string name="downloader_search_field_hint">지도 찾기</string>
+	<string name="migration_update_all_button">모든지도 업데이트</string>
+	<string name="migration_delete_all_download_current_button">현재 지도 다운로드 및 기존 지도 삭제</string>
+	<string name="migration_prefetch_status">지도 업데이트 준비 중…</string>
+	<string name="migration_download_error_dialog">다운로드 오류</string>
+	<string name="common_check_internet_connection_dialog">설정을 확인하고 장치가 인터넷에 연결되어 있는지 확인하십시오.</string>
+	<string name="downloader_no_space_title">충분하지 않은 여유 공간</string>
+	<string name="downloader_no_space_message">불필요한 데이터를 제거하십시오.</string>
+	<string name="editor_general_auth_error_dialog">일반 로그인 오류.</string>
+	<string name="editor_login_error_dialog">로그인 오류.</string>
+	<string name="editor_login_failed_dialog">로그인 실패</string>
+	<string name="editor_username_error_dialog">잘못된 사용자 이름</string>
+	<string name="editor_place_edited_dialog">개체를 편집했습니다!</string>
+	<string name="editor_login_with_osm">OpenStreetMap으로 로그인</string>
+	<string name="editor_profile_changes">변경 사항:</string>
+	<string name="editor_profile_unsent_changes">전송되지 않음</string>
+	<string name="editor_focus_map_on_location">개체의 정확한 위치를 선택하려면 지도를 당깁니다.</string>
+	<string name="editor_add_select_category">범주 선택</string>
+	<string name="editor_add_select_category_popular_subtitle">인기있는</string>
+	<string name="editor_add_select_category_all_subtitle">모든 카테고리</string>
+	<string name="editor_edit_place_title">편집 중</string>
+	<string name="editor_add_place_title">첨가 중</string>
+	<string name="editor_edit_place_name_hint">장소 이름</string>
+	<string name="editor_edit_place_category_title">범주</string>
+	<string name="placepage_add_place_button">장소 추가</string>
+	<string name="placepage_report_problem_button">문제 신고</string>
+	<string name="whatsnew_smallmwm_header">여러분이 요청한 것을 저희가 해냈습니다</string>
+	<string name="whatsnew_smallmwm_message">지도를 여러 부분으로 나눴습니다. 이제는 전체 국가가 아닌 개별 지역을 다운로드할 수 있습니다.</string>
+	<string name="whatsnew_search_message">저희는 주소에 의한 검색을 놀랍게 개선 했습니다. 직접 경험해 보세요.</string>
+	<string name="whatsnew_editor_title">지도 편집*</string>
+	<string name="whatsnew_editor_message_1">지도에 새로운 장소를 추가하고 응용 프로그램에서 직접 기존 편집 할 수 있습니다.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME는 OpenStreetMap 커뮤니티 데이터를 사용합니다.</string>
+	<string name="onboarding_offline_navigation_title">다시 손실되지 않을 것임</string>
+	<string name="onboarding_offline_navigation_message">인터넷에 연결이 없는 경우에도, 최적의 자동차와 보행자 경로를 계획하십시오!</string>
+	<string name="onboarding_offline_navigation_title_2">오프라인 탐색</string>
+	<string name="onboarding_offline_navigation_message_2">최적의 자동차와 보행자 경로를 계획합니다.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - 오프라인지도</string>
+	<string name="onboarding_offline_maps_message">한 번에 원하는 지역의 지도를 다운로드하고, 인터넷 연결없이 탐색 및 검색 기능을 사용합니다.</string>
+	<string name="onboarding_notifications_message">최신지도를 받으려면, 업데이트 알림 받기</string>
+	<string name="onboarding_notifications_title">업데이트 알림 활성화</string>
+	<string name="onboarding_location_title">사용자를 찾도록 돕기</string>
+	<string name="onboarding_location_message">탐색 및 기타 기능을 사용하려면, 위치 정보에 액세스해야 합니다.</string>
 </resources>
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 6d058bf29c..a4aff99ffe 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Avbryt nedlasting</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Slett</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Slett gamle kart og fortsett</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Ikke spør meg igjen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Miles</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Min posisjon</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Ingen Internett-tilkobling oppdaget</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Ingen WiFi-tilkobling oppdaget. Har du lyst til å bruke mobildata (GPRS, EDGE, 3G eller LTE) for å laste ned %s?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Søk</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Søk kart</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Det er ikke nok ledig diskplass</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Trykk for å laste ned</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -183,7 +177,7 @@
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Flytt kart?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
-	<string name="wait_several_minutes">Dette kan ta flere minutter. Vent et øyeblikk ...</string>
+	<string name="wait_several_minutes">Dette kan ta flere minutter. Vent et øyeblikk …</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Synlig</string>
 	<!-- Toast which is displayed when GPS has been deactivated -->
@@ -419,13 +413,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Med den nye versjonen av MAPS.ME kan du opprette ruter fra din nåværende posisjon til et ankomststed på kartet. Oppdater kartene for å bruke denne funksjonen.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Oppdater alle</string>
+	<string name="downloader_update_all_button">Oppdater alle</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Avbryt alle</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Lastet ned</string>
+	<string name="downloader_downloaded_subtitle">Lastet ned</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">lagt i kø</string>
+	<string name="downloader_near_me_subtitle">I nærheten</string>
+	<string name="downloader_status_maps">Kart: %s</string>
+	<string name="downloader_download_all_button">Last ned alle</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Når du oppretter ruter i MAPS.ME-appen må du huske på følgende:\n\n- Foreslåtte ruter må bare betraktes som anbefalinger.\n- Veiforhold, trafikkregler og skilt må gis høyere prioritet enn navigasjonsråd.\n- Kartet kan være feil eller utdatert, og det er ikke sikkert at rutene opprettes på best mulig måte.\n\nVær nøye med veisikkerheten og pass på deg selv!</string>
 	<!-- Outdated maps category -->
@@ -819,8 +816,6 @@
 	<string name="p2p_only_from_current">Navigering er kun tilgjengelig fra din nåværende beliggenhet.</string>
 	<string name="p2p_reroute_from_current">Vil du vi skal planlegge en rute fra din nåværende posisjon?</string>
 	<string name="whats_new_next_button">Neste</string>
-	<string name="whats_new_night_caption">Nattmodus-navigering</string>
-	<string name="whats_new_night_body">For å tilrettelegge bruk av MAPS.ME under mørkekjøring har vi lagt til funksjonen nattmodus. Funksjonen skrues automatisk på etter solnedgang.</string>
 	<string name="editor_time_add">Legg til tidsrom</string>
 	<string name="editor_time_delete">Slett tidsrom</string>
 	<!-- Text for allday switch. -->
@@ -836,9 +831,6 @@
 	<string name="editor_correct_mistake">Rett feil</string>
 	<string name="editor_correct_mistake_message">Du har gjort en redigeringsfeil. Rett den eller bytt til enkel modus.</string>
 	<string name="migrate_title">Viktig!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Vi har delt opp kartene i separate deler. Nå kan du laste ned separate regioner istedenfor hele land. Sørg for at du fjerner de gamle kartene før du begynner å laste ned nye.</string>
-	<string name="youve_been_asking">Dere har bedt om det og vi har fått det til</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Last ned alle</string>
 	<string name="delete_all">Slett alle</string>
@@ -902,6 +894,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-postadresse eller brukernavn</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Rediger kartet direkte fra MAPS.ME</string>
-	<string name="whats_new_editor_message">Endringene dine vil hjelpe millioner av brukere. La oss forbedre verden sammen!</string>
+	<string name="please_note">Vær oppmerksom på at</string>
+	<string name="common_no_wifi_dialog">Ingen trådløs forbindelse. Vil du fortsette med mobildata?</string>
+	<string name="downloader_delete_map_dialog">Alle endringer i kartet vil slettes sammen med kartet.</string>
+	<string name="downloader_update_maps">Oppdater kart</string>
+	<string name="downloader_mwm_migration_dialog">For å opprette en reiserute må du oppdatere alle kartene og deretter planlegge reiseruten på nytt.</string>
+	<string name="downloader_search_field_hint">Finn kartet</string>
+	<string name="migration_update_all_button">Oppdater alle kart</string>
+	<string name="migration_delete_all_download_current_button">Last ned det oppdaterte kartet og slett de gamle</string>
+	<string name="migration_prefetch_status">Forbereder oppdatering av kart…</string>
+	<string name="migration_download_error_dialog">Nedlastningsfeil</string>
+	<string name="common_check_internet_connection_dialog">Kontroller innstillingene dine og sørg for at enheten din er koblet til internett.</string>
+	<string name="downloader_no_space_title">Ikke nok plass</string>
+	<string name="downloader_no_space_message">Fjern unødvendig data</string>
+	<string name="editor_general_auth_error_dialog">Generell innloggingsfeil.</string>
+	<string name="editor_login_error_dialog">Innloggingsfeil.</string>
+	<string name="editor_login_failed_dialog">Innloggingen mislyktes</string>
+	<string name="editor_username_error_dialog">Brukernavnet er ugyldig</string>
+	<string name="editor_place_edited_dialog">Du har redigert et objekt!</string>
+	<string name="editor_login_with_osm">Logg inn med OpenStreetMat</string>
+	<string name="editor_profile_changes">Endringer:</string>
+	<string name="editor_profile_unsent_changes">Ikke sendt</string>
+	<string name="editor_focus_map_on_location">Dra kartet for å velge riktig beliggenhet for objektet.</string>
+	<string name="editor_add_select_category">Velg kategori</string>
+	<string name="editor_add_select_category_popular_subtitle">Populære</string>
+	<string name="editor_add_select_category_all_subtitle">Alle kategorier</string>
+	<string name="editor_edit_place_title">Redigerer</string>
+	<string name="editor_add_place_title">Legger til</string>
+	<string name="editor_edit_place_name_hint">Navn på stedet</string>
+	<string name="editor_edit_place_category_title">Kategori</string>
+	<string name="placepage_add_place_button">Legg til et sted</string>
+	<string name="placepage_report_problem_button">Rapporter et problem</string>
+	<string name="whatsnew_smallmwm_header">Dere har bedt om det og vi har fått det til</string>
+	<string name="whatsnew_smallmwm_message">Vi har delt opp kartene i separate deler. Nå kan du laste ned separate regioner istedenfor hele land.</string>
+	<string name="whatsnew_search_message">Nå er det mye enklere å søke etter adresse. Se selv.</string>
+	<string name="whatsnew_editor_title">Rediger kartet*</string>
+	<string name="whatsnew_editor_message_1">Legg til nye steder i kartet og rediger eksisterende steder direkte fra appen.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME bruker data fra OpenStreetMap-samfunnet.</string>
+	<string name="onboarding_offline_navigation_title">Du vil aldri havne på villspor igjen</string>
+	<string name="onboarding_offline_navigation_message">Planlegg optimale reiseruter med bil og til fots, selv uten internettforbindelse!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline-navigering</string>
+	<string name="onboarding_offline_navigation_message_2">Planlegg optimale reiseruter med bil og til fots.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline-kart</string>
+	<string name="onboarding_offline_maps_message">Last ned kartene for et ønsket område én gang, og bruk navigeringen og andre søkefunksjoner uten internettforbindelse.</string>
+	<string name="onboarding_notifications_message">Få oppdateringsvarsler for å motta de nyeste kartene</string>
+	<string name="onboarding_notifications_title">Aktiver oppdateringsvarsler</string>
+	<string name="onboarding_location_title">Hjelp oss med å finne deg</string>
+	<string name="onboarding_location_message">For å bruke navigering og andre funksjoner må vi ha tilgang til posisjonen din.</string>
 </resources>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index f9086de976..b28648900a 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Download annuleer</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Verwijder</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Verwijder oude kaarten en ga door</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Nooit meer vragen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -46,8 +44,6 @@
 	<string name="miles">Mijlen</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Mijn Locatie</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Geen Internet verbinding gedetecteerd</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Geen WiFi verbinding gedetecteerd. Wilt u mobiele data (GPRS, EDGE, 3G of LTE) gebruiken om %s te downloaden?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -64,8 +60,6 @@
 	<string name="search">Zoeken</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Zoek Kaart</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Er is niet genoeg vrije ruimte</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Klik om te downloaden</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -411,13 +405,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Met de nieuwe versie van MAPS.ME kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Alles bijwerken</string>
+	<string name="downloader_update_all_button">Update alles</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Alles annuleren</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Gedownload</string>
+	<string name="downloader_downloaded_subtitle">Gedownload</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">in de wachtrij</string>
+	<string name="downloader_near_me_subtitle">Bij mij in de buurt</string>
+	<string name="downloader_status_maps">Kaarten: %s</string>
+	<string name="downloader_download_all_button">Alles downloaden</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Bij het creëren van routes in MAPS.ME-app, dient u rekening te houden met het volgende:\n\n  - Voorgestelde routes kunnen uitsluitend als aanbevelingen beschouwd worden.\n - Wegconditie, verkeersregels en borden hebben een hogere prioriteit dan het navigatie-advies.\n - De kaart kan onjuist of verouderd zijn en de routes kunnen niet op de beste mogelijke manier gecreëerd zijn.\n\n  Wees veilig op wegen en zorg goed voor uzelf!</string>
 	<!-- Outdated maps category -->
@@ -809,8 +806,6 @@
 	<string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie.</string>
 	<string name="p2p_reroute_from_current">Wilt u dat wij een route plannen vanaf uw huidige locatie?</string>
 	<string name="whats_new_next_button">Volgende</string>
-	<string name="whats_new_night_caption">Nachtmodusnavigatie</string>
-	<string name="whats_new_night_body">Om het gebruik van MAPS.ME te vergemakkelijken tijdens het rijden in het donker, hebben we de nachtmodus toegevoegd. Deze wordt automatisch ingeschakeld na zonsondergang.</string>
 	<string name="editor_time_add">Schema toevoegen</string>
 	<string name="editor_time_delete">Schema verwijderen</string>
 	<!-- Text for allday switch. -->
@@ -826,9 +821,6 @@
 	<string name="editor_correct_mistake">Fout corrigeren</string>
 	<string name="editor_correct_mistake_message">U hebt een bewerkingsfout gemaakt. Corrigeer deze of schakel over naar de eenvoudige modus.</string>
 	<string name="migrate_title">Belangrijk!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">We hebben kaarten in delen verdeeld. Nu kunt u afzonderlijke regio\&#39;s downloaden in plaats van het hele land. Verwijder eerst de oude kaarten voordat uw nieuwe gaat downloaden.</string>
-	<string name="youve_been_asking">Op veler verzoek hebben we het voor elkaar gekregen</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Alles downloaden</string>
 	<string name="delete_all">Alles verwijderen</string>
@@ -892,6 +884,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mailadres of gebruikersnaam</string>
 	<string name="phone">Telefoonnummer</string>
-	<string name="whats_new_editor_caption">Bewerk de kaart direct vanuit MAPS.ME</string>
-	<string name="whats_new_editor_message">Jouw wijzigingen zullen miljoenen gebruikers helpen. Laten we samen de wereld verbeteren!</string>
+	<string name="please_note">Opgelet</string>
+	<string name="common_no_wifi_dialog">Geen WiFi-verbinding. Wil je doorgaan via mobiele data?</string>
+	<string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd.</string>
+	<string name="downloader_update_maps">Kaarten updaten</string>
+	<string name="downloader_mwm_migration_dialog">Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.</string>
+	<string name="downloader_search_field_hint">Vind de kaart</string>
+	<string name="migration_update_all_button">Update alle kaarten</string>
+	<string name="migration_delete_all_download_current_button">Download de huidige kaart en verwijder de oude</string>
+	<string name="migration_prefetch_status">Het voorbereiden van de update van de kaart…</string>
+	<string name="migration_download_error_dialog">Downloadfout</string>
+	<string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat is verbonden met het internet.</string>
+	<string name="downloader_no_space_title">Niet genoeg ruimte</string>
+	<string name="downloader_no_space_message">Verwijder overbodige gegevens</string>
+	<string name="editor_general_auth_error_dialog">Algemene inlogfout.</string>
+	<string name="editor_login_error_dialog">Inlogfout.</string>
+	<string name="editor_login_failed_dialog">Inloggen mislukt</string>
+	<string name="editor_username_error_dialog">Gebruikersnaam is ongeldig</string>
+	<string name="editor_place_edited_dialog">Je hebt een object bewerkt!</string>
+	<string name="editor_login_with_osm">Log in met OpenStreetMap</string>
+	<string name="editor_profile_changes">Wijzigingen:</string>
+	<string name="editor_profile_unsent_changes">Niet verzonden</string>
+	<string name="editor_focus_map_on_location">Trek aan de kaart om de juiste locatie van het object te selecteren.</string>
+	<string name="editor_add_select_category">Selecteer categorie</string>
+	<string name="editor_add_select_category_popular_subtitle">Populair</string>
+	<string name="editor_add_select_category_all_subtitle">Alle categorieën</string>
+	<string name="editor_edit_place_title">Aan het aanpassen</string>
+	<string name="editor_add_place_title">Aan het toevoegen</string>
+	<string name="editor_edit_place_name_hint">Naam van de plaats</string>
+	<string name="editor_edit_place_category_title">Categorie</string>
+	<string name="placepage_add_place_button">Voeg een plaats toe</string>
+	<string name="placepage_report_problem_button">Meld een probleem</string>
+	<string name="whatsnew_smallmwm_header">Op veler verzoek hebben we het voor elkaar gekregen</string>
+	<string name="whatsnew_smallmwm_message">We hebben kaarten in delen verdeeld. Nu kunt u afzonderlijke regio\&#39;s downloaden in plaats van het hele land.</string>
+	<string name="whatsnew_search_message">We hebben het zoeken op adres significant verbeterd. Bekijk het zelf.</string>
+	<string name="whatsnew_editor_title">Bewerk de kaart*</string>
+	<string name="whatsnew_editor_message_1">Voeg nieuwe plaatsen toe aan de kaart en bewerk de bestaande rechtstreeks vanuit de app.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME gebruikt OpenStreetMap-communitiedata.</string>
+	<string name="onboarding_offline_navigation_title">Je zult nooit meer verdwalen</string>
+	<string name="onboarding_offline_navigation_message">Plan optimale auto- en wandelroutes, zelfs als er geen internetverbinding is!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigatie</string>
+	<string name="onboarding_offline_navigation_message_2">Plan optimale auto- en wandelroutes.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline kaarten</string>
+	<string name="onboarding_offline_maps_message">Download eenmaal de kaarten voor het gewenste gebied en gebruik de navigatie- en zoekfuncties zonder een internetverbinding.</string>
+	<string name="onboarding_notifications_message">Ontvang update-meldingen om de nieuwste kaarten te ontvangen</string>
+	<string name="onboarding_notifications_title">Schakel update-meldingen in</string>
+	<string name="onboarding_location_title">Help ons om je te vinden</string>
+	<string name="onboarding_location_message">Om de navigatie en andere functies te kunnen gebruiken, hebben we toegang tot je geolocatie nodig.</string>
 </resources>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 4c42d4d4fc..2dd0c70259 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Anuluj pobieranie</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Usuń</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Usuń stare mapy i kontynuuj</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Nie pytaj ponownie</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -50,8 +48,6 @@
 	<string name="miles">Mile</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Moja pozycja</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Nie wykryto połączenia z Internetem</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Nie wykryto połączenia z siecią WiFi. Czy chciałbyś skorzystać z trybu sieci danych (GPRS, EDGE, 3G lub LTE), aby pobrać %s?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Szukaj</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Szukaj mapy</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Nie ma wystarczającej ilości wolnego miejsca</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Naciśnij, aby pobrać.</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -420,13 +414,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Uaktualnij wszystko</string>
+	<string name="downloader_update_all_button">Aktualizuj wszystkie</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Anuluj wszystko</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Pobrane</string>
+	<string name="downloader_downloaded_subtitle">Pobrane</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">w kolejce</string>
+	<string name="downloader_near_me_subtitle">Blisko mnie</string>
+	<string name="downloader_status_maps">Mapy: %s</string>
+	<string name="downloader_download_all_button">Pobierz wszystkie</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Podczas tworzenia tras w aplikacji MAPS.ME pamiętaj o poniższych zasadach:\n\n  - Sugerowane trasy mogą być traktowane jedynie jako propozycje.\n - Warunki na drodze, przepisy ruchu drogowego i znaki mają większy priorytet niż wskazówki nawigacyjne.\n - Mapa może okazać się nieprawidłowa lub nieaktualna a trasy mogą nie zostać utworzone w sposób najlepszy z możliwych.\n\n  Szerokiej drogi, uważaj na siebie!</string>
 	<!-- Outdated maps category -->
@@ -820,8 +817,6 @@
 	<string name="p2p_only_from_current">Nawigacja jest dostępna tylko od twojej bieżącej lokalizacji.</string>
 	<string name="p2p_reroute_from_current">Czy chcesz, byśmy zaplanowali trasę z Twojej bieżącej lokalizacji?</string>
 	<string name="whats_new_next_button">Dalej</string>
-	<string name="whats_new_night_caption">Nawigacja w trybie nocnym</string>
-	<string name="whats_new_night_body">Aby umożliwić korzystanie z MAPS.ME podczas prowadzenia po zmroku, dodaliśmy tryb nocny. Włącza się on automatycznie po zachodzie słońca.</string>
 	<string name="editor_time_add">Dodaj harmonogram</string>
 	<string name="editor_time_delete">Usuń harmonogram</string>
 	<!-- Text for allday switch. -->
@@ -837,9 +832,6 @@
 	<string name="editor_correct_mistake">Popraw błąd</string>
 	<string name="editor_correct_mistake_message">Popełniono błąd podczas edycji. Popraw go lub przełącz się na tryb prosty.</string>
 	<string name="migrate_title">Ważne!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Podzieliliśmy mapy na części. Teraz możesz pobierać oddzielne regiony, zamiast całego kraju. Zanim rozpoczniesz pobieranie nowych map, usuń te stare.</string>
-	<string name="youve_been_asking">Prosiliście o to, więc to zrobiliśmy</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Pobierz wszystko</string>
 	<string name="delete_all">Usuń wszystkie</string>
@@ -903,6 +895,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail lub nazwa użytkownika</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Edytuj mapy bezpośrednio w MAPS.ME</string>
-	<string name="whats_new_editor_message">Wprowadzone przez Ciebie zmiany pomogą milionom użytkowników. Ulepszajmy świat razem!</string>
+	<string name="please_note">Uwaga!</string>
+	<string name="common_no_wifi_dialog">Brak połączenia Wi-Fi. Czy chcesz kontynuować z użyciem danych pakietowych?</string>
+	<string name="downloader_delete_map_dialog">Wszystkie zmiany dotyczące mapy zostaną usunięte wraz z nią.</string>
+	<string name="downloader_update_maps">Aktualizuj mapy</string>
+	<string name="downloader_mwm_migration_dialog">Aby utworzyć trasę, należy zaktualizować wszystkie mapy, a następnie ponownie zaplanować trasę.</string>
+	<string name="downloader_search_field_hint">Znajdź mapę</string>
+	<string name="migration_update_all_button">Aktualizuj wszystkie mapy</string>
+	<string name="migration_delete_all_download_current_button">Pobierz bieżącą mapę i usuń stare</string>
+	<string name="migration_prefetch_status">Przygotowywanie aktualizacji map…</string>
+	<string name="migration_download_error_dialog">Błąd pobierania</string>
+	<string name="common_check_internet_connection_dialog">Sprawdź swoje ustawienia i upewnij się, że urządzenie ma połączenie z Internetem.</string>
+	<string name="downloader_no_space_title">Brak wolnego miejsca</string>
+	<string name="downloader_no_space_message">Usuń niepotrzebne dane</string>
+	<string name="editor_general_auth_error_dialog">Ogólny błąd logowania.</string>
+	<string name="editor_login_error_dialog">Błąd logowania.</string>
+	<string name="editor_login_failed_dialog">Nieudane logowanie</string>
+	<string name="editor_username_error_dialog">Nieprawidłowa nazwa użytkownika</string>
+	<string name="editor_place_edited_dialog">Obiekt był edytowany!</string>
+	<string name="editor_login_with_osm">Zaloguj się z OpenStreetMap</string>
+	<string name="editor_profile_changes">Zmiany:</string>
+	<string name="editor_profile_unsent_changes">Nie wysłano</string>
+	<string name="editor_focus_map_on_location">Przeciągnij mapę, aby wybrać poprawną lokalizację obiektu.</string>
+	<string name="editor_add_select_category">Wybierz kategorię</string>
+	<string name="editor_add_select_category_popular_subtitle">Popularne</string>
+	<string name="editor_add_select_category_all_subtitle">Wszystkie kategorie</string>
+	<string name="editor_edit_place_title">Edycja</string>
+	<string name="editor_add_place_title">Dodawanie</string>
+	<string name="editor_edit_place_name_hint">Nazwa miejsca</string>
+	<string name="editor_edit_place_category_title">Kategoria</string>
+	<string name="placepage_add_place_button">Dodaj miejsce</string>
+	<string name="placepage_report_problem_button">Zgłoś problem</string>
+	<string name="whatsnew_smallmwm_header">Prosiliście o to, więc to zrobiliśmy</string>
+	<string name="whatsnew_smallmwm_message">Podzieliliśmy mapy na części. Teraz możesz pobierać oddzielne regiony, zamiast całego kraju</string>
+	<string name="whatsnew_search_message">Znacząco usprawniliśmy wyszukiwanie po adresie. Przekonaj się sam.</string>
+	<string name="whatsnew_editor_title">Edytuj mapę*</string>
+	<string name="whatsnew_editor_message_1">Dodawaj nowe miejsca do mapy i edytuj już istniejące bezpośrednio z poziomu aplikacji.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME korzysta z danych społeczności OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Nigdy się już nie zgubisz</string>
+	<string name="onboarding_offline_navigation_message">Planuj optymalne trasy samochodowe i piesze, nawet gdy nie masz połączenia z Internetem!</string>
+	<string name="onboarding_offline_navigation_title_2">Nawigacja offline</string>
+	<string name="onboarding_offline_navigation_message_2">Planuj optymalne trasy samochodowe i piesze.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - mapy offline</string>
+	<string name="onboarding_offline_maps_message">Pobierz jednorazowo mapy dla wybranego obszaru, aby korzystać z nawigacji i wyszukiwania bez połączenia sieciowego.</string>
+	<string name="onboarding_notifications_message">Aby pobierać najnowsze mapy, włącz powiadomienia o aktualizacjach</string>
+	<string name="onboarding_notifications_title">Włącz powiadomienia o aktualizacjach</string>
+	<string name="onboarding_location_title">Pomaga nam znaleźć Ciebie</string>
+	<string name="onboarding_location_message">Abyś mógł korzystać z nawigacji i innych funkcji, musimy uzyskać dostęp do twojej geolokalizacji.</string>
 </resources>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 7a73bc173f..4c3039f37a 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Cancelar Descarga</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Eliminar</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Eliminar mapas antigos e continuar</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Não volte a perguntar-me</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Milhas</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">A minha posição</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Não foi detetada uma ligação à Internet</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Não detetada uma ligação WiFi. Pretende utilizar os dados por pacotes (GPRS, EDGE, 3G or LTE) para descarregar %s?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Procura</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Procurar mapa</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Não há espaço livre suficiente em disco</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Toque para descarregar</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -416,13 +410,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual para um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Atualizar tudo</string>
+	<string name="downloader_update_all_button">Atualizar tudo</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Cancelar Tudo</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Descarregados</string>
+	<string name="downloader_downloaded_subtitle">Descarregado</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">Na fila</string>
+	<string name="downloader_near_me_subtitle">Perto de mim</string>
+	<string name="downloader_status_maps">Mapas: %s</string>
+	<string name="downloader_download_all_button">Descarregar tudo</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Ao criar rotas na aplicação MAPS.ME, por favor, lembre-se do seguinte:\n\n  - As rotas sugeridas podem apenas ser consideradas como recomendações.\n - As condições da estrada, regras de trânsito e sinais têm maior prioridade do que os conselhos de navegação.\n - O mapa poderá estar errado, ou desatualizado, e as rotas poderão não ser criadas da melhor forma possível.\n\n  Circule em segurança nas estradas e cuide do seu bem estar!</string>
 	<!-- Outdated maps category -->
@@ -816,8 +813,6 @@
 	<string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual.</string>
 	<string name="p2p_reroute_from_current">Deseja planejar uma rota a partir da sua localização atual?</string>
 	<string name="whats_new_next_button">Próxima</string>
-	<string name="whats_new_night_caption">Navegação em modo noturno</string>
-	<string name="whats_new_night_body">Para facilitar o uso do MAPS.ME ao dirigir no escuro, adicionamos o modo noturno. Ele é acionado automaticamente após o pôr do sol.</string>
 	<string name="editor_time_add">Adicionar Horário</string>
 	<string name="editor_time_delete">Eliminar Horário</string>
 	<!-- Text for allday switch. -->
@@ -833,9 +828,6 @@
 	<string name="editor_correct_mistake">Corrigir erro</string>
 	<string name="editor_correct_mistake_message">Fez um erro de edição. Corrija-o ou mude para o modo simples.</string>
 	<string name="migrate_title">Importante!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Dividimos os mapas em partes. Agora vocês podem baixar regiões separadas em vez do país inteiro. Antes de começarem a baixar novos mapas, apaguem os mapas antigos.</string>
-	<string name="youve_been_asking">Vocês têm pedido por isso e nós atendemos</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Baixar tudo</string>
 	<string name="delete_all">Excluir todos</string>
@@ -899,6 +891,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail ou nome de usuário</string>
 	<string name="phone">Telefone</string>
-	<string name="whats_new_editor_caption">Modifique o mapa diretamente do MAPS.ME</string>
-	<string name="whats_new_editor_message">As suas alterações vão ajudar milhões de usuários. Vamos melhorar o mundo juntos!</string>
+	<string name="please_note">Por favor note</string>
+	<string name="common_no_wifi_dialog">Nenhuma ligação Wi-Fi. Deseja continuar com os dados móveis?</string>
+	<string name="downloader_delete_map_dialog">Todas as alterações ao mapa serão eliminadas juntamente com o mapa.</string>
+	<string name="downloader_update_maps">Atualizar mapas</string>
+	<string name="downloader_mwm_migration_dialog">Para criar um itinerário, é necessário atualizar todos os mapas e, em seguida, voltar a planear o itinerário.</string>
+	<string name="downloader_search_field_hint">Encontrar o mapa</string>
+	<string name="migration_update_all_button">Atualizar todos os mapas</string>
+	<string name="migration_delete_all_download_current_button">Descarregue o mapa atual e elimine os antigos</string>
+	<string name="migration_prefetch_status">A preparar a atualização de mapas…</string>
+	<string name="migration_download_error_dialog">Erro de download</string>
+	<string name="common_check_internet_connection_dialog">Por favor, verifique as suas opções e certifique-se de que o dispositivo está ligado à Internet.</string>
+	<string name="downloader_no_space_title">Não há espaço suficiente</string>
+	<string name="downloader_no_space_message">Por favor, remova os dados desnecessários</string>
+	<string name="editor_general_auth_error_dialog">Erro geral de início de sessão.</string>
+	<string name="editor_login_error_dialog">Erro de início de sessão.</string>
+	<string name="editor_login_failed_dialog">O início de sessão falhou</string>
+	<string name="editor_username_error_dialog">O nome de utilizador é inválido</string>
+	<string name="editor_place_edited_dialog">Editou um objeto!</string>
+	<string name="editor_login_with_osm">Iniciar sessão com a OpenStreetMap</string>
+	<string name="editor_profile_changes">Alterações:</string>
+	<string name="editor_profile_unsent_changes">Não enviado</string>
+	<string name="editor_focus_map_on_location">Puxe o mapa para selecionar o lugar correto do objeto.</string>
+	<string name="editor_add_select_category">Selecionar a categoria</string>
+	<string name="editor_add_select_category_popular_subtitle">Popular</string>
+	<string name="editor_add_select_category_all_subtitle">Todas as categorias</string>
+	<string name="editor_edit_place_title">Edição</string>
+	<string name="editor_add_place_title">A adicionar</string>
+	<string name="editor_edit_place_name_hint">Nome do lugar</string>
+	<string name="editor_edit_place_category_title">Categoria</string>
+	<string name="placepage_add_place_button">Adicionar um lugar</string>
+	<string name="placepage_report_problem_button">Comunicar um problema</string>
+	<string name="whatsnew_smallmwm_header">Vocês têm pedido por isso e nós atendemos</string>
+	<string name="whatsnew_smallmwm_message">Dividimos os mapas em partes. Agora vocês podem baixar regiões separadas em vez do país inteiro.</string>
+	<string name="whatsnew_search_message">Melhoramos consideravelmente a busca por endereço. Veja você mesmo.</string>
+	<string name="whatsnew_editor_title">Editar o mapa*</string>
+	<string name="whatsnew_editor_message_1">Adicione novos lugares ao mapa e edite os já existentes diretamente a partir da app.</string>
+	<string name="whatsnew_editor_message_2">* A MAPS.ME utiliza dados da comunidade OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Nunca mais voltará a perder-se</string>
+	<string name="onboarding_offline_navigation_message">Planeie itinerários ideais de automóvel e a pé, mesmo se não houver ligação à Internet!</string>
+	<string name="onboarding_offline_navigation_title_2">Navegação offline</string>
+	<string name="onboarding_offline_navigation_message_2">Planeie itinerários ideais de automóvel e a pé.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - mapas offline</string>
+	<string name="onboarding_offline_maps_message">Descarregue uma vez os mapas para a área desejada e utilize as funções de navegação e de pesquisa sem uma ligação à Internet.</string>
+	<string name="onboarding_notifications_message">Para receber os mapas mais recentes, receba notificações de atualizações</string>
+	<string name="onboarding_notifications_title">Ativar as notificações de atualizações</string>
+	<string name="onboarding_location_title">Ajude-nos a encontrá-lo</string>
+	<string name="onboarding_location_message">Para utilizar a navegação e outros recursos, precisamos de aceder à sua localização geográfica.</string>
 </resources>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 65a9823dda..463f678860 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Anulare descărcare</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Ștergere</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Șterge hărțile vechi și continuă</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Nu mă mai întreba</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -32,7 +30,7 @@
 	<!-- Settings/Downloader - country info current download progress -->
 	<string name="downloading_x_touch_to_cancel">Se descarcă %qu%%. Atingeți pentru a anula.</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
-	<string name="downloading">Se descarcă...</string>
+	<string name="downloading">Se descarcă…</string>
 	<string name="get_it_now">Obțineți acum</string>
 	<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
 	<string name="share_on_facebook_text">Vă mulțumim că folosiți MAPS.ME! Vă place aplicația? Spuneți-le prietenilor despre ea! Aceasta va fi cea mai mare mulțumire pentru noi.</string>
@@ -52,8 +50,6 @@
 	<string name="miles">Mile</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Poziția mea</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Nu a fost detectată nicio conexiune la internet.</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Nu a fost detectată nicio conexiune WiFi. Doriți să utilizați datele mobile (GPRS, EDGE, 3G sau LTE) pentru a descărca %s?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Căutare</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Căutare hartă</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Nu există suficient spațiu liber pe disc.</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Atingeți pentru a descărca.</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -183,7 +177,7 @@
 	<!-- Question dialog for transferring maps from one storage to another -->
 	<string name="move_maps">Mutare hărți?</string>
 	<!-- Ask to wait user several minutes (some long process in modal dialog). -->
-	<string name="wait_several_minutes">Aceasta poate dura câteva minute.\nVă rugăm să așteptați...</string>
+	<string name="wait_several_minutes">Aceasta poate dura câteva minute.\nVă rugăm să așteptați…</string>
 	<!-- Show bookmarks from this category on a map or not -->
 	<string name="visible">Vizibil</string>
 	<!-- Toast which is displayed when GPS has been deactivated -->
@@ -417,13 +411,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Noua versiune a MAPS.ME vă permite să creați rute din poziția dvs. actuală către un punct de destinație. Vă rugăm să actualizați harta pentru a utiliza această funcție.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Actualizare toate</string>
+	<string name="downloader_update_all_button">Actualizați toate</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Anulare toate</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Descărcate</string>
+	<string name="downloader_downloaded_subtitle">Descărcat</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">în lista de așteptare</string>
+	<string name="downloader_near_me_subtitle">Aproape de mine</string>
+	<string name="downloader_status_maps">Hărți: %s</string>
+	<string name="downloader_download_all_button">Descărcați toate</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Atunci când creați rute în aplicația MAPS.ME, vă rugăm să nu uitați următoarele:\n\n- Rutele sugerate pot fi luate în considerare numai ca recomandări.\n- Harta poate fi incorectă sau neactualizată, iar rutele pot să nu fie create în cel mai bun mod posibil.\n- Condițiile de trafic, regulile și semnele de circulație au prioritate mai mare decât sugestiile de navigare.\n\nCirculați cu atenție și aveți grijă de dvs.!</string>
 	<!-- Outdated maps category -->
@@ -816,8 +813,6 @@
 	<string name="p2p_only_from_current">Navigația este disponibilă doar având ca punct de pornire locațiacctuală.</string>
 	<string name="p2p_reroute_from_current">Doriți să vă planificăm o rută având ca punct de pornire locația actuală?</string>
 	<string name="whats_new_next_button">Următoarea</string>
-	<string name="whats_new_night_caption">Navigație mod nocturn</string>
-	<string name="whats_new_night_body">Pentru a facilita utilizarea MAPS.ME atunci când conduceți noaptea, am adăugat modul nocturn. Acesta pornește automat după apusul soarelui.</string>
 	<string name="editor_time_add">Adăugare planificare</string>
 	<string name="editor_time_delete">Eliminare planificare</string>
 	<!-- Text for allday switch. -->
@@ -833,9 +828,6 @@
 	<string name="editor_correct_mistake">Corectare greșeală</string>
 	<string name="editor_correct_mistake_message">Ați efectuat o eroare de editare. Corectați eroarea sau treceți în modul Simplu.</string>
 	<string name="migrate_title">Important!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Am împărțit hărțile în mai multe secțiuni. Acum, puteți descărca și regiuni separate, nu doar țara întreagă. Înainte de a începe să descărcați hărți noi, vă rugăm să le ștergeți pe cele vechi.</string>
-	<string name="youve_been_asking">Ne-ați cerut, iar noi am făcut</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Descarcă toate</string>
 	<string name="delete_all">Ștergere toate</string>
@@ -899,6 +891,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">Adresa de e-mail sau numele de utilizator</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Editează harta direct de pe MAPS.ME</string>
-	<string name="whats_new_editor_message">Modificările tale vor ajuta milioane de utilizatori. Hai să facem lumea mai bună împreună!</string>
+	<string name="please_note">Actualizați hărțile</string>
+	<string name="common_no_wifi_dialog">Nu există conexiune WiFi. Doriți să continuați cu conexiunea de pe mobil?</string>
+	<string name="downloader_delete_map_dialog">Pentru a crea un traseu, trebuie să actualizați toate hărțile, iar apoi să planificați traseul încă o dată.</string>
+	<string name="downloader_update_maps">Actualizați hărțile</string>
+	<string name="downloader_mwm_migration_dialog">Pentru a crea un traseu, trebuie să actualizați toate hărțile, iar apoi să planificați traseul încă o dată.</string>
+	<string name="downloader_search_field_hint">Găsiți harta</string>
+	<string name="migration_update_all_button">Actualizați toate hărțile</string>
+	<string name="migration_delete_all_download_current_button">Descărcați harta actuală și ștergeți toate hărțile vechi</string>
+	<string name="migration_prefetch_status">Pregătește actualizarea hărților…</string>
+	<string name="migration_download_error_dialog">Eroare de descărcare</string>
+	<string name="common_check_internet_connection_dialog">Vă rugăm să vă verificați setările și să vă asigurați că dispozitivul dvs. este conectat la Internet.</string>
+	<string name="downloader_no_space_title">Spațiu insuficient</string>
+	<string name="downloader_no_space_message">Vă rugăm să ștergeți datele care nu sunt necesare</string>
+	<string name="editor_general_auth_error_dialog">Eroare generală de conectare.</string>
+	<string name="editor_login_error_dialog">Eroare de conectare.</string>
+	<string name="editor_login_failed_dialog">Conectare eșuată</string>
+	<string name="editor_username_error_dialog">Nume de utilizator nevalid</string>
+	<string name="editor_place_edited_dialog">Ați editat un obiect!</string>
+	<string name="editor_login_with_osm">Conectați-vă cu OpenStreetMap</string>
+	<string name="editor_profile_changes">Modificări:</string>
+	<string name="editor_profile_unsent_changes">Netrimis</string>
+	<string name="editor_focus_map_on_location">Trageți de hartă pentru a selecta locația corectă a obiectului.</string>
+	<string name="editor_add_select_category">Selectați categoria</string>
+	<string name="editor_add_select_category_popular_subtitle">Popular</string>
+	<string name="editor_add_select_category_all_subtitle">Toate categoriile</string>
+	<string name="editor_edit_place_title">Editare</string>
+	<string name="editor_add_place_title">Adăugare</string>
+	<string name="editor_edit_place_name_hint">Denumirea locației</string>
+	<string name="editor_edit_place_category_title">Categorie</string>
+	<string name="placepage_add_place_button">Adăugați o locație</string>
+	<string name="placepage_report_problem_button">Raportați o problemă</string>
+	<string name="whatsnew_smallmwm_header">Ne-ați cerut, iar noi am făcut</string>
+	<string name="whatsnew_smallmwm_message">Am împărțit hărțile în mai multe secțiuni. Acum, puteți descărca și regiuni separate, nu doar țara întreagă.</string>
+	<string name="whatsnew_search_message">Am îmbunătățit semnificativ căutarea după adresă. Convinge-te singur.</string>
+	<string name="whatsnew_editor_title">Editați harta*</string>
+	<string name="whatsnew_editor_message_1">Adăugați locuri noi pe hartă și modificați-le pe cele existente direct din aplicație.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME folosește datele comunității OpenStreetMap community.</string>
+	<string name="onboarding_offline_navigation_title">Niciodată nu vă veți rătăci din nou</string>
+	<string name="onboarding_offline_navigation_message">Planificați traseele optime cu mașina și cele pietonale, chiar dacă nu există conexiune la Internet!</string>
+	<string name="onboarding_offline_navigation_title_2">Navigare offline</string>
+	<string name="onboarding_offline_navigation_message_2">Planificați traseele optime cu mașina și cele pietonale.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME – hărți offline</string>
+	<string name="onboarding_offline_maps_message">Descărcați o dată hărțile pentru zona dorită, pentru a naviga și folosi funcțiile de căutare fără conexiune la Internet.</string>
+	<string name="onboarding_notifications_message">Pentru a obține cele mai recente hărți, obțineți notificările de actualizări</string>
+	<string name="onboarding_notifications_title">Activați notificările de actualizări</string>
+	<string name="onboarding_location_title">Ajutați-ne să vă găsim</string>
+	<string name="onboarding_location_message">Ca să puteți naviga și folosi alte funcții, trebuie să accesăm poziționarea dvs. geografică.</string>
 </resources>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 88ba55e63c..ec5448b09c 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Отменить загрузку</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Удалить</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Удалить старые карты и продолжить</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Больше не спрашивать</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Мили</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Мое местоположение</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Отсутствует подключение к интернету</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Нет WiFi соединения. Вы хотите загрузить %s через сотового оператора (GPRS, EDGE, 3G или LTE)?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -72,8 +68,6 @@
 	<string name="search">Поиск</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Поиск на карте</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Нет свободного места</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Нажмите для загрузки</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -446,15 +440,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Обновить все</string>
+	<string name="downloader_update_all_button">Обновить все</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Отменить все</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Загружено</string>
+	<string name="downloader_downloaded_subtitle">Загруженные</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">в очереди</string>
-	<string name="downloader_near_me">Рядом со мной</string>
-	<string name="downloader_maps_to_update">Карт: %1$d (%2$s)</string>
+	<string name="downloader_near_me_subtitle">Возле меня</string>
+	<string name="downloader_status_maps">Карт: %s</string>
+	<string name="downloader_download_all_button">Загрузить все</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Используя маршруты в приложении MAPS.ME, пожалуйста, учитывайте следующее:\n\n  - Предлагаемые маршруты могут рассматриваться только в качестве рекомендации.\n - Дорожная обстановка, правила дорожного движения, знаки являются более приоритетными по сравнению с советами навигационной программы.\n - Карта может быть неточной или неактуальной, а предложенный маршрут не самым оптимальным.\n\n  Будьте внимательны на дорогах и берегите себя!</string>
 	<!-- Outdated maps category -->
@@ -494,8 +489,6 @@
 	<string name="downloader_retry">Повторите попытку</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_map_and_routing">Карта + Маршруты</string>
-	<!-- Dialog confirmation when trying to delete map and there are unsaved changes present on it. -->
-	<string name="downloader_delete_editor_changes">Несохранённые правки в данном регионе также будут удалены! Продолжить?</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_delete_map">Удалить карту</string>
 	<!-- Item in context menu. -->
@@ -852,8 +845,6 @@
 	<string name="p2p_only_from_current">Навигация возможна только из текущего местоположения.</string>
 	<string name="p2p_reroute_from_current">Хотите перестроить маршрут от вашего местоположения?</string>
 	<string name="whats_new_next_button">Далее</string>
-	<string name="whats_new_night_caption">Ночной режим навигации</string>
-	<string name="whats_new_night_body">Для удобства использования MAPS.ME во время вождения автомобиля в темное время суток мы добавили ночной режим. Он запускается автоматически после захода солнца.</string>
 	<string name="editor_time_add">Добавить расписание</string>
 	<string name="editor_time_delete">Удалить расписание</string>
 	<!-- Text for allday switch. -->
@@ -869,9 +860,6 @@
 	<string name="editor_correct_mistake">Исправьте ошибку</string>
 	<string name="editor_correct_mistake_message">При редактировании времени работы вы допустили ошибку. Исправьте её или переключитесь в простой режим.</string>
 	<string name="migrate_title">Важно!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Мы разрезали большие карты на части: теперь можно загрузить только нужную область, а не всю страну целиком. Прежде чем начать загружать маленькие карты, пожалуйста, удалите все старые.</string>
-	<string name="youve_been_asking">Вы долго просили — мы наконец сделали</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Загрузить все</string>
 	<string name="delete_all">Удалить все</string>
@@ -939,6 +927,52 @@
 	<!-- login text field -->
 	<string name="email_or_username">Эл. почта или имя пользователя</string>
 	<string name="phone">Телефон</string>
-	<string name="whats_new_editor_caption">Редактируйте карту прямо из MAPS.ME</string>
-	<string name="whats_new_editor_message">Ваши изменения помогут миллионам пользователей. Улучшим мир вместе!</string>
+	<string name="please_note">Обратите внимание</string>
+	<string name="common_no_wifi_dialog">Нет WiFi соединения. Вы хотите продолжить работу через мобильный интернет?</string>
+	<string name="downloader_delete_map_dialog">Вместе с картой удалятся и внесенные вами правки на этой карте.</string>
+	<string name="downloader_update_maps">Обновите карты</string>
+	<string name="downloader_mwm_migration_dialog">Для построения маршрутов необходимо обновить все карты и построить маршрут заново.</string>
+	<string name="downloader_search_field_hint">Найти карту</string>
+	<string name="migration_update_all_button">Обновить все карты</string>
+	<string name="migration_delete_all_download_current_button">Скачать текущую и удалить все старые карты</string>
+	<string name="migration_prefetch_status">Подготовка обновления карт…</string>
+	<string name="migration_download_error_dialog">Ошибка загрузки</string>
+	<string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету.</string>
+	<string name="downloader_no_space_title">Недостаточно места</string>
+	<string name="downloader_no_space_message">Удалите ненужные данные</string>
+	<string name="editor_general_auth_error_dialog">Общая ошибка авторизации.</string>
+	<string name="editor_login_error_dialog">Произошла ошибка при авторизации.</string>
+	<string name="editor_login_failed_dialog">Войти не удалось</string>
+	<string name="editor_username_error_dialog">Неверное имя пользователя</string>
+	<string name="editor_place_edited_dialog">Вы отредактировали объект!</string>
+	<string name="editor_login_with_osm">Войти через OpenStreetMap</string>
+	<string name="editor_profile_changes">Правки:</string>
+	<string name="editor_profile_unsent_changes">Не отправлено</string>
+	<string name="editor_focus_map_on_location">Потяните карту, чтобы выбрать правильное местоположение объекта.</string>
+	<string name="editor_add_select_category">Выбрать категорию</string>
+	<string name="editor_add_select_category_popular_subtitle">Популярные</string>
+	<string name="editor_add_select_category_all_subtitle">Все категории</string>
+	<string name="editor_edit_place_title">Редактирование</string>
+	<string name="editor_add_place_title">Добавление</string>
+	<string name="editor_edit_place_name_hint">Название места</string>
+	<string name="editor_edit_place_category_title">Категория</string>
+	<string name="placepage_add_place_button">Добавить место</string>
+	<string name="placepage_report_problem_button">Сообщить о проблеме</string>
+	<string name="whatsnew_smallmwm_header">Вы долго просили — мы наконец сделали</string>
+	<string name="whatsnew_smallmwm_message">Мы разрезали большие карты на части: теперь загружай только нужную область, а не всю страну целиком.</string>
+	<string name="whatsnew_search_header">Новый поиск!</string>
+	<string name="whatsnew_search_message">Качественно улучшили поиск по адресам. Проверяйте.</string>
+	<string name="whatsnew_editor_title">Редактируйте карту*</string>
+	<string name="whatsnew_editor_message_1">Добавляйте новые объекты и редактируйте информацию о старых прямо из приложения.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME использует данные открытых карт сообщества OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Вы никогда больше не заблудитесь</string>
+	<string name="onboarding_offline_navigation_message">Прокладывайте самые оптимальные автомобильные и пешеходные маршруты даже там, где нет связи!</string>
+	<string name="onboarding_offline_navigation_title_2">Оффлайн навигация</string>
+	<string name="onboarding_offline_navigation_message_2">Прокладывайте оптимальные автомобильные и пешеходные маршруты.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME — оффлайн карты</string>
+	<string name="onboarding_offline_maps_message">Загрузите карты необходимого региона один раз и пользуйтесь навигацией и поиском без подключения к интернету.</string>
+	<string name="onboarding_notifications_message">Получайте уведомления об обновлениях, чтобы всегда иметь актуальные карты</string>
+	<string name="onboarding_notifications_title">Разрешите отправку уведомлений</string>
+	<string name="onboarding_location_title">Помогите найти вас</string>
+	<string name="onboarding_location_message">Чтобы пользоваться навигацией и другими функциями приложения, нам необходим доступ к вашей геопозиции.</string>
 </resources>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index c85398ac60..f5b06ae3f5 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Zrušiť sťahovanie</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Zmazať</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Zmazať staré mapy a pokračovať</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Už sa nepýtať</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">Míle</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Moja poloha</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Nenájdené pripojenie k Internetu</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Nenájdené pripojenie k WiFi. Chcete použiť mobilnú sieť (GPRS, EDGE, 3G alebo LTE) k stiahnutiu %s?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -68,8 +64,6 @@
 	<string name="search">Hľadať</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Prehľadať mapu</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Nedostatok voľného úložného priestoru</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Stlačte pre stiahnutie</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -424,13 +418,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Nová verzia aplikácie MAPS.ME umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Aktualizovať všetky</string>
+	<string name="downloader_update_all_button">Aktualizovať všetko</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Zrušiť všetko</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Stiahnuté</string>
+	<string name="downloader_downloaded_subtitle">Stiahnuté</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">V rade</string>
+	<string name="downloader_near_me_subtitle">Neďaleko mňa</string>
+	<string name="downloader_status_maps">Mapy: %s</string>
+	<string name="downloader_download_all_button">Stiahnuť všetko</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Tvorenie trás v aplikácii MAPS.ME, prosím, majte na pamäti nasledovné:\n\n  - Navrhnuté trasy možno považovať iba za odporúčanie.\n - Stav vozovky, dopravné predpisy a značenie majú vyššiu prioritu, ako navigačné rady.\n - Mapa môže byť nesprávna alebo zastaraná a trasy nemusia byť vytvorené tým najlepším možným spôsobom.\n\n  Buďte na cestách v bezpečí a postarajte sa o seba!</string>
 	<!-- Outdated maps category -->
@@ -822,8 +819,6 @@
 	<string name="p2p_only_from_current">Navigácia je dostupná iba z vašej aktuálnej polohy.</string>
 	<string name="p2p_reroute_from_current">Doriți să vă planificăm o rută având ca punct de pornire locația actuală?</string>
 	<string name="whats_new_next_button">Nasledujúca</string>
-	<string name="whats_new_night_caption">Navigácia v nočnom režime</string>
-	<string name="whats_new_night_body">Na uľahčenie použitia MAPS.ME pri jazde za tmy sme pridali nočný režim. Automaticky sa zapne po západe slnka.</string>
 	<string name="editor_time_add">Pridať rozvrh</string>
 	<string name="editor_time_delete">Zmazať rozvrh</string>
 	<!-- Text for allday switch. -->
@@ -839,9 +834,6 @@
 	<string name="editor_correct_mistake">Opraviť chybu</string>
 	<string name="editor_correct_mistake_message">Chyba pri úprave. Opravte chybu, alebo sa prepnite do jednoduchého režimu.</string>
 	<string name="migrate_title">Dôležité!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Mapy sme rozdelili na časti. Teraz si môžete stiahnuť jednotlivé regióny, nie celú krajinu. Predtým ako si začnete sťahovať nové mapy, prosím, odstráňte staré.</string>
-	<string name="youve_been_asking">Dožadovali ste sa toho a my sme vám vyhoveli</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Stiahnuť všetko</string>
 	<string name="delete_all">Vymazať všetky</string>
@@ -905,6 +897,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail alebo používateľské meno</string>
 	<string name="phone">Telefón</string>
-	<string name="whats_new_editor_caption">Upravte mapu priamo cez MAPS.ME</string>
-	<string name="whats_new_editor_message">Vaše zmeny pomôžu miliónom používateľov. Spoločne zlepšíme svet!</string>
+	<string name="please_note">Upozorňujeme vás, že</string>
+	<string name="common_no_wifi_dialog">Pripojenie k WiFi nie je k dispozícii. Chcete pokračovať s využitím mobilných dát?</string>
+	<string name="downloader_delete_map_dialog">Všetky zmeny týkajúce sa mapy budú vymazané spolu s mapou.</string>
+	<string name="downloader_update_maps">Aktualizovať mapy</string>
+	<string name="downloader_mwm_migration_dialog">Ak chcete vytvoriť cestu, musíte najskôr aktualizovať všetky mapy a potom odznova naplánovať trasu.</string>
+	<string name="downloader_search_field_hint">Nájsť mapu</string>
+	<string name="migration_update_all_button">Aktualizovať všetky mapy</string>
+	<string name="migration_delete_all_download_current_button">Stiahnite si aktuálnu mapu a odstráňte neaktuálne mapy</string>
+	<string name="migration_prefetch_status">Prebieha príprava aktualizácie máp…</string>
+	<string name="migration_download_error_dialog">Chyba pri sťahovaní</string>
+	<string name="common_check_internet_connection_dialog">Prosím, skontrolujte svoje nastavenia a uistite sa, že váš počítač je pripojený k internetu.</string>
+	<string name="downloader_no_space_title">Nemáte dostatok miesta</string>
+	<string name="downloader_no_space_message">Prosím, odstráňte prebytočné dáta</string>
+	<string name="editor_general_auth_error_dialog">Pri prihlasovaní sa vyskytla všeobecná chyba.</string>
+	<string name="editor_login_error_dialog">Pri prihlasovaní sa vyskytla chyba.</string>
+	<string name="editor_login_failed_dialog">Prihlasovanie bolo neúspešné</string>
+	<string name="editor_username_error_dialog">Používateľské meno je neplatné</string>
+	<string name="editor_place_edited_dialog">Práve ste upravili objekt!</string>
+	<string name="editor_login_with_osm">Prihlásiť sa prostredníctvom OpenStreetMap</string>
+	<string name="editor_profile_changes">Zmeny:</string>
+	<string name="editor_profile_unsent_changes">Neodoslané</string>
+	<string name="editor_focus_map_on_location">Ak chcete nastaviť správnu polohu objektu, posuňte mapu.</string>
+	<string name="editor_add_select_category">Vybrať kategóriu</string>
+	<string name="editor_add_select_category_popular_subtitle">Obľúbené</string>
+	<string name="editor_add_select_category_all_subtitle">Všetky kategórie</string>
+	<string name="editor_edit_place_title">Úprava</string>
+	<string name="editor_add_place_title">Nové</string>
+	<string name="editor_edit_place_name_hint">Názov miesta</string>
+	<string name="editor_edit_place_category_title">Kategória</string>
+	<string name="placepage_add_place_button">Pridať miesto</string>
+	<string name="placepage_report_problem_button">Nahlásiť problém</string>
+	<string name="whatsnew_smallmwm_header">Dožadovali ste sa toho a my sme vám vyhoveli</string>
+	<string name="whatsnew_smallmwm_message">Mapy sme rozdelili na časti. Teraz si môžete stiahnuť jednotlivé regióny, nie celú krajinu.</string>
+	<string name="whatsnew_search_message">Významne sme zlepšili vyhľadávanie pomocou adresy. Pozrite sa sami.</string>
+	<string name="whatsnew_editor_title">Upraviť mapu*</string>
+	<string name="whatsnew_editor_message_1">Na mapu môžete pridávať nové miesta a upravovať tie, ktoré sú už pridané.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME využíva dáta komunity OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Už sa nikdy nestratíte</string>
+	<string name="onboarding_offline_navigation_message">Naplánujte si vhodné trasy na cestu autom alebo peši. Internetové pripojenie sa nevyžaduje!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigácia</string>
+	<string name="onboarding_offline_navigation_message_2">Naplánujte si vhodné trasy na cestu autom alebo peši.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline mapy</string>
+	<string name="onboarding_offline_maps_message">Stiahnite si jednorázovo potrebné mapy - navigáciu a funkcie vyhľadávania môžete využívať aj bez internetového pripojenia.</string>
+	<string name="onboarding_notifications_message">Ak chcete získavať najnovšie mapy, zapnite si notifikácie aktualizácií</string>
+	<string name="onboarding_notifications_title">Povoliť notifikácie aktualizácií</string>
+	<string name="onboarding_location_title">Pomôžte nám a my vás nájdeme</string>
+	<string name="onboarding_location_message">Ak chcete používať navigáciu a ostatné funkcie, potrebujeme prístup k vašej aktuálnej polohe.</string>
 </resources>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 142e6dadd2..6f1164c3d3 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Avbryt nedladdning</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Ta bort</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Ta bort gamla kartor och fortsätt</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Fråga mig inte igen</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -32,7 +30,7 @@
 	<!-- Settings/Downloader - country info current download progress -->
 	<string name="downloading_x_touch_to_cancel">Laddar ner %qu%%, tryck för att avbryta</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
-	<string name="downloading">Laddar ner...</string>
+	<string name="downloading">Laddar ner…</string>
 	<string name="get_it_now">Skaffa det nu</string>
 	<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
 	<string name="share_on_facebook_text">Tack för att du använder MAPS.ME! Gillar du appen? Berätta för dina vänner om den! Det skulle vara höjden av tacksamhet för oss.</string>
@@ -48,8 +46,6 @@
 	<string name="miles">Mil</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Min position</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Ingen internetanslutning upptäcktes</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Ingen WiFi-anslutning upptäcktes. Vill du använda mobildata (GPRS, EDGE, 3G eller LTE) till att ladda ner %s?</string>
 	<string name="ok">OK</string>
@@ -69,8 +65,6 @@
 	<string name="search">Sök</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Sök karta</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Det finns inte tillräckligt mycket ledigt utrymme på telefonen</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Trycka för att ladda ner</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -423,13 +417,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Den nya versionen av MAPS.ME låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Uppdatera alla</string>
+	<string name="downloader_update_all_button">Uppdatera alla</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Avbryt alla</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Nedladdade</string>
+	<string name="downloader_downloaded_subtitle">Nedladdade</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">Köade</string>
+	<string name="downloader_near_me_subtitle">Nära mig</string>
+	<string name="downloader_status_maps">Kartor: %s</string>
+	<string name="downloader_download_all_button">Ladda ned alla</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">När du skapar rutter i appen MAPS.ME, vänligen tänk på följande:\n\n  - Föreslagna rutter kan endast ses som rekommendationer.\n - Vägskick, trafikregler och skyltar har högre prioritet än navigeringsråd.\n - Kartan kan vara felaktig eller förlegad, och rutter skapas inte alltid på bästa tänkbara sätt.\n\n  Kör säkert på vägarna och ta hand om dig själv!</string>
 	<!-- Outdated maps category -->
@@ -823,8 +820,6 @@
 	<string name="p2p_only_from_current">Navigering är endast tillgänglig från din aktuella plats.</string>
 	<string name="p2p_reroute_from_current">Vill du att vi planerar en färdväg från din nuvarande plats?</string>
 	<string name="whats_new_next_button">Nästa</string>
-	<string name="whats_new_night_caption">Navigering i nattläge</string>
-	<string name="whats_new_night_body">För att underlätta användandet av MAPS.ME under mörkerkörning har vi lagt till nattläget. Det slås automatiskt på efter att solen gått ned.</string>
 	<string name="editor_time_add">Lägg till schema</string>
 	<string name="editor_time_delete">Ta bort schema</string>
 	<!-- Text for allday switch. -->
@@ -840,9 +835,6 @@
 	<string name="editor_correct_mistake">Korrigera fel</string>
 	<string name="editor_correct_mistake_message">Du har gjort ett fel i redigeringen. Var vänlig korrigera det eller byt till enkelt läge.</string>
 	<string name="migrate_title">Viktigt!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Vi har delat in kartor i delar. Nu kan du ladda ner separata regioner, inte hela landet. Innan du börjar ladda ner nya kartor, ta bort de gamla.</string>
-	<string name="youve_been_asking">Du har bett om det och vi har gjort det</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Ladda ner alla</string>
 	<string name="delete_all">Radera alla</string>
@@ -906,6 +898,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-postadress eller användarnamn</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Redigera kartan direkt från MAPS.ME</string>
-	<string name="whats_new_editor_message">Dina ändringar kommer att hjälpa miljontals användare. Låt oss förbättra världen tillsammans!</string>
+	<string name="please_note">Observera</string>
+	<string name="common_no_wifi_dialog">Ingen wifi-anslutning. Vill du fortsätta med mobildata?</string>
+	<string name="downloader_delete_map_dialog">Alla kartändringar kommer att raderas tillsammans med kartan.</string>
+	<string name="downloader_update_maps">Uppdatera kartor</string>
+	<string name="downloader_mwm_migration_dialog">För att skapa en rutt måste du uppdatera alla kartor och sedan planera rutten igen.</string>
+	<string name="downloader_search_field_hint">Hitta kartan</string>
+	<string name="migration_update_all_button">Uppdatera alla kartor</string>
+	<string name="migration_delete_all_download_current_button">Ladda ned senaste kartan och radera de gamla</string>
+	<string name="migration_prefetch_status">Förbereder kartuppdatering…</string>
+	<string name="migration_download_error_dialog">Nedladdningsfel</string>
+	<string name="common_check_internet_connection_dialog">Kontrollera dina inställningar och se till att din enhet är ansluten till internet.</string>
+	<string name="downloader_no_space_title">Ej tillräckligt utrymme</string>
+	<string name="downloader_no_space_message">Ta bort onödig data</string>
+	<string name="editor_general_auth_error_dialog">Allmänt fel vid inloggning.</string>
+	<string name="editor_login_error_dialog">Inloggningsfel.</string>
+	<string name="editor_login_failed_dialog">Inloggningen misslyckades</string>
+	<string name="editor_username_error_dialog">Användarnamnet är ogiltigt</string>
+	<string name="editor_place_edited_dialog">Du har redigerat ett objekt!</string>
+	<string name="editor_login_with_osm">Logga in med OpenStreetMap</string>
+	<string name="editor_profile_changes">Ändringar:</string>
+	<string name="editor_profile_unsent_changes">Inte skickade</string>
+	<string name="editor_focus_map_on_location">Dra på kartan för att välja objektets rätta plats.</string>
+	<string name="editor_add_select_category">Välj kategori</string>
+	<string name="editor_add_select_category_popular_subtitle">Populära</string>
+	<string name="editor_add_select_category_all_subtitle">Alla kategorier</string>
+	<string name="editor_edit_place_title">Redigerar</string>
+	<string name="editor_add_place_title">Lägger till</string>
+	<string name="editor_edit_place_name_hint">Namn på platsen</string>
+	<string name="editor_edit_place_category_title">Kategori</string>
+	<string name="placepage_add_place_button">Lägg till en plats</string>
+	<string name="placepage_report_problem_button">Rapportera ett problem</string>
+	<string name="whatsnew_smallmwm_header">Du har bett om det och vi har gjort det</string>
+	<string name="whatsnew_smallmwm_message">Vi har delat in kartor i delar. Nu kan du ladda ner separata regioner, inte hela landet.</string>
+	<string name="whatsnew_search_message">Vi har avsevärt förbättrat sökningen på adress. Se själv.</string>
+	<string name="whatsnew_editor_title">Redigera kartan*</string>
+	<string name="whatsnew_editor_message_1">Lägg till nya platser till kartan och redigera de befintliga direkt från appen.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME använder data från OpenStreetMaps community.</string>
+	<string name="onboarding_offline_navigation_title">Du kommer aldrig att gå vilse igen</string>
+	<string name="onboarding_offline_navigation_message">Planera dina optimala bil- eller promenadrutter även när du saknar internetanslutning!</string>
+	<string name="onboarding_offline_navigation_title_2">Navigering offline</string>
+	<string name="onboarding_offline_navigation_message_2">Planera optimala bil- och promenadrutter.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - kartor offline</string>
+	<string name="onboarding_offline_maps_message">Ladda ned kartorna för önskat område en gång och använd funktionerna för navigering och sökning utan en internetanslutning.</string>
+	<string name="onboarding_notifications_message">Få avisering om uppdateringar för de senaste kartorna</string>
+	<string name="onboarding_notifications_title">Aktivera avisering om uppdateringar</string>
+	<string name="onboarding_location_title">Hjälp oss att hitta dig</string>
+	<string name="onboarding_location_message">För att använda navigering och andra funktioner behöver vi tillgång till din geografiska plats.</string>
 </resources>
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index efd8b75e11..6d95488694 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">ยกเลิกการดาวน์โหลด</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">ลบ</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">ลบแผนที่เก่าและดำเนินการต่อไป</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">อย่าถามฉันอีก</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">ไมล์</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">ตำแหน่งของฉัน</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">ไม่สามารถตรวจพบการเชื่อมต่ออินเทอร์เน็ต</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">ไม่สามารถตรวจพบการเชื่อมต่อ WiFi คุณต้องการใช้ข้อมูลโทรศัพท์มือถือ (GPRS, EDGE, 3G หรือ LTE) เพื่อดาวน์โหลด %s?</string>
 	<string name="ok">ตกลง</string>
@@ -73,8 +69,6 @@
 	<string name="search">ค้นหา</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">ค้นหาแผนที่</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">มีพื้นที่ว่างในดิสก์ไม่เพียงพอ</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">แตะเพื่อดาวน์โหลด</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -423,13 +417,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">เวอร์ชันใหม่ของ MAPS.ME อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">อัปเดตทั้งหมด</string>
+	<string name="downloader_update_all_button">อัปเดตทั้งหมด</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">ยกเลิกทั้งหมด</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">ดาวน์โหลดเสร็จ</string>
+	<string name="downloader_downloaded_subtitle">ดาวน์โหลดแล้ว</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">ต่อแถว</string>
+	<string name="downloader_near_me_subtitle">ใกล้ฉัน</string>
+	<string name="downloader_status_maps">แผนที่: %s</string>
+	<string name="downloader_download_all_button">ดาวน์โหลดทั้งหมด</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">การสร้างเส้นทางในแอป MAPS.ME มีสิ่งที่ควรทราบดังต่อไปนี้:\n\n  - พึงพิจารณาเส้นทางที่แนะนำไว้ในฐานะที่เป็นการแนะนำเท่านั้น\n - สภาพถนน กฎจราจรและป้ายมีความสำคัญมากกว่าคำแนะนำในการนำทาง\n - แผนที่อาจไม่ถูกต้องหรือล้าสมัย และอาจไม่ได้มีการสร้างเส้นทางในรูปแบบพอจะเป็นไปได้ที่ดีที่สุด\n\n  ขอให้ปลอดภัยบนท้องถนนและดูแลตัวคุณเองด้วย!</string>
 	<!-- Outdated maps category -->
@@ -823,8 +820,6 @@
 	<string name="p2p_only_from_current">สามารถใช้การนำทางได้เฉพาะจากตำแหน่งที่ตั้งปัจจุบันของคุณเท่านั้น</string>
 	<string name="p2p_reroute_from_current">คุณต้องการให้เราาวงแผนเส้นทางจากสถานที่ตั้งปัจจุบันของคุณหรือไม่?</string>
 	<string name="whats_new_next_button">ถัดไป</string>
-	<string name="whats_new_night_caption">การนำทางในโหมดกลางคืน</string>
-	<string name="whats_new_night_body">เราได้เพิ่มโหมดกลางคืนเพื่อส่งเสริมการใช้ MAPS.ME เมื่อคุณกำลังขับรถในสภาพมืด จะมีการเปิดใช้โหมดนี้โดยอัตโนมัติหลังจากพระอาทิตย์ตก</string>
 	<string name="editor_time_add">เพิ่มวัน</string>
 	<string name="editor_time_delete">ลบวัน</string>
 	<!-- Text for allday switch. -->
@@ -840,9 +835,6 @@
 	<string name="editor_correct_mistake">แก้ไขข้อผิดพลาด</string>
 	<string name="editor_correct_mistake_message">มีข้อผิดพลาดเกิดขึ้นจากการแก้ไขของคุณ โปรดแก้ไขให้ถูกต้อง หรือ สลับไปใช้ในโหมดแบบง่าย</string>
 	<string name="migrate_title">สำคัญ!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">เราได้แบ่งแผนที่ออกเป็นส่วน ๆ ตอนนี้คุณสามารถดาวน์โหลดภูมิภาคแยกต่างหากได้แล้ว ไม่ต้องโหลดทุกประเทศ ก่อนที่คุณจะเริ่มการดาวน์โหลดแผนที่ใหม่ ขอความกรุณาลบแผนที่อันเก่าออกไปก่อน</string>
-	<string name="youve_been_asking">คุณได้ขอมา เราจึงทำมัน</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">ดาวน์โหลดทั้งหมด</string>
 	<string name="delete_all">ลบทั้งหมด</string>
@@ -906,6 +898,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">อีเมลหรือชื่อผู้ใช้</string>
 	<string name="phone">โทรศัพท์</string>
-	<string name="whats_new_editor_caption">แก้ไขแผนที่โดยตรงจาก MAPS.ME</string>
-	<string name="whats_new_editor_message">การแก้ไขของคุณจะช่วยผู้ใช้หลายล้านคนได้ มาช่วยทำให้โลกน่าอยู่ขึ้น!</string>
+	<string name="please_note">โปรดทราบ</string>
+	<string name="common_no_wifi_dialog">ไม่มีการเชื่อมต่อ WiFi คุณต้องการดำเนินการต่อโดยใช้ข้อมูลมือถือหรือไม่?</string>
+	<string name="downloader_delete_map_dialog">การเปลี่ยนแปลงแผนที่ทั้งหมดจะถูกลบไปพร้อมกับแผนที่</string>
+	<string name="downloader_update_maps">อัปเดตแผนที่</string>
+	<string name="downloader_mwm_migration_dialog">ในการสร้างเส้นทาง คุณต้องอัปเดตแผนที่ทั้งหมดแล้ววางแผนเส้นทางอีกครั้ง</string>
+	<string name="downloader_search_field_hint">ค้นหาแผนที่</string>
+	<string name="migration_update_all_button">อัปเดตแผนที่ทั้งหมด</string>
+	<string name="migration_delete_all_download_current_button">ดาวน์โหลดแผนที่ปัจจุบันและลบแผนที่เก่า</string>
+	<string name="migration_prefetch_status">กำลังเตรียมการอัปเดตแผนที่…</string>
+	<string name="migration_download_error_dialog">ข้อผิดพลาดในการดาวน์โหลด</string>
+	<string name="common_check_internet_connection_dialog">กรุณาตรวจสอบการตั้งค่าของคุณแล้วทำให้แน่ใจว่าอุปกรณ์ของคุณได้รับการเชื่อมต่ออินเทอร์เน็ต</string>
+	<string name="downloader_no_space_title">มีพื้นที่ไม่เพียงพอ</string>
+	<string name="downloader_no_space_message">กรุณาลบข้อมูลที่ไม่จำเป็น</string>
+	<string name="editor_general_auth_error_dialog">ข้อผิดพลาดในการล็อกอินทั่วไป</string>
+	<string name="editor_login_error_dialog">ข้อผิดพลาดในการล็อกอิน</string>
+	<string name="editor_login_failed_dialog">การล็อกอินล้มเหลว</string>
+	<string name="editor_username_error_dialog">ชื่อผู้ใช้ไม่ถูกต้อง</string>
+	<string name="editor_place_edited_dialog">คุณได้แก้ไขวัตถุ!</string>
+	<string name="editor_login_with_osm">ล็อกอินด้วย OpenStreetMap</string>
+	<string name="editor_profile_changes">การเปลี่ยนแปลง:</string>
+	<string name="editor_profile_unsent_changes">ไม่ได้ส่ง</string>
+	<string name="editor_focus_map_on_location">ดึงแผนที่เพื่อเลือกตำแหน่งวัตถุที่ถูกต้อง</string>
+	<string name="editor_add_select_category">เลือกหมวดหมู่</string>
+	<string name="editor_add_select_category_popular_subtitle">ยอดนิยม</string>
+	<string name="editor_add_select_category_all_subtitle">หมวดหมูทั้งหมด</string>
+	<string name="editor_edit_place_title">กำลังแก้ไข</string>
+	<string name="editor_add_place_title">กำลังเพิ่ม</string>
+	<string name="editor_edit_place_name_hint">ชื่อสถานที่</string>
+	<string name="editor_edit_place_category_title">หมวดหมู่</string>
+	<string name="placepage_add_place_button">เพิ่มสถานที่</string>
+	<string name="placepage_report_problem_button">แจ้งปัญหา</string>
+	<string name="whatsnew_smallmwm_header">คุณได้ขอมา เราจึงทำมัน</string>
+	<string name="whatsnew_smallmwm_message">เราได้แบ่งแผนที่ออกเป็นส่วน ๆ ตอนนี้คุณสามารถดาวน์โหลดภูมิภาคแยกต่างหากได้แล้ว</string>
+	<string name="whatsnew_search_message">เราได้ปรับปรุงครั้งใหญ่สำหรับการค้นหาตามที่อยู่ ลองดูด้วยตัวเอง</string>
+	<string name="whatsnew_editor_title">แก้ไขแผนที่*</string>
+	<string name="whatsnew_editor_message_1">เพิ่มสถานที่ใหม่ ๆ ไปยังแผนที่ และแก้ไขสถานที่ที่มีอยู่เดิมจากแอปโดยตรง</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME ใช้ข้อมูลจากชุมชน OpenStreetMap</string>
+	<string name="onboarding_offline_navigation_title">คุณจะไม่หลงทางอีกต่อไป</string>
+	<string name="onboarding_offline_navigation_message">วางแผนเส้นทางรถยนต์และเส้นทางเดินที่เหมาะสมที่สุด แม้ว่าจะไม่มีการเชื่อมต่ออินเทอร์เน็ต!</string>
+	<string name="onboarding_offline_navigation_title_2">การนำทางออฟไลน์</string>
+	<string name="onboarding_offline_navigation_message_2">วางแผนเส้นทางรถยนต์และเส้นทางเดินที่เหมาะสมที่สุด</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - แผนที่ออฟไลน์</string>
+	<string name="onboarding_offline_maps_message">ดาวน์โหลดแผนที่สำหรับพื้นที่ที่ต้องการเพียงหนึ่งครั้ง แล้วใช้การฟังก์ชันการนำทางและการค้นหาโดยไม่ต้องเชื่อมต่ออินเทอร์เน็ต</string>
+	<string name="onboarding_notifications_message">เพื่อรับแผนที่ล่าสุดและรับการแจ้งเตือนอัปเดต</string>
+	<string name="onboarding_notifications_title">เปิดการแจ้งเตือนการอัปเดต</string>
+	<string name="onboarding_location_title">ช่วยให้เราค้นหาคุณ</string>
+	<string name="onboarding_location_message">เพื่อใช้การนำทางและฟีเจอร์อื่น ๆ เราต้องการเข้าถึงตำแหน่งทางภูมิศาสตร์ของคุณ</string>
 </resources>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index 9b03c0267f..57aa6fe843 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">İndirme İşlemini İptal Et</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Sil</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Eski haritaları sil ve ilerle</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Bunu tekrar sorma</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Mil</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Konumum</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">İnternet bağlantısı bulunamadı</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">WiFi bağlantısı bulunamadı. %s indirmek için hücresel veri (GPRS, EDGE, 3G veya LTE) kullanmak ister misiniz?</string>
 	<string name="ok">Tamam</string>
@@ -73,8 +69,6 @@
 	<string name="search">Ara</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Haritada Ara</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Yeterli boş disk alanı yok</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">İndirmek için dokunun</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -425,13 +419,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">MAPS.ME\&#39;nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Tümünü güncelle</string>
+	<string name="downloader_update_all_button">Hepsini güncelle</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Tümünü İptal Et</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">İndirilenler</string>
+	<string name="downloader_downloaded_subtitle">İndirildi</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">sıraya alındı</string>
+	<string name="downloader_near_me_subtitle">Yakınlarımda</string>
+	<string name="downloader_status_maps">Haritalar: %s</string>
+	<string name="downloader_download_all_button">Hepsini indir</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">MAPS.ME uygulamasında rota yaratırken lütfen aşağıdakileri dikkate alın:\n\n  - Önerilen rotalar sadece tavsiyeler olarak düşünülmelidir.\n - Yol koşulları, trafik kuralları ve işaretleri navigasyon tavsiyelerden daha önceliklidir.\n - Harita doğru olmayabilir ya da eskimiş olabilir ve rotalar en iyi mümkün yola göre oluşturulmamış olabilir.\n\n  Yollarda güvende olun ve kendinize dikkat edin!</string>
 	<!-- Outdated maps category -->
@@ -825,8 +822,6 @@
 	<string name="p2p_only_from_current">Navigasyon sadece şu anki konumunuzdan mevcut.</string>
 	<string name="p2p_reroute_from_current">Mevcut konumunuzdan bir rota planlamamızı ister misiniz?</string>
 	<string name="whats_new_next_button">Sonraki</string>
-	<string name="whats_new_night_caption">Gece modu navigasyon</string>
-	<string name="whats_new_night_body">Karanlıkta sürerken MAPS.ME kullanmayı kolaylaştırmak için gece modunu ekledik. Gün batımından sonra otomatik olarak devreye girer.</string>
 	<string name="editor_time_add">Plan Ekle</string>
 	<string name="editor_time_delete">Planı Sil</string>
 	<!-- Text for allday switch. -->
@@ -842,9 +837,6 @@
 	<string name="editor_correct_mistake">Hatayı düzelt</string>
 	<string name="editor_correct_mistake_message">Bir düzenleme hatası yaptınız. Lütfen düzeltin veya basit moda geçin.</string>
 	<string name="migrate_title">Önemli!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Haritaları parçalara ayırdık. Artık tüm ülke yerine belirli bölgeleri indirebilirsiniz. Yeni haritaları indirmeden önce lütfen eski haritaları kaldırın.</string>
-	<string name="youve_been_asking">Siz istediniz biz yaptık</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Tümünü indir</string>
 	<string name="delete_all">Tümünü sil</string>
@@ -908,6 +900,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-posta veya kullanıcı adı</string>
 	<string name="phone">Telefon</string>
-	<string name="whats_new_editor_caption">Haritayı doğrudan MAPS.ME\&#39;den düzenleyin</string>
-	<string name="whats_new_editor_message">Değişiklikleriniz milyonlarca kullanıcıya yardımcı olacaktır. Haydi dünyayı birlikte geliştirelim!</string>
+	<string name="please_note">Lütfen dikkat</string>
+	<string name="common_no_wifi_dialog">WiFi bağlantısı yok. Mobil veri ile devam etmek istiyor musunuz?</string>
+	<string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir.</string>
+	<string name="downloader_update_maps">Haritaları güncelle</string>
+	<string name="downloader_mwm_migration_dialog">Bir rota oluşturmak için tüm haritaları güncellemeli ve ardından rotayı tekrar planlamalısınız.</string>
+	<string name="downloader_search_field_hint">Harita bul</string>
+	<string name="migration_update_all_button">Haritaları güncelle</string>
+	<string name="migration_delete_all_download_current_button">Mevcut haritayı indir ve tüm eski haritaları sil</string>
+	<string name="migration_prefetch_status">Harita güncellemesi hazırlanıyor…</string>
+	<string name="migration_download_error_dialog">İndirme hatası</string>
+	<string name="common_check_internet_connection_dialog">Lütfen ayarlarınızı kontrol edin ve cihazınızın internete bağlı olduğundan emin olun.</string>
+	<string name="downloader_no_space_title">Yeterli alan yok</string>
+	<string name="downloader_no_space_message">Lütfen gereksiz verileri silin</string>
+	<string name="editor_general_auth_error_dialog">Genel giriş hatası.</string>
+	<string name="editor_login_error_dialog">Giriş hatası</string>
+	<string name="editor_login_failed_dialog">Giriş başarısız</string>
+	<string name="editor_username_error_dialog">Kullanıcı adı geçersiz</string>
+	<string name="editor_place_edited_dialog">Bir objeyi düzenlediniz\&#39;!</string>
+	<string name="editor_login_with_osm">OpenStreetMap ile giriş yapın</string>
+	<string name="editor_profile_changes">Değişiklikler:</string>
+	<string name="editor_profile_unsent_changes">Gönderilmedi</string>
+	<string name="editor_focus_map_on_location">Objenin doğru konumunu seçmek için haritayı çekin.</string>
+	<string name="editor_add_select_category">Kategori seç</string>
+	<string name="editor_add_select_category_popular_subtitle">Popüler</string>
+	<string name="editor_add_select_category_all_subtitle">Tüm kategoriler</string>
+	<string name="editor_edit_place_title">Düzenleme</string>
+	<string name="editor_add_place_title">Ekleme</string>
+	<string name="editor_edit_place_name_hint">Yerin ismi</string>
+	<string name="editor_edit_place_category_title">Kategori</string>
+	<string name="placepage_add_place_button">Bir yer ekle</string>
+	<string name="placepage_report_problem_button">Bir problem bildirin</string>
+	<string name="whatsnew_smallmwm_header">Siz istediniz biz yaptık</string>
+	<string name="whatsnew_smallmwm_message">Haritaları parçalara ayırdık. Artık tüm ülke yerine belirli bölgeleri indirebilirsiniz.</string>
+	<string name="whatsnew_search_message">Adres ile aramayı önemli ölçüde geliştirdik. Kendiniz görün.</string>
+	<string name="whatsnew_editor_title">Haritayı düzenleyin*</string>
+	<string name="whatsnew_editor_message_1">Doğrudan uygulamadan haritaya yeni yerler ekle ve mevcut yerleri düzenleyin.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME, OpenStreetMap topluluğu verilerini kullanmaktadır.</string>
+	<string name="onboarding_offline_navigation_title">Bir daha asla kaybolmayacaksınız</string>
+	<string name="onboarding_offline_navigation_message">En iyi araba ve yaya rotalarını planlayın, hatta internet bağlantısı olmadığında bile!</string>
+	<string name="onboarding_offline_navigation_title_2">Farklı bir problem</string>
+	<string name="onboarding_offline_navigation_message_2">En iyi araba ve yaya rotalarını planlayın.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - çevrimdışı haritalar</string>
+	<string name="onboarding_offline_maps_message">İlk önce istenilen alanın haritasını indirin ve internet bağlantısı olmadan navigasyonu ve arama fonksiyonlarını kullanın.</string>
+	<string name="onboarding_notifications_message">En son haritaları almak için güncelleme bildirimlerini alın</string>
+	<string name="onboarding_notifications_title">Güncelleme bildirimlerini etkinleştir</string>
+	<string name="onboarding_location_title">Sizi bulmamıza yardım edin</string>
+	<string name="onboarding_location_message">Navigasyon ve diğer özellikleri kullanmak için konum belirlemenize erişmeye ihtiyacımız var.</string>
 </resources>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 5dde1ad6fa..70a7cd327f 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Вiдмiнити завантаження</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Видалити</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Видалити старі карти та продовжити</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Більше не питати</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Милі</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Моє місце розташування</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Відсутнє підключення до інтернету</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Відсутнє WiFi з\&#39;єднання. Ви бажаєте завантажити %s через стільникового оператора (GPRS, EDGE, 3G або LTE)?</string>
 	<!-- not used? Search View - Location is disabled by user warning text -->
@@ -72,8 +68,6 @@
 	<string name="search">Пошук</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Пошук на картi</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Немає вільного місця</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Натисніть для завантаження</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -422,13 +416,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Оновити все</string>
+	<string name="downloader_update_all_button">Оновити всі</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Скасувати всі</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Завантажено</string>
+	<string name="downloader_downloaded_subtitle">Завантажено</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">в черзі</string>
+	<string name="downloader_near_me_subtitle">Поблизу</string>
+	<string name="downloader_status_maps">Карти: %s</string>
+	<string name="downloader_download_all_button">Завантажити всі</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Використовуючи маршрути в програмі MAPS.ME, будь ласка, враховуйте наступне:\n\n  - Пропоновані маршрути можуть розглядатися тільки в якості рекомендації.\n - Дорожні умови, правила дорожнього руху, знаки являються більш пріоритетними в порівнянні з порадами навігаційної програми.\n - Карта може бути неточною або неактуальною , а запропонований маршрут не найоптимальнішим.\n\n  Будьте уважні на дорозі та бережіть себе!</string>
 	<!-- Outdated maps category -->
@@ -822,8 +819,6 @@
 	<string name="p2p_only_from_current">Маршрут можна прокласти лише з поточного місцезнаходження.</string>
 	<string name="p2p_reroute_from_current">Хочете спланувати маршрут із поточного місцезнаходження?</string>
 	<string name="whats_new_next_button">Далі</string>
-	<string name="whats_new_night_caption">Нічний режим навігації</string>
-	<string name="whats_new_night_body">Для зручності використання MAPS.ME під час водіння автомобіля в темну пору доби ми додали нічний режим. Він запускається автоматично після заходу сонця.</string>
 	<string name="editor_time_add">Додати розклад</string>
 	<string name="editor_time_delete">Видалити розклад</string>
 	<!-- Text for allday switch. -->
@@ -839,9 +834,6 @@
 	<string name="editor_correct_mistake">Виправте помилку</string>
 	<string name="editor_correct_mistake_message">Під час редагування часу роботи ви зробили помилку. Виправте її або перейдіть у простий режим.</string>
 	<string name="migrate_title">Важливо!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Ми поділили великі мапи на частини: тепер можна завантажити необхідну область окремо від всієї країни. Перед тим як розпочати завантажувати зменьшені мапи, будь ласка, видаліть всі старі.</string>
-	<string name="youve_been_asking">Ви просили і ми це зробили</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Завантажити всі</string>
 	<string name="delete_all">Видалити всі</string>
@@ -905,6 +897,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">Ел. пошта або ім\&#39;я користувача</string>
 	<string name="phone">Телефон</string>
-	<string name="whats_new_editor_caption">Редагуйте карту відразу з MAPS.ME</string>
-	<string name="whats_new_editor_message">Ваші зміни допоможуть мільйонам користувачів. Вдосконалимо світ разом!</string>
+	<string name="please_note">Будь ласка, зверніть увагу</string>
+	<string name="common_no_wifi_dialog">Немає WiFi з’єднання. Ви бажаєте продовжити роботу через мобільний інтернет?</string>
+	<string name="downloader_delete_map_dialog">Разом з мапою будуть видалені й внесені Вами правки на цій мапі.</string>
+	<string name="downloader_update_maps">Оновити мапи</string>
+	<string name="downloader_mwm_migration_dialog">Для побудови маршруту необхідно оновити усі мапи та побудувати маршрут заново.</string>
+	<string name="downloader_search_field_hint">Знайти карту</string>
+	<string name="migration_update_all_button">Оновити всі карти</string>
+	<string name="migration_delete_all_download_current_button">Завантажте поточну карту і видаліть старі</string>
+	<string name="migration_prefetch_status">Підготовка до оновлення карт…</string>
+	<string name="migration_download_error_dialog">Помилка завантаження</string>
+	<string name="common_check_internet_connection_dialog">Будь ласка, перевірте свої налаштування і переконайтеся, що ваш пристрій підлючено до Інтернету.</string>
+	<string name="downloader_no_space_title">Недостатньо місця</string>
+	<string name="downloader_no_space_message">Видаліть непотрібні дані</string>
+	<string name="editor_general_auth_error_dialog">Загальна помилка входу.</string>
+	<string name="editor_login_error_dialog">Виникла помилка при авторизації.</string>
+	<string name="editor_login_failed_dialog">Помилка входу</string>
+	<string name="editor_username_error_dialog">Ім\&#39;я користувача є недійсним</string>
+	<string name="editor_place_edited_dialog">Ви відредагували об’єкт!</string>
+	<string name="editor_login_with_osm">Увійти через OpenStreetMap</string>
+	<string name="editor_profile_changes">Правки:</string>
+	<string name="editor_profile_unsent_changes">Не відправлено</string>
+	<string name="editor_focus_map_on_location">Потягніть мапу, щоб вибрати правильне місцезнаходження об’єкту.</string>
+	<string name="editor_add_select_category">Вибрати категорію</string>
+	<string name="editor_add_select_category_popular_subtitle">Популярні</string>
+	<string name="editor_add_select_category_all_subtitle">Усі категорії</string>
+	<string name="editor_edit_place_title">Редагування</string>
+	<string name="editor_add_place_title">Додовання</string>
+	<string name="editor_edit_place_name_hint">Назва місця</string>
+	<string name="editor_edit_place_category_title">Категорія</string>
+	<string name="placepage_add_place_button">Додати місце</string>
+	<string name="placepage_report_problem_button">Повідомити про проблему</string>
+	<string name="whatsnew_smallmwm_header">Ви просили і ми це зробили</string>
+	<string name="whatsnew_smallmwm_message">Ми поділили карти на частини. Тепер ви можете стягувати окремі регіони, а не країну цілком.</string>
+	<string name="whatsnew_search_message">Якісно покращили пошук по адресам. Перевірте.</string>
+	<string name="whatsnew_editor_title">Редагувати карту*</string>
+	<string name="whatsnew_editor_message_1">Додати нові місця до карти і редагувати існуючі місця прямо з програми.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME використовує дані спільноти OpenStreetMap.</string>
+	<string name="onboarding_offline_navigation_title">Ви ніколи не загубитеся знову</string>
+	<string name="onboarding_offline_navigation_message">Плануйте оптимальні маршрути для поїздок і піших походів навіть без Інтернет з\&#39;єднання!</string>
+	<string name="onboarding_offline_navigation_title_2">Офлайн навігація</string>
+	<string name="onboarding_offline_navigation_message_2">Плануйте оптимальні маршрути для поїздок і піших походів.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME — офлайн мапи</string>
+	<string name="onboarding_offline_maps_message">Завантажте мапи необхідного регіону один раз та користуйтесь навігацією та пошуком без підключення до інтернету.</string>
+	<string name="onboarding_notifications_message">Отримуйте повідомлення про оновлення, щоб завжди мати актуальні мапи</string>
+	<string name="onboarding_notifications_title">Дозвольте відправлення повідомлень</string>
+	<string name="onboarding_location_title">Допоможіть знайти вас</string>
+	<string name="onboarding_location_message">Щоб користуватися навігацією та іншими функціями додатку, нам необхідний доступ до вашого місцезнаходження.</string>
 </resources>
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index cbcfae73f1..ec9efeffa0 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Huỷ bỏ Tải xuống</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Xóa</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Xóa bản đồ cũ và tiếp tục</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Không hỏi tôi một lần nữa</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -32,7 +30,7 @@
 	<!-- Settings/Downloader - country info current download progress -->
 	<string name="downloading_x_touch_to_cancel">Đang tải xuống %qu%%, chạm để hủy bỏ</string>
 	<!-- Settings/Downloader - info for country which started downloading -->
-	<string name="downloading">Đang tải xuống...</string>
+	<string name="downloading">Đang tải xuống…</string>
 	<string name="get_it_now">Tải xuống ngay</string>
 	<!-- Text to show occasionaly with a proposal to Like our program on Facebook -->
 	<string name="share_on_facebook_text">Cám ơn bạn đã sử dụng MAPS.ME! Bạn thích ứng dụng chứ? Kể cho bạn bè về ứng dụng này! Đây sẽ là sự biết ơn tuyệt vời nhất đối với chúng tôi.</string>
@@ -52,8 +50,6 @@
 	<string name="miles">Dặm</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">Vị trí của Tôi</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">Không có kết nối Internet</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">Không có kết nối WiFi. Bạn có muốn sử dụng dữ liệu di động (GPRS, EDGE, 3G hoặc LTE) để tải xuống %s không?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Tìm kiếm</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Tìm kiếm Bản đồ</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">Không có đủ dung lượng trống trên ổ đĩa</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Chạm để tải xuống</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -365,7 +359,7 @@
 	<!-- category title -->
 	<string name="routes">Tuyến đường</string>
 	<!-- Show on first launch. -->
-	<string name="maps_licence_info">Ứng dụng này sử dụng dữ liệu địa lý (bao gồm bản đồ, thông tin doanh nghiệp, các điểm lưu tâm, biên giới quốc gia và khu vực, v.v...) lấy từ dự án OpenStreetMap. Chúng tôi không đảm bảo bất kỳ sự nhất quán, chính xác, toàn vẹn hay phù hợp nào từ các dữ liệu OpenStreetMap.</string>
+	<string name="maps_licence_info">Ứng dụng này sử dụng dữ liệu địa lý (bao gồm bản đồ, thông tin doanh nghiệp, các điểm lưu tâm, biên giới quốc gia và khu vực, v.v…) lấy từ dự án OpenStreetMap. Chúng tôi không đảm bảo bất kỳ sự nhất quán, chính xác, toàn vẹn hay phù hợp nào từ các dữ liệu OpenStreetMap.</string>
 	<!-- Show on first launch. -->
 	<string name="agree">Tôi đồng ý</string>
 	<!-- Show on first launch -->
@@ -405,7 +399,7 @@
 	<!-- Email body -->
 	<string name="subscribe_me_body">Tôi muốn là người đầu tiên được biết về các thông tin cập nhật và quảng bá mới nhất. Tôi có thể hủy bỏ đăng ký nhận tin của mình bất cứ lúc nào.</string>
 	<!-- About text -->
-	<string name="about_text">MAPS.ME cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, MAPS.ME vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v... gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện MAPS.ME. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@maps.me. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích MAPS.ME và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về MAPS.ME với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại http://openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng MAPS.ME ở phiên bản kế tiếp.</string>
+	<string name="about_text">MAPS.ME cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, MAPS.ME vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v… gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện MAPS.ME. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@maps.me. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích MAPS.ME và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về MAPS.ME với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại http://openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng MAPS.ME ở phiên bản kế tiếp.</string>
 	<!-- Alert text -->
 	<string name="email_error_body">Trình khách email này chưa được thiết lập. Bạn vui lòng cấu hình nó hoặc sử dụng một cách khác để liên hệ với chúng tôi tại %s</string>
 	<!-- Alert title -->
@@ -418,12 +412,8 @@
 	<string name="routing_map_outdated">Vui lòng cập nhật bản đồ để tạo tuyến đường</string>
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">Phiên bản MAPS.ME mới cho phép tạo các tuyến đường từ vị trí hiện tại của bạn đến điểm đến. Vui lòng cập nhật bản đồ để sử dụng tính năng này.</string>
-	<!-- Update all button text -->
-	<string name="downloader_update_all">Cập nhật tất cả</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Hủy tất cả</string>
-	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Đã tải xuống</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">đã xếp hàng chờ</string>
 	<!-- Disclaimer message -->
@@ -819,8 +809,6 @@
 	<string name="p2p_only_from_current">Chức năng tìm đường chỉ có sẵn từ vị trí hiện tại của bạn.</string>
 	<string name="p2p_reroute_from_current">Bạn có muốn chúng tôi vạch đường từ vị trí hiện tại của bạn không?</string>
 	<string name="whats_new_next_button">Tiếp theo</string>
-	<string name="whats_new_night_caption">Điều hướng chế độ ban đêm</string>
-	<string name="whats_new_night_body">Để tạo điều kiện sử dụng MAPS.ME khi lái xe trong đêm tối, chúng tôi đã thêm chế độ ban đêm. Nó tự động mở sau khi mặt trời lặn.</string>
 	<string name="editor_time_add">Thêm lịch biểu</string>
 	<string name="editor_time_delete">Xóa lịch biểu</string>
 	<!-- Text for allday switch. -->
@@ -836,9 +824,6 @@
 	<string name="editor_correct_mistake">Sửa lỗi</string>
 	<string name="editor_correct_mistake_message">Bạn đã mắc lỗi chỉnh sửa. Vui lòng sửa lỗi hoặc chuyển qua chế độ đơn giản.</string>
 	<string name="migrate_title">Quan trọng!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">Chúng tôi đã chia bản đồ thành nhiều phần. Bây giờ bạn có thể tải về các vùng riêng biệt, không phải là toàn bộ quốc gia. Trước khi bạn bắt đầu tải những bản đồ mới, hãy loại bỏ những cái cũ.</string>
-	<string name="youve_been_asking">Bạn đã yêu cầu điều đó và chúng tôi đã thực hiện nó</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Tải về tất cả</string>
 	<string name="delete_all">Xóa tất cả</string>
@@ -902,6 +887,7 @@
 	<!-- login text field -->
 	<string name="email_or_username">E-mail hoặc tên người dùng</string>
 	<string name="phone">Điện thoại</string>
-	<string name="whats_new_editor_caption">Chỉnh sửa bản đồ trực tiếp từ MAPS.ME</string>
-	<string name="whats_new_editor_message">Thay đổi của bạn sẽ giúp cho hàng triệu người dùng. Hãy cùng nhau cải thiện thế giới!</string>
+	<string name="whatsnew_smallmwm_header">Bạn đã yêu cầu điều đó và chúng tôi đã thực hiện nó</string>
+	<string name="whatsnew_smallmwm_message">Chúng tôi đã chia bản đồ thành nhiều phần. Bây giờ bạn có thể tải về các vùng riêng biệt, không phải là toàn bộ quốc gia.</string>
+	<string name="whatsnew_search_message">Chúng tôi đã cải thiện đáng kể việc tìm kiếm theo địa chỉ. Bạn hãy tự xem thử.</string>
 </resources>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 670f0929e5..185897f0eb 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">取消下載</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">刪除</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">刪除舊的地圖並繼續</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">別再問我</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">英哩</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">我的位置</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">無網路連線</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">未發現WiFi訊號!您想使用其他的網路連線方式(GPRS, EDGE, 3G 或 LTE)來下載嗎 %s？</string>
 	<string name="ok">好</string>
@@ -69,8 +65,6 @@
 	<string name="search">搜尋</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">搜尋地圖</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">沒有足夠的儲存空間</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">輕觸後下載</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -409,13 +403,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">使用新版本的MAPS.ME可以創建從您的當前位置至一個目的地的路線。請更新地圖以使用該功能。</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">更新全部</string>
+	<string name="downloader_update_all_button">更新全部</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">取消全部</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">已下載</string>
+	<string name="downloader_downloaded_subtitle">已下載</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">已佇列</string>
+	<string name="downloader_near_me_subtitle">在我附近</string>
+	<string name="downloader_status_maps">地圖： %s</string>
+	<string name="downloader_download_all_button">下載全部</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">在MAPS.ME應用中制定路線時請謹記以下幾點：\n\n  - 建議路線僅可當作推薦路線。\n - 路況、交通規則以及標誌應優先於導航建議。\n - 地圖可能會不正確或者過時，路線也可能不是以最佳可能方式制定的。\n\n  行車安全，請照顧好您自己！</string>
 	<!-- Outdated maps category -->
@@ -805,8 +802,6 @@
 	<string name="p2p_only_from_current">導航只能從您目前的位置開始。</string>
 	<string name="p2p_reroute_from_current">你是否想要規劃當前位置的路線？</string>
 	<string name="whats_new_next_button">下一頁</string>
-	<string name="whats_new_night_caption">夜間模式導航</string>
-	<string name="whats_new_night_body">為了便於天黑行駛時使用MAPS.ME，我們增加了夜間模式。該模式在日落之後會自動開啟。</string>
 	<string name="editor_time_add">新增排程</string>
 	<string name="editor_time_delete">刪除排程</string>
 	<!-- Text for allday switch. -->
@@ -822,9 +817,6 @@
 	<string name="editor_correct_mistake">修正錯誤</string>
 	<string name="editor_correct_mistake_message">編輯時出錯。請修正或切換到簡易模式。</string>
 	<string name="migrate_title">重要！</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">我們已將地圖分為若干部分。現在，您可下載各個地區，而非整個國家的地圖。您在開始下載新地圖前，請刪除老地圖。</string>
-	<string name="youve_been_asking">您一直在尋求，而我們已經完成</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">全部下載。</string>
 	<string name="delete_all">刪除全部</string>
@@ -888,6 +880,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">郵箱或用戶名</string>
 	<string name="phone">電話</string>
-	<string name="whats_new_editor_caption">直接從MAPS.ME編輯地圖</string>
-	<string name="whats_new_editor_message">您的修改將幫助上百萬用戶。讓我們一起讓世界變好！</string>
+	<string name="please_note">請註意</string>
+	<string name="common_no_wifi_dialog">無WiFi連接。您想繼續使用移動數據進行連接嗎？</string>
+	<string name="downloader_delete_map_dialog">所有對地圖的修改都將與地圖一起被刪除。</string>
+	<string name="downloader_update_maps">更新地圖</string>
+	<string name="downloader_mwm_migration_dialog">為了創建路線，您需要更新全部地圖並重新規劃路線。</string>
+	<string name="downloader_search_field_hint">找到地圖</string>
+	<string name="migration_update_all_button">更新全部地圖</string>
+	<string name="migration_delete_all_download_current_button">下載當前地圖並刪除舊地圖</string>
+	<string name="migration_prefetch_status">正在準備地圖更新…</string>
+	<string name="migration_download_error_dialog">下載錯誤</string>
+	<string name="common_check_internet_connection_dialog">請檢查您的設置並確保您的設備已連接至網絡。</string>
+	<string name="downloader_no_space_title">無足夠的空間</string>
+	<string name="downloader_no_space_message">請刪除不必要的數據</string>
+	<string name="editor_general_auth_error_dialog">一般登錄錯誤。</string>
+	<string name="editor_login_error_dialog">登錄錯誤。</string>
+	<string name="editor_login_failed_dialog">登錄失敗</string>
+	<string name="editor_username_error_dialog">用戶名不存在</string>
+	<string name="editor_place_edited_dialog">您已編輯了一個對象！</string>
+	<string name="editor_login_with_osm">使用OpenStreetMap進行登錄</string>
+	<string name="editor_profile_changes">更改：</string>
+	<string name="editor_profile_unsent_changes">未發送</string>
+	<string name="editor_focus_map_on_location">拖動地圖以選擇此對象的正確位置。</string>
+	<string name="editor_add_select_category">選擇類別</string>
+	<string name="editor_add_select_category_popular_subtitle">受歡迎的</string>
+	<string name="editor_add_select_category_all_subtitle">所有類別</string>
+	<string name="editor_edit_place_title">編輯中</string>
+	<string name="editor_add_place_title">添加中</string>
+	<string name="editor_edit_place_name_hint">該地點的名稱</string>
+	<string name="editor_edit_place_category_title">類別</string>
+	<string name="placepage_add_place_button">添加一個地點</string>
+	<string name="placepage_report_problem_button">報告一個問題</string>
+	<string name="whatsnew_smallmwm_header">您一直在尋求，而我們已經完成</string>
+	<string name="whatsnew_smallmwm_message">我們已將地圖分為若干部分。現在，您可下載各個地區，而非整個國家的地圖。</string>
+	<string name="whatsnew_search_message">我們已明顯改進了按地址的搜索。親自看看。</string>
+	<string name="whatsnew_editor_title">編輯此地圖*</string>
+	<string name="whatsnew_editor_message_1">添加新地點到該地圖，並直接通過此應用編輯已存在的地點。</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME使用OpenStreetMap社區的數據。</string>
+	<string name="onboarding_offline_navigation_title">您將不再迷路</string>
+	<string name="onboarding_offline_navigation_message">規劃最佳的駕車和步行路線，即使在沒有網絡連接的情況下！</string>
+	<string name="onboarding_offline_navigation_title_2">離線導航</string>
+	<string name="onboarding_offline_navigation_message_2">規劃最佳的駕車和步行路線。</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - 離線地圖</string>
+	<string name="onboarding_offline_maps_message">一次下載所需地區的地圖，無需網絡連接就能使用導航和搜索功能。</string>
+	<string name="onboarding_notifications_message">為了接收最新的地圖，請獲取更新通知</string>
+	<string name="onboarding_notifications_title">啟用更新通知</string>
+	<string name="onboarding_location_title">幫我們找到您</string>
+	<string name="onboarding_location_message">如要使用導航和其他功能，我們需要能獲取您的地理位置.</string>
 </resources>
diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml
index 2ec88c4d15..d6675184e9 100644
--- a/android/res/values-zh/strings.xml
+++ b/android/res/values-zh/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">取消下载</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">删除</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">删除旧地图，然后继续</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">不要再问我</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -48,8 +46,6 @@
 	<string name="miles">英里</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">我的位置</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">未检测到互联网连接</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">未检测到 WiFi 连接。您想使用蜂窝数据 (GPRS, EDGE, 3G 或 LTE)下载%s吗?</string>
 	<string name="ok">好</string>
@@ -69,8 +65,6 @@
 	<string name="search">搜索</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">搜索地图</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">没有足够的可用磁盘空间</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">轻触下载</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -427,13 +421,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">使用新版本的MAPS.ME可以创建从您的当前位置至一个目的地的路线。请更新地图以使用该功能。</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">更新全部</string>
+	<string name="downloader_update_all_button">更新全部</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">全部取消</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">已下载</string>
+	<string name="downloader_downloaded_subtitle">已下载</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">已排队</string>
+	<string name="downloader_near_me_subtitle">在我附近</string>
+	<string name="downloader_status_maps">地图： %s</string>
+	<string name="downloader_download_all_button">下载全部</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">在MAPS.ME应用中制定路线时请谨记以下 几点：\n\n  - 建议路线仅可当作推荐路线。\n - 路况、交通规则以及标志应优先于导航建议。\n - 地图可能会不正确或者过时，路线也可能不是以最佳可能方式制定的。\n\n  行车安全，请照顾好您自己！</string>
 	<!-- Outdated maps category -->
@@ -825,8 +822,6 @@
 	<string name="p2p_only_from_current">导航只能从您目前的位置开始。</string>
 	<string name="p2p_reroute_from_current">你是否想要规划当前位置的路线？</string>
 	<string name="whats_new_next_button">下一页</string>
-	<string name="whats_new_night_caption">夜间模式导航</string>
-	<string name="whats_new_night_body">为了便于天黑行驶时使用MAPS.ME，我们增加了夜间模式。该模式在日落之后会自动开启。</string>
 	<string name="editor_time_add">添加计划</string>
 	<string name="editor_time_delete">删除计划</string>
 	<!-- Text for allday switch. -->
@@ -842,9 +837,6 @@
 	<string name="editor_correct_mistake">纠正错误</string>
 	<string name="editor_correct_mistake_message">出现编辑错误，请纠正或切换至简单模式。</string>
 	<string name="migrate_title">重要！</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">我们将地图分成了几部分。现在，您可以下载独立的区域，而不是整个国家。在开始下载新地图前，请删除旧地图。</string>
-	<string name="youve_been_asking">我们满足了您一直以来的要求</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">下载所有</string>
 	<string name="delete_all">删除全部</string>
@@ -908,6 +900,51 @@
 	<!-- login text field -->
 	<string name="email_or_username">邮箱或用户名</string>
 	<string name="phone">电话</string>
-	<string name="whats_new_editor_caption">直接从MAPS.ME编辑地图</string>
-	<string name="whats_new_editor_message">您的修改将帮助上百万用户。让我们一起让世界变好！</string>
+	<string name="please_note">请注意</string>
+	<string name="common_no_wifi_dialog">无WiFi连接。您想继续使用移动数据进行连接吗？</string>
+	<string name="downloader_delete_map_dialog">所有对地图的修改都将与地图一起被删除。</string>
+	<string name="downloader_update_maps">更新地图</string>
+	<string name="downloader_mwm_migration_dialog">为了创建路线，您需要更新全部地图并重新规划路线。</string>
+	<string name="downloader_search_field_hint">找到地图</string>
+	<string name="migration_update_all_button">更新全部地图</string>
+	<string name="migration_delete_all_download_current_button">下载当前地图并删除旧地图</string>
+	<string name="migration_prefetch_status">正在准备地图更新…</string>
+	<string name="migration_download_error_dialog">下载错误</string>
+	<string name="common_check_internet_connection_dialog">请检查您的设置并确保您的设备已连接至网络。</string>
+	<string name="downloader_no_space_title">无足够的空间</string>
+	<string name="downloader_no_space_message">请删除不必要的数据</string>
+	<string name="editor_general_auth_error_dialog">一般登录错误。</string>
+	<string name="editor_login_error_dialog">登录错误。</string>
+	<string name="editor_login_failed_dialog">登录失败</string>
+	<string name="editor_username_error_dialog">用户名不存在</string>
+	<string name="editor_place_edited_dialog">您已编辑了一个对象！</string>
+	<string name="editor_login_with_osm">使用OpenStreetMap进行登录</string>
+	<string name="editor_profile_changes">更改数目：</string>
+	<string name="editor_profile_unsent_changes">未发送</string>
+	<string name="editor_focus_map_on_location">拖动地图以选择此对象的正确位置。</string>
+	<string name="editor_add_select_category">选择类别</string>
+	<string name="editor_add_select_category_popular_subtitle">受欢迎的</string>
+	<string name="editor_add_select_category_all_subtitle">所有类别</string>
+	<string name="editor_edit_place_title">编辑中</string>
+	<string name="editor_add_place_title">添加中</string>
+	<string name="editor_edit_place_name_hint">该地点的名称</string>
+	<string name="editor_edit_place_category_title">类别</string>
+	<string name="placepage_add_place_button">添加一个地点</string>
+	<string name="placepage_report_problem_button">报告一个问题</string>
+	<string name="whatsnew_smallmwm_header">我们满足了您一直以来的要求</string>
+	<string name="whatsnew_smallmwm_message">我们将地图分成了几部分。现在，您可以下载独立的区域，而不是整个国家。</string>
+	<string name="whatsnew_search_message">我们已明显改进了按地址的搜索。亲自看看。</string>
+	<string name="whatsnew_editor_title">编辑此地图*</string>
+	<string name="whatsnew_editor_message_1">添加新地点到该地图，并直接通过此应用编辑已存在的地点。</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME使用OpenStreetMap社区的数据。</string>
+	<string name="onboarding_offline_navigation_title">您将不再迷路</string>
+	<string name="onboarding_offline_navigation_message">规划最佳的驾车和步行路线，即使在没有网络连接的情况下！</string>
+	<string name="onboarding_offline_navigation_title_2">离线导航</string>
+	<string name="onboarding_offline_navigation_message_2">规划最佳的驾车和步行路线。</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - 离线地图</string>
+	<string name="onboarding_offline_maps_message">下载一次所需区域的地图，您便可以在无网络连接的情况下使用导航和搜索功能。</string>
+	<string name="onboarding_notifications_message">为了接收最新的地图，请获取更新通知</string>
+	<string name="onboarding_notifications_title">允许更新通知</string>
+	<string name="onboarding_location_title">帮助我们找到您</string>
+	<string name="onboarding_location_message">为了使用导航和其他功能，我们需要访问您的地理位置信息.</string>
 </resources>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index f19b2ea705..e4374b885e 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -14,8 +14,6 @@
 	<string name="cancel_download">Cancel Download</string>
 	<!-- Button which deletes downloaded country -->
 	<string name="delete">Delete</string>
-	<!-- Button in iOS Downloader, displayed only when upgrading from v1 to v2 -->
-	<string name="delete_old_maps">Delete old maps and proceed</string>
 	<!-- Button to dismiss dialog forever -->
 	<string name="do_not_ask_me_again">Do not ask me again</string>
 	<!-- Button "do not interrupt download" if user touched actively downloading country -->
@@ -52,8 +50,6 @@
 	<string name="miles">Miles</string>
 	<!-- View and button titles for accessibility -->
 	<string name="my_position">My Position</string>
-	<!-- Settings/Downloader - No internet connection dialog title -->
-	<string name="no_internet_connection_detected">No Internet connection detected</string>
 	<!-- Settings/Downloader - 3G download warning dialog title -->
 	<string name="no_wifi_ask_cellular_download">No WiFi connection detected. Would you like to use cellular data (GPRS, EDGE, 3G or LTE) to download %s?</string>
 	<string name="ok">OK</string>
@@ -73,8 +69,6 @@
 	<string name="search">Search</string>
 	<!-- Search box placeholder text -->
 	<string name="search_map">Search Map</string>
-	<!-- Settings/Downloader - No free space dialog title -->
-	<string name="not_enough_disk_space">There is not enough free disk space</string>
 	<!-- Settings/Downloader - info for not downloaded country -->
 	<string name="touch_to_download">Touch to download</string>
 	<!-- Settings/Downloader - 3G download warning dialog confirm button -->
@@ -448,15 +442,16 @@
 	<!-- Update maps suggestion -->
 	<string name="routing_update_maps">The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.</string>
 	<!-- Update all button text -->
-	<string name="downloader_update_all">Update all</string>
+	<string name="downloader_update_all_button">Update All</string>
 	<!-- Cancel all button text -->
 	<string name="downloader_cancel_all">Cancel All</string>
 	<!-- Downloaded maps category -->
-	<string name="downloader_downloaded">Downloaded</string>
+	<string name="downloader_downloaded_subtitle">Downloaded</string>
 	<!-- Country queued for download -->
 	<string name="downloader_queued">queued</string>
-	<string name="downloader_near_me">Near me</string>
-	<string name="downloader_maps_to_update">Maps: %1$d (%2$s)</string>
+	<string name="downloader_near_me_subtitle">Near me</string>
+	<string name="downloader_status_maps">Maps: %s</string>
+	<string name="downloader_download_all_button">Download All</string>
 	<!-- Disclaimer message -->
 	<string name="routing_disclaimer">Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!</string>
 	<!-- Outdated maps category -->
@@ -496,8 +491,6 @@
 	<string name="downloader_retry">Retry</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_map_and_routing">Map + Routing</string>
-	<!-- Dialog confirmation when trying to delete map and there are unsaved changes present on it. -->
-	<string name="downloader_delete_editor_changes">Unsaved changes for this map will be removed too. Continue anyway?</string>
 	<!-- Item in context menu. -->
 	<string name="downloader_delete_map">Delete Map</string>
 	<!-- Item in context menu. -->
@@ -856,8 +849,6 @@
 	<string name="p2p_only_from_current">Navigation is available only from your current location.</string>
 	<string name="p2p_reroute_from_current">Do you want us to plan a route from your current location?</string>
 	<string name="whats_new_next_button">Next</string>
-	<string name="whats_new_night_caption">Night Mode Navigation</string>
-	<string name="whats_new_night_body">To facilitate using MAPS.ME when driving in the dark, we have added night mode. It switches on automatically after sunset.</string>
 	<string name="editor_time_add">Add Schedule</string>
 	<string name="editor_time_delete">Delete Schedule</string>
 	<!-- Text for allday switch. -->
@@ -873,9 +864,6 @@
 	<string name="editor_correct_mistake">Correct mistake</string>
 	<string name="editor_correct_mistake_message">You made an editing mistake. Please correct it or switch to simple mode.</string>
 	<string name="migrate_title">Important!</string>
-	<!-- Used in 2 places: What's new and Delete All maps dialog. -->
-	<string name="migrate_and_split_mwms_message">We have divided maps into parts. Now you can download separate regions, not the whole country. Before you start downloading new maps, please remove the old ones.</string>
-	<string name="youve_been_asking">You\&#39;ve been asking for it and we\&#39;ve done it</string>
 	<!-- Android uses image instead of text. -->
 	<string name="download_all">Download all</string>
 	<string name="delete_all">Delete all</string>
@@ -943,6 +931,52 @@
 	<!-- login text field -->
 	<string name="email_or_username">Email or username</string>
 	<string name="phone">Phone</string>
-	<string name="whats_new_editor_caption">Edit the map directly from MAPS.ME</string>
-	<string name="whats_new_editor_message">Your changes will help millions of users. Let\&#39;s improve the world together!</string>
+	<string name="please_note">Please note</string>
+	<string name="common_no_wifi_dialog">No WiFi connection. Do you want to continue with mobile data?</string>
+	<string name="downloader_delete_map_dialog">All map edits will be deleted together with the map.</string>
+	<string name="downloader_update_maps">Update Maps</string>
+	<string name="downloader_mwm_migration_dialog">To create a route, you need to update all maps and then plan the route again.</string>
+	<string name="downloader_search_field_hint">Find the map</string>
+	<string name="migration_update_all_button">Update All Maps</string>
+	<string name="migration_delete_all_download_current_button">Download current map and delete the old ones</string>
+	<string name="migration_prefetch_status">Preparing maps update…</string>
+	<string name="migration_download_error_dialog">Download error</string>
+	<string name="common_check_internet_connection_dialog">Please check your settings and make sure your device is connected to the internet.</string>
+	<string name="downloader_no_space_title">Not enough space</string>
+	<string name="downloader_no_space_message">Please, remove unnecessary data</string>
+	<string name="editor_general_auth_error_dialog">General login error.</string>
+	<string name="editor_login_error_dialog">Login error.</string>
+	<string name="editor_login_failed_dialog">Login failed</string>
+	<string name="editor_username_error_dialog">Username is invalid</string>
+	<string name="editor_place_edited_dialog">You’ve edited an object!</string>
+	<string name="editor_login_with_osm">Login with OpenStreetMap</string>
+	<string name="editor_profile_changes">Edits:</string>
+	<string name="editor_profile_unsent_changes">Not sent</string>
+	<string name="editor_focus_map_on_location">Pull the map to select the correct location of the object.</string>
+	<string name="editor_add_select_category">Select category</string>
+	<string name="editor_add_select_category_popular_subtitle">Popular</string>
+	<string name="editor_add_select_category_all_subtitle">All Categories</string>
+	<string name="editor_edit_place_title">Editing</string>
+	<string name="editor_add_place_title">Adding</string>
+	<string name="editor_edit_place_name_hint">Name of the place</string>
+	<string name="editor_edit_place_category_title">Category</string>
+	<string name="placepage_add_place_button">Add a place</string>
+	<string name="placepage_report_problem_button">Report a problem</string>
+	<string name="whatsnew_smallmwm_header">You\&#39;ve been asking for it and we\&#39;ve done it</string>
+	<string name="whatsnew_smallmwm_message">We have divided maps into parts. Now you can download separate regions, not the whole country.</string>
+	<string name="whatsnew_search_header">New search!</string>
+	<string name="whatsnew_search_message">We have significantly improved the search by address. See for yourself.</string>
+	<string name="whatsnew_editor_title">Edit the map*</string>
+	<string name="whatsnew_editor_message_1">Add new places to the map, and edit existing ones directly from the app.</string>
+	<string name="whatsnew_editor_message_2">* MAPS.ME uses OpenStreetMap community data.</string>
+	<string name="onboarding_offline_navigation_title">You will never get lost again</string>
+	<string name="onboarding_offline_navigation_message">Plan optimal car and pedestrian routes, even if there is no internet connection!</string>
+	<string name="onboarding_offline_navigation_title_2">Offline navigation</string>
+	<string name="onboarding_offline_navigation_message_2">Plan optimal car and pedestrian routes.</string>
+	<string name="onboarding_offline_maps_title">MAPS.ME - offline maps</string>
+	<string name="onboarding_offline_maps_message">Download the maps for the desired area once, and use the navigation and search functions without an internet connection.</string>
+	<string name="onboarding_notifications_message">To receive the latest maps, get updates notifications</string>
+	<string name="onboarding_notifications_title">Enable updates notifications</string>
+	<string name="onboarding_location_title">Help us find you</string>
+	<string name="onboarding_location_message">To use navigation and other features, we need access to your geolocation.</string>
 </resources>
diff --git a/iphone/Maps/ar.lproj/Localizable.strings b/iphone/Maps/ar.lproj/Localizable.strings
index 078b92c170..923261707e 100644
--- a/iphone/Maps/ar.lproj/Localizable.strings
+++ b/iphone/Maps/ar.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "حذف";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "حذف الخرائط القديمة و المتابعة";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "لا تسئلني مرة أخرى";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "موقعي";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "لم يتم اكتشاف أي اتصال مع الانترنت";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "لم يتم العثور على أي اتصال واي فاي. هل ترغب باستخدام حزمة البيانات الخليوية (GPRS ، EDGE ، 3G أو LTE) من أجل تنزيل %@؟";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "ابحث في الخريطة";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "لا يوجد مساحة كافية على القرص";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "انقر للتنزيل";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "إصدار MAPS.ME الجديد يسمح بإنشاء مسارات انطلاقاً من موقعك الحالي نحو المكان الذي تتجه إليه. يرجى تحديث الخرائط لاستخدام هذه الميزة.";
 
 /* Update all button text */
-"downloader_update_all" = "تحديث الكل";
+"downloader_update_all_button" = "تحديث الكل";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "إلغاء الكل";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "المُنزَّلة";
+"downloader_downloaded_subtitle" = "تم تنزيلها";
 
 /* Country queued for download */
 "downloader_queued" = "مَصْفوف";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "بالقرب مني";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "الخرائط: %s";
+
+"downloader_download_all_button" = "تنزيل الكل";
 
 /* Disclaimer message */
 "routing_disclaimer" = "عند إنشاء مسارات الطرق في تطبيق MAPS.ME، يرجى أخذ التالي في الحسبان:\n\n  - المسارات المقترحة تعتبر مجرد اقتراحات فقط.\n - حالة الطريق وقوانينه والإشارات الموجودة فيه لها الأولولية أثناء تقديم نصائح الملاحة.\n - قد تكون الخريطة خاطئة أو قديمة، لذا فإنه يمكن ألا تُرسم المسارات بالشكل الأمثل.\n\n  كن آمنا على الطريق وانتبه لتفسك!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "الخريطة + تحديد المسار";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "حذف الخريطة";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "التالي";
 
-"whats_new_night_caption" = "وضع التجول الليلي";
-
-"whats_new_night_body" = "لتسهيل استخدام MAPS.ME أثناء القيادة في الظلام، فقد أضفنا وضع التجول الليلي. إنه يعمل تلقائيا بعد غروب الشمس.";
-
 "editor_time_add" = "إضافة جدول";
 
 "editor_time_delete" = "حذف جدول";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "هام!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "لقد قسمنا الخرائط إلى أجزاء. الآن يمكنك تنزيل مناطق منفصلة، وليس البلد بأكمله. قبل البدء في تنزيل الخرائط الجديدة، يرجى إزالة النسخ القديمة.";
-
-"youve_been_asking" = "لقد طلبتم ذلك، وها نحن قد لبينا طلبكم";
-
 /* Android uses image instead of text. */
 "download_all" = "تنزيل الكل";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "الهاتف";
 
-"whats_new_editor_caption" = "حرر خريطتك على MAPS.ME";
+"please_note" = "يرجى العلم أنه،";
 
-"whats_new_editor_message" = "تغييراتك سوف تساعد الملايين من المستخدمين. هيا نطور من العالم سويا!";
+"common_no_wifi_dialog" = "لا يوجد اتصال واي فاي. هل ترغب في استخدام بيانات الهاتف للاتصال؟";
+
+"downloader_delete_map_dialog" = "سيتم حذف جميع التغييرات بالخريطة بالإضافة إلى حذف الخريطة نفسها.";
+
+"downloader_update_maps" = "تحديث الخرائط";
+
+"downloader_mwm_migration_dialog" = "لإنشاء مسار، فأنت تحتاج إلى تحديث كافة الخرائط ثم إعادة تخطيط المسار مرة أخرى.";
+
+"downloader_search_field_hint" = "اعثر على الخريطة";
+
+"migration_update_all_button" = "تحديث جميع الخرائط";
+
+"migration_delete_all_download_current_button" = "تنزيل الخريطة الحالية وحذف الخرائط القديمة";
+
+"migration_prefetch_status" = "جار الإعداد لتحديث الخرائط…";
+
+"migration_download_error_dialog" = "خطأ بالتنزيل";
+
+"common_check_internet_connection_dialog" = "يرجى التحقق من الإعدادات والتأكد من اتصال جهازك بالإنترنت.";
+
+"downloader_no_space_title" = "مساحة غير كافية";
+
+"downloader_no_space_message" = "من فضلك، قم بإزالة البيانات غير الضرورية";
+
+"editor_general_auth_error_dialog" = "خطأ بتسجيل الدخول العام.";
+
+"editor_login_error_dialog" = "خطأ في تسجيل الدخول.";
+
+"editor_login_failed_dialog" = "فشل تسجيل الدخول";
+
+"editor_username_error_dialog" = "اسم المستخدم غير صحيح";
+
+"editor_place_edited_dialog" = "لقد قمت بتعديل هدف!";
+
+"editor_login_with_osm" = "تسجيل الدخول عبر OpenStreetMap";
+
+"editor_profile_changes" = "التغيرات:";
+
+"editor_profile_unsent_changes" = "لم ترسل";
+
+"editor_focus_map_on_location" = "اسحب الخريطة لتحدد الموقع الصحيح للهدف.";
+
+"editor_add_select_category" = "اختر الفئة";
+
+"editor_add_select_category_popular_subtitle" = "شائع";
+
+"editor_add_select_category_all_subtitle" = "جميع الفئات";
+
+"editor_edit_place_title" = "تعديل";
+
+"editor_add_place_title" = "إٍضافة";
+
+"editor_edit_place_name_hint" = "اسم المكان";
+
+"editor_edit_place_category_title" = "الفئة";
+
+"placepage_add_place_button" = "إضافة مكان";
+
+"placepage_report_problem_button" = "الإبلاغ عن مشكلة";
+
+"whatsnew_smallmwm_header" = "لقد طلبتم ذلك، وها نحن قد لبينا طلبكم";
+
+"whatsnew_smallmwm_message" = "لقد قسمنا الخرائط إلى أجزاء. الآن يمكنك تنزيل مناطق منفصلة، وليس البلد بأكمله.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "لقد طورنا كليا البحث بالعنوان. فلترى بنفسك.";
+
+"whatsnew_editor_title" = "تعديل الخريطة *";
+
+"whatsnew_editor_message_1" = "قم بإضافة أماكن جديدة للخريطة، وعدل أماكن حالية مباشرة من التطبيق.";
+
+"whatsnew_editor_message_2" = "*تستخدم MAPS.ME البيانات الخاصة بخريطة OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "لن تضل الطريق أبدا بعد الآن";
+
+"onboarding_offline_navigation_message" = "قم بتخطيط أفضل طرق السيارات والمشاة، حتى مع عدم وجود اتصال بالإنترنت!";
+
+"onboarding_offline_navigation_title_2" = "الملاحة في وضع غير متصل";
+
+"onboarding_offline_navigation_message_2" = "خطط أفضل طرق السيارات والمشاة.";
+
+"onboarding_offline_maps_title" = "MAPS.ME – خرائط غير متصلة بالإنترنت";
+
+"onboarding_offline_maps_message" = "قم بتنزيل خرائط للمنطقة المطلوب مرة واحدة، واستخدم وظائف الملاحة والبحث دون الحاجة للاتصال بالإنترنت.";
+
+"onboarding_notifications_message" = "تابع إخطارات التحديث للحصول على أحدث الخرائط";
+
+"onboarding_notifications_title" = "تفعيل إخطارات التحديث";
+
+"onboarding_location_title" = "ساعدنا في العثور عليك";
+
+"onboarding_location_message" = "لاستخدام الملاحة والميزات الأخرى، فنحن بحاجة إلى تحديد موقعك الجغرافي.";
diff --git a/iphone/Maps/cs.lproj/Localizable.strings b/iphone/Maps/cs.lproj/Localizable.strings
index af406df24b..3fc1d4affc 100644
--- a/iphone/Maps/cs.lproj/Localizable.strings
+++ b/iphone/Maps/cs.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Smazat";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Smazat staré mapy a pokračovat";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Už se neptat";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Moje poloha";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Připojení k Internetu nenalezeno";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Připojení k WiFi nenalezeno. Chcete použít mobilní sítě (GPRS, EDGE, 3G nebo LTE) pro stažení %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Prohledat mapu";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Nedostatek volného úložného prostoru";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Klepněte pro stažení";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Nová verze MAPS.ME umožňuje vytvářet trasy z vaší aktuální polohy do cílového bodu. Chcete-li tuto funkci používat, aktualizujte mapy.";
 
 /* Update all button text */
-"downloader_update_all" = "Aktualizovat vše";
+"downloader_update_all_button" = "Aktualizovat vše";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Zrušit vše";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Stažené";
+"downloader_downloaded_subtitle" = "Staženo";
 
 /* Country queued for download */
 "downloader_queued" = "ve frontě";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Poblíž mě";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mapy: %s";
+
+"downloader_download_all_button" = "Stáhnout vše";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Při vytváření tras v aplikaci MAPS.ME mějte, prosím, na paměti následující:\n\n • Navrhované trasy lze brát jen jako doporučení.\n • Pravidla silničního provozu, aktuální podmínky na silnici a dopravní značení mají přednost před údaji z navigace.\n • Mapa může být nepřesná nebo zastaralá a navržené cesty nemusí být ideální.\n\nCestujte bezpečně a ohleduplně. Šťastnou cestu!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mapa + trasy";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Smazat mapu";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Další";
 
-"whats_new_night_caption" = "Navigace v nočním režimu";
-
-"whats_new_night_body" = "Přidali jsme noční režim, abyste mohli MAPS.ME používat při řízení v noci. Zapíná se automaticky po západu slunce.";
-
 "editor_time_add" = "Přidat rozvrh";
 
 "editor_time_delete" = "Smazat rozvrh";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Důležité!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Rozdělili jsme mapy na části. Nyní si můžete stáhnout jednotlivé regiony namísto celé země. Než začnete stahovat nové mapy, prosím, odstraňte ty staré.";
-
-"youve_been_asking" = "Říkali jste si o to, a my to udělali";
-
 /* Android uses image instead of text. */
 "download_all" = "Stáhnout vše";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Upravujte mapu přímo z MAPS.ME";
+"please_note" = "Vezměte prosím na vědomí";
 
-"whats_new_editor_message" = "Vaše změny pomůžou miliónům uživatelů. Pojďme společně vylepšit svět!";
+"common_no_wifi_dialog" = "Žádné Wi-Fi připojení. Chcete pokračovat s mobilními daty?";
+
+"downloader_delete_map_dialog" = "Zároveň s touto mapou budou odstraněny také všechny změny na této mapě.";
+
+"downloader_update_maps" = "Aktualizujte mapy";
+
+"downloader_mwm_migration_dialog" = "Chcete-li vytvořit trasu, pak musíte aktualizovat všechny mapy a poté trasu naplánovat znovu.";
+
+"downloader_search_field_hint" = "Najít mapu";
+
+"migration_update_all_button" = "Aktualizovat všechny mapy";
+
+"migration_delete_all_download_current_button" = "Stáhněte si aktuální mapu a odstraňte staré";
+
+"migration_prefetch_status" = "Probíhá příprava na aktualizace map…";
+
+"migration_download_error_dialog" = "Chyba při stahování";
+
+"common_check_internet_connection_dialog" = "Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu.";
+
+"downloader_no_space_title" = "Nedostatek místa";
+
+"downloader_no_space_message" = "Odstraňte prosím nepotřebná data";
+
+"editor_general_auth_error_dialog" = "Obecná chyba při přihlašování.";
+
+"editor_login_error_dialog" = "Chyba při přihlašování.";
+
+"editor_login_failed_dialog" = "Přihlašování selhalo";
+
+"editor_username_error_dialog" = "Uživatelské jméno není platné";
+
+"editor_place_edited_dialog" = "Upravili jste objekt!";
+
+"editor_login_with_osm" = "Přihlásit se pomocí OpenStreetMap";
+
+"editor_profile_changes" = "Změny:";
+
+"editor_profile_unsent_changes" = "Neodesláno";
+
+"editor_focus_map_on_location" = "Táhněte mapu, abyste vybrali správné umístění objektu.";
+
+"editor_add_select_category" = "Vyberte kategorii";
+
+"editor_add_select_category_popular_subtitle" = "Populární";
+
+"editor_add_select_category_all_subtitle" = "Všechny kategorie";
+
+"editor_edit_place_title" = "Probíhají úpravy";
+
+"editor_add_place_title" = "Probíhá přidávání";
+
+"editor_edit_place_name_hint" = "Název místa";
+
+"editor_edit_place_category_title" = "Kategorie";
+
+"placepage_add_place_button" = "Přidat místo";
+
+"placepage_report_problem_button" = "Nahlásit problém";
+
+"whatsnew_smallmwm_header" = "Říkali jste si o to, a my to udělali";
+
+"whatsnew_smallmwm_message" = "Rozdělili jsme mapy na části. Nyní si můžete stáhnout jednotlivé regiony namísto celé země.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Výrazně jsme vylepšili vyhledávání podle adresy. Podívejte se sami.";
+
+"whatsnew_editor_title" = "Upravit mapu*";
+
+"whatsnew_editor_message_1" = "Přidejte na mapu nová místa a upravte existující místa přímo z aplikace.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME používá komunitní data OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Již nikdy nezabloudíte";
+
+"onboarding_offline_navigation_message" = "Naplánujte si optimální trasy pro auto nebo pěší chůzi, i když tam nebude připojení k internetu!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigace";
+
+"onboarding_offline_navigation_message_2" = "Naplánujte si optimální trasy pro auto nebo pěší chůzi.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline mapy";
+
+"onboarding_offline_maps_message" = "Stáhněte si jednou mapy požadované oblasti a poté používejte navigaci a vyhledávací funkce bez připojení k internetu.";
+
+"onboarding_notifications_message" = "Chcete-li získat nejnovější mapy, pak zapněte upozornění na aktualizace";
+
+"onboarding_notifications_title" = "Povolit upozornění na aktualizace";
+
+"onboarding_location_title" = "Pomozte nám vás najít";
+
+"onboarding_location_message" = "Chcete-li používat navigaci a další funkce, pak potřebujeme přístup k vaší zeměpisné poloze.";
diff --git a/iphone/Maps/da.lproj/Localizable.strings b/iphone/Maps/da.lproj/Localizable.strings
index 34c2fe4d9e..ef3b08580f 100644
--- a/iphone/Maps/da.lproj/Localizable.strings
+++ b/iphone/Maps/da.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Slet";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Slet gamle kort og gå videre";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Spørg mig ikke igen";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Min position";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Ingen internetforbindelse registreret";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Ingen WiFi forbindelse registreret. Vil du bruge mobildata (GPRS, EDGE, 3G eller LTE) til download %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Søg kort";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Der er ikke nok ledig plads på telefonen";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Tryk for at downloade";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Den nye version af MAPS.ME gør det muligt at oprette ruter fra din nuværende position til et destinationspunkt. Venligst opdatér kortene for at bruge denne funktion.";
 
 /* Update all button text */
-"downloader_update_all" = "Opdater alle";
+"downloader_update_all_button" = "Opdatér alle";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Aflys Alt";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Downloadede";
+"downloader_downloaded_subtitle" = "Downloadet";
 
 /* Country queued for download */
 "downloader_queued" = "i kø";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "I nærheden";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Kort: %s";
+
+"downloader_download_all_button" = "Download alle";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Kort og rutevejledning";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Slet kort";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Næste";
 
-"whats_new_night_caption" = "Navigering i nattilstand";
-
-"whats_new_night_body" = "For at hjælpe med brugen af MAPS.ME ved kørsel om natten har vi tilføjet nattilstand. Den slår automatisk til efter solnedgang.";
-
 "editor_time_add" = "Tilføj tidsplan";
 
 "editor_time_delete" = "Slet tidsplan";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Vigtigt!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Vi har delt kort op i dele. Nu kan man downloade separate regioner, ikke hele landet. Før du begynder på at downloade nye kort, så venligst fjern de gamle.";
-
-"youve_been_asking" = "I har bedt om det, og vi har gjort det";
-
 /* Android uses image instead of text. */
 "download_all" = "Download alle";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Redigér kortet direkte fra MAPS.ME";
+"please_note" = "Bemærk venligst";
 
-"whats_new_editor_message" = "Dine ændringer vil hjælpe millioner af brugere. Lad os forbedre verden sammen!";
+"common_no_wifi_dialog" = "Ingen WiFi-forbindelse. Vil du fortsætte med mobildata?";
+
+"downloader_delete_map_dialog" = "Alle kortændringer vil blive slettet sammen med kortet.";
+
+"downloader_update_maps" = "Opdatér kort";
+
+"downloader_mwm_migration_dialog" = "For at oprette en rute skal du opdatere alle kort og så planlægge ruten igen.";
+
+"downloader_search_field_hint" = "Find kortet";
+
+"migration_update_all_button" = "Opdatér alle kort";
+
+"migration_delete_all_download_current_button" = "Download aktuelt kort og slet de gamle";
+
+"migration_prefetch_status" = "Forbereder kortopdatering…";
+
+"migration_download_error_dialog" = "Fejl ved download";
+
+"common_check_internet_connection_dialog" = "Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet.";
+
+"downloader_no_space_title" = "Ikke nok plads";
+
+"downloader_no_space_message" = "Fjern unødvendig data";
+
+"editor_general_auth_error_dialog" = "Generel fejl ved login.";
+
+"editor_login_error_dialog" = "Login-fejl.";
+
+"editor_login_failed_dialog" = "Login mislykkedes";
+
+"editor_username_error_dialog" = "Ugyldigt brugernavn";
+
+"editor_place_edited_dialog" = "Du har redigeret et objekt!";
+
+"editor_login_with_osm" = "Login med OpenStreetMap";
+
+"editor_profile_changes" = "Ændringer:";
+
+"editor_profile_unsent_changes" = "Ikke sendt";
+
+"editor_focus_map_on_location" = "Træk kortet for at vælge objektets korrekte placering.";
+
+"editor_add_select_category" = "Vælg kategori";
+
+"editor_add_select_category_popular_subtitle" = "Populær";
+
+"editor_add_select_category_all_subtitle" = "Alle kategorier";
+
+"editor_edit_place_title" = "Redigerer";
+
+"editor_add_place_title" = "Tilføjer";
+
+"editor_edit_place_name_hint" = "Stedets navn";
+
+"editor_edit_place_category_title" = "Kategori";
+
+"placepage_add_place_button" = "Tilføj et sted";
+
+"placepage_report_problem_button" = "Anmeld et problem";
+
+"whatsnew_smallmwm_header" = "I har bedt om det, og vi har gjort det";
+
+"whatsnew_smallmwm_message" = "Vi har delt kort op i dele. Nu kan man downloade separate regioner, ikke hele landet.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Vi har forbedret søgningen efter adresse betydeligt. Se selv.";
+
+"whatsnew_editor_title" = "Redigér kortet*";
+
+"whatsnew_editor_message_1" = "Tilføj nye steder til kortet og redigér eksisterende direkte fra app'en.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME bruger fællesskabsdata fra OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Du vil aldrig fare vild igen";
+
+"onboarding_offline_navigation_message" = "Planlæg de optimale ruter i bil og til fods selv uden internetforbindelse!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigering";
+
+"onboarding_offline_navigation_message_2" = "Planlæg de optimale ruter i bil og til fods.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline kort";
+
+"onboarding_offline_maps_message" = "Download kortene til det ønskede område en gang, og brug navigerings- og søgefunktionerne uden internetforbindelse.";
+
+"onboarding_notifications_message" = "For at modtage de nyeste kort kan du få opdateringsnotifikationer";
+
+"onboarding_notifications_title" = "Aktivér opdateringsnotifikationer";
+
+"onboarding_location_title" = "Hjælp os med at finde dig";
+
+"onboarding_location_message" = "For at bruge navigering og andre funktioner skal vi have adgang til din geolokation.";
diff --git a/iphone/Maps/de.lproj/Localizable.strings b/iphone/Maps/de.lproj/Localizable.strings
index 9703d6d9c6..c1e9dc6d21 100644
--- a/iphone/Maps/de.lproj/Localizable.strings
+++ b/iphone/Maps/de.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Löschen";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Alte Karten löschen und fortsetzen";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Nicht mehr fragen";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Mein Standort";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Keine Internetverbindung";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Keine WLAN-Verbindung. Möchten Sie %@ über das Mobilnetz (GPRS, EDGE, 3G oder LTE) herunterladen?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Auf der Karte suchen";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Speicherplatz reicht nicht aus";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Antippen, um herunterzuladen";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Die neue Version von MAPS.ME ermöglicht das Erzeugen von Routen von Ihrem aktuellen Standort bis zum gewünschten Ziel. Bitte aktualisieren Sie Karten, um diese Funktion nutzen zu können.";
 
 /* Update all button text */
-"downloader_update_all" = "Alles aktualisieren";
+"downloader_update_all_button" = "Alle aktualisieren";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Alle abbrechen";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Heruntergeladen";
+"downloader_downloaded_subtitle" = "Heruntergeladen";
 
 /* Country queued for download */
 "downloader_queued" = "in der Warteschlange";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "In meiner Nähe";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Karten: %s";
+
+"downloader_download_all_button" = "Alle herunterladen";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Beim Erstellen von Routen mit der MAPS.ME-App sollten Sie Folgendes beachten:\n\n  - Vorgeschlagenen Routen können nur als Empfehlungen angesehen werden.\n - Straßenbedingungen, Verkehrsregeln und Schilder haben höhere Priorität als Navigationsratschläge.\n - Die Karte kann falsch oder veraltet sein und Routen könnten somit nicht auf die bestmögliche Weise erstellt worden sein.\n\n  Bleiben Sie auf der Straße sicher und achten Sie auf sich selbst!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Karte + Routenplanung";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Karte löschen";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Weiter";
 
-"whats_new_night_caption" = "Nachtmodus-Navigation";
-
-"whats_new_night_body" = "Um die Nutzung von MAPS.ME beim Fahren im Dunkeln zu erleichtern, haben wir den Nachtmodus hinzugefügt. Dieser wird automatisch nach Sonnenuntergang aktiviert.";
-
 "editor_time_add" = "Zeitplan hinzufügen";
 
 "editor_time_delete" = "Zeitplan löschen";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Wichtig!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Wir haben die Karten aufgeteilt. Jetzt können Sie einzelne Regionen herunterladen, ohne das ganze Land herunterzuladen. Bevor Sie damit beginnen, neue Karten herunterzuladen, löschen Sie bitte Ihre alten Karten.";
-
-"youve_been_asking" = "Sie haben darum gebeten, und wir haben es geschafft";
-
 /* Android uses image instead of text. */
 "download_all" = "Alle herunterladen";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Bearbeiten der Karte direkt in MAPS.ME";
+"please_note" = "Bitte beachten";
 
-"whats_new_editor_message" = "Ihre Veränderungen werden Millionen von Benutzern helfen. Lasst uns zusammen die Welt verbessern!";
+"common_no_wifi_dialog" = "Keine WLAN-Verbindung. Möchten Sie mit mobilen Daten fortfahren?";
+
+"downloader_delete_map_dialog" = "Alle Kartenänderungen werden zusammen mit der Karte gelöscht.";
+
+"downloader_update_maps" = "Karten aktualisieren";
+
+"downloader_mwm_migration_dialog" = "Um eine Strecke zu erstellen, müssen Sie alle Karten aktualisieren und dann die Strecken erneut planen.";
+
+"downloader_search_field_hint" = "Karte finden";
+
+"migration_update_all_button" = "Alle Karten aktualisieren";
+
+"migration_delete_all_download_current_button" = "Laden Sie die aktuelle Karte herunter und löschen Sie alte Karten";
+
+"migration_prefetch_status" = "Karten-Update wird vorbereitet …";
+
+"migration_download_error_dialog" = "Download-Fehler";
+
+"common_check_internet_connection_dialog" = "Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass Ihr Gerät mit dem Internet verbunden ist.";
+
+"downloader_no_space_title" = "Nicht genügend Platz";
+
+"downloader_no_space_message" = "Bitte entfernen Sie unnötige Daten";
+
+"editor_general_auth_error_dialog" = "Allgemeiner Login-Fehler.";
+
+"editor_login_error_dialog" = "Login-Fehler.";
+
+"editor_login_failed_dialog" = "Login fehlgeschlagen";
+
+"editor_username_error_dialog" = "Benutzername ist ungültig";
+
+"editor_place_edited_dialog" = "Sie haben ein Objekt bearbeitet!";
+
+"editor_login_with_osm" = "Mit OpenStreetMap anmelden";
+
+"editor_profile_changes" = "Änderungen:";
+
+"editor_profile_unsent_changes" = "Nicht gesendet";
+
+"editor_focus_map_on_location" = "Ziehen Sie die Karte, um den Standort des Objektes zu korrigieren.";
+
+"editor_add_select_category" = "Kategorie auswählen";
+
+"editor_add_select_category_popular_subtitle" = "Beliebt";
+
+"editor_add_select_category_all_subtitle" = "Alle Kategorien";
+
+"editor_edit_place_title" = "Wird bearbeitet";
+
+"editor_add_place_title" = "Wird hinzugefügt";
+
+"editor_edit_place_name_hint" = "Name des Orts";
+
+"editor_edit_place_category_title" = "Kategorie";
+
+"placepage_add_place_button" = "Einen Ort hinzufügen";
+
+"placepage_report_problem_button" = "Problem melden";
+
+"whatsnew_smallmwm_header" = "Sie haben darum gebeten, und wir haben es geschafft";
+
+"whatsnew_smallmwm_message" = "Wir haben die Karten aufgeteilt. Jetzt können Sie einzelne Regionen herunterladen, ohne das ganze Land herunterzuladen.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Wir haben die Adresssuche dramatisch verbessert. Sehen Sie selbst.";
+
+"whatsnew_editor_title" = "Karte bearbeiten*";
+
+"whatsnew_editor_message_1" = "Fügen Sie auf der Karte einen neuen Ort hinzu und bearbeiten Sie existierende Ort direkt in der App.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME verwendet Community-Daten von OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Sie werden sich nie wieder verfahren oder verlaufen";
+
+"onboarding_offline_navigation_message" = "Planen Sie die optimalen Auto- und Fußgängerstrecken, selbst wenn es keine Internetverbindung gibt!";
+
+"onboarding_offline_navigation_title_2" = "Offline-Navigation";
+
+"onboarding_offline_navigation_message_2" = "Planen Sie optimale Auto- und Fußgängerstrecken.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - Offline-Karten";
+
+"onboarding_offline_maps_message" = "Laden Sie die Karten für das gewünschte Gebiet auf einmal herunter und verwenden Sie die Navigation- und Such-Funktion ohne eine Internetverbindung.";
+
+"onboarding_notifications_message" = "Um die neuesten Karten zu erhalten, aktivieren Sie bitte die Update-Benachrichtigungen";
+
+"onboarding_notifications_title" = "Update-Benachrichtigungen aktualisieren";
+
+"onboarding_location_title" = "Helfen Sie uns dabei, Sie zu finden";
+
+"onboarding_location_message" = "Um Navigation und andere Funktionen zu verwenden, brauchen wir Zugriff auf Ihren Geo-Standort.";
diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings
index a930139fea..921ab56740 100644
--- a/iphone/Maps/en.lproj/Localizable.strings
+++ b/iphone/Maps/en.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Delete";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Delete old maps and proceed";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Do not ask me again";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "My Position";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "No Internet connection detected";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "No WiFi connection detected. Would you like to use cellular data (GPRS, EDGE, 3G or LTE) to download %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Search Map";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "There is not enough free disk space";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Touch to download";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "The new version of MAPS.ME allows creating routes from your current position to a destination point. Please update maps to use this feature.";
 
 /* Update all button text */
-"downloader_update_all" = "Update all";
+"downloader_update_all_button" = "Update All";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Cancel All";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Downloaded";
+"downloader_downloaded_subtitle" = "Downloaded";
 
 /* Country queued for download */
 "downloader_queued" = "queued";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Near me";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Maps: %s";
+
+"downloader_download_all_button" = "Download All";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Creating routes in MAPS.ME app, please keep in mind the following:\n\n  - Suggested routes can be considered as recommendations only.\n - Road conditions, traffic rules and signs have higher priority than navigation advice.\n - The map may be incorrect or outdated, and routes may not be created the best possible way.\n\n  Be safe on roads and take care of yourself!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Map + Routing";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Delete Map";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Next";
 
-"whats_new_night_caption" = "Night Mode Navigation";
-
-"whats_new_night_body" = "To facilitate using MAPS.ME when driving in the dark, we have added night mode. It switches on automatically after sunset.";
-
 "editor_time_add" = "Add Schedule";
 
 "editor_time_delete" = "Delete Schedule";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Important!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "We have divided maps into parts. Now you can download separate regions, not the whole country. Before you start downloading new maps, please remove the old ones.";
-
-"youve_been_asking" = "You've been asking for it and we've done it";
-
 /* Android uses image instead of text. */
 "download_all" = "Download all";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Phone";
 
-"whats_new_editor_caption" = "Edit the map directly from MAPS.ME";
+"please_note" = "Please note";
 
-"whats_new_editor_message" = "Your changes will help millions of users. Let's improve the world together!";
+"common_no_wifi_dialog" = "No WiFi connection. Do you want to continue with mobile data?";
+
+"downloader_delete_map_dialog" = "All map edits will be deleted together with the map.";
+
+"downloader_update_maps" = "Update Maps";
+
+"downloader_mwm_migration_dialog" = "To create a route, you need to update all maps and then plan the route again.";
+
+"downloader_search_field_hint" = "Find the map";
+
+"migration_update_all_button" = "Update All Maps";
+
+"migration_delete_all_download_current_button" = "Download current map and delete the old ones";
+
+"migration_prefetch_status" = "Preparing maps update…";
+
+"migration_download_error_dialog" = "Download error";
+
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the internet.";
+
+"downloader_no_space_title" = "Not enough space";
+
+"downloader_no_space_message" = "Please, remove unnecessary data";
+
+"editor_general_auth_error_dialog" = "General login error.";
+
+"editor_login_error_dialog" = "Login error.";
+
+"editor_login_failed_dialog" = "Login failed";
+
+"editor_username_error_dialog" = "Username is invalid";
+
+"editor_place_edited_dialog" = "You’ve edited an object!";
+
+"editor_login_with_osm" = "Login with OpenStreetMap";
+
+"editor_profile_changes" = "Edits:";
+
+"editor_profile_unsent_changes" = "Not sent";
+
+"editor_focus_map_on_location" = "Pull the map to select the correct location of the object.";
+
+"editor_add_select_category" = "Select category";
+
+"editor_add_select_category_popular_subtitle" = "Popular";
+
+"editor_add_select_category_all_subtitle" = "All Categories";
+
+"editor_edit_place_title" = "Editing";
+
+"editor_add_place_title" = "Adding";
+
+"editor_edit_place_name_hint" = "Name of the place";
+
+"editor_edit_place_category_title" = "Category";
+
+"placepage_add_place_button" = "Add a place";
+
+"placepage_report_problem_button" = "Report a problem";
+
+"whatsnew_smallmwm_header" = "You've been asking for it and we've done it";
+
+"whatsnew_smallmwm_message" = "We have divided maps into parts. Now you can download separate regions, not the whole country.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "We have significantly improved the search by address. See for yourself.";
+
+"whatsnew_editor_title" = "Edit the map*";
+
+"whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME uses OpenStreetMap community data.";
+
+"onboarding_offline_navigation_title" = "You will never get lost again";
+
+"onboarding_offline_navigation_message" = "Plan optimal car and pedestrian routes, even if there is no internet connection!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigation";
+
+"onboarding_offline_navigation_message_2" = "Plan optimal car and pedestrian routes.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline maps";
+
+"onboarding_offline_maps_message" = "Download the maps for the desired area once, and use the navigation and search functions without an internet connection.";
+
+"onboarding_notifications_message" = "To receive the latest maps, get updates notifications";
+
+"onboarding_notifications_title" = "Enable updates notifications";
+
+"onboarding_location_title" = "Help us find you";
+
+"onboarding_location_message" = "To use navigation and other features, we need access to your geolocation.";
diff --git a/iphone/Maps/es.lproj/Localizable.strings b/iphone/Maps/es.lproj/Localizable.strings
index 2d75ff9d1a..2962d48258 100644
--- a/iphone/Maps/es.lproj/Localizable.strings
+++ b/iphone/Maps/es.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Eliminar";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Eliminar mapas antiguos y seguir";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "No volver a preguntar";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Mi posición";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "No hay conexión al Internet";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "No hay conexión Wifi. ¿Quieres descargar el mapa con tu plan de datos móviles?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Buscar en el mapa";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "No hay suficiente espacio libre";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Presionar para descargar";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "La nueva versión de MAPS.ME permite crear rutas desde tu ubicación actual hasta un punto de destino. Por favor, actualiza los mapas para utilizar esta característica.";
 
 /* Update all button text */
-"downloader_update_all" = "Actualizar todos";
+"downloader_update_all_button" = "Actualizar todos";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Cancelar todo";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Descargados";
+"downloader_downloaded_subtitle" = "Descargado";
 
 /* Country queued for download */
 "downloader_queued" = "En cola";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Cerca de mí";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mapas: %s";
+
+"downloader_download_all_button" = "Descarar todos";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Creando rutas en la aplicación MAPS.ME, por favor, tenga en cuenta lo siguiente:\n\n  - Las rutas sugeridas se pueden considerar únicamente como recomendaciones.\n - Las condiciones de la carretera, las normas y las señales de tráfico tienen mayor prioridad que el consejo de navegación.\n - El mapa podría ser incorrecto o estar obsoleto y las rutas pueden no crear el mejor camino posible.\n\n  ¡Esté seguro en las carreteras y cuídese!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mapa + itinerario";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Eliminar mapa";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Siguiente";
 
-"whats_new_night_caption" = "Navegación en modo nocturno";
-
-"whats_new_night_body" = "Para facilitar el uso de MAPS.ME al conducir en la oscuridad, hemos añadido el modo nocturno. Este se activa automáticamente tras el atardecer.";
-
 "editor_time_add" = "Añadir horario";
 
 "editor_time_delete" = "Eliminar horario";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "¡Importante!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Hemos dividido el mapa por partes. Ahora, puedes descargar regiones individuales, en vez de el país entero. Antes de empezar a descargar mapas nuevos, por favor, elimina los anteriores.";
-
-"youve_been_asking" = "Llevas tiempo pidiéndolo y lo hemos hecho";
-
 /* Android uses image instead of text. */
 "download_all" = "Descargar todos";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Teléfono";
 
-"whats_new_editor_caption" = "Edita el mapa directamente desde MAPS.ME";
+"please_note" = "Aviso";
 
-"whats_new_editor_message" = "Tus cambios ayudarán a millones de usuarios. ¡Vamos a mejorar juntos el mundo!";
+"common_no_wifi_dialog" = "No hay conexión Wi-Fi. ¿Quieres continuar con los datos móviles?";
+
+"downloader_delete_map_dialog" = "Todos los cambios en los mapas se borrarán junto con el mapa.";
+
+"downloader_update_maps" = "Autodescarga de mapas";
+
+"downloader_mwm_migration_dialog" = "Los mapas empiezan a descargarse automáticamente cuando te aproximas al mapa.";
+
+"downloader_search_field_hint" = "Encontrar el mapa";
+
+"migration_update_all_button" = "Actualizar todos los mapas";
+
+"migration_delete_all_download_current_button" = "Descargar el mapa actual y eliminar los mapas antiguos";
+
+"migration_prefetch_status" = "Preparando la actualización de mapas…";
+
+"migration_download_error_dialog" = "Error de descarga";
+
+"common_check_internet_connection_dialog" = "Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet.";
+
+"downloader_no_space_title" = "Sin espacio suficiente";
+
+"downloader_no_space_message" = "Por favor, elimina los datos innecesarios";
+
+"editor_general_auth_error_dialog" = "Error general de inicio de sesión.";
+
+"editor_login_error_dialog" = "Error de inicio de sesión.";
+
+"editor_login_failed_dialog" = "Error al iniciar sesión";
+
+"editor_username_error_dialog" = "Usuario no válido";
+
+"editor_place_edited_dialog" = "¡Has editado un objeto!";
+
+"editor_login_with_osm" = "Iniciar sesión con OpenStreetMap";
+
+"editor_profile_changes" = "Cambios:";
+
+"editor_profile_unsent_changes" = "No enviado";
+
+"editor_focus_map_on_location" = "Arrastra el mapa para seleccionar la ubicación correcta del objeto.";
+
+"editor_add_select_category" = "Seleccionar categoría";
+
+"editor_add_select_category_popular_subtitle" = "Popular";
+
+"editor_add_select_category_all_subtitle" = "Todas las categorías";
+
+"editor_edit_place_title" = "Editar";
+
+"editor_add_place_title" = "Añadir";
+
+"editor_edit_place_name_hint" = "Nombre del lugar";
+
+"editor_edit_place_category_title" = "Categoría";
+
+"placepage_add_place_button" = "Añadir un lugar";
+
+"placepage_report_problem_button" = "Informar de un problema";
+
+"whatsnew_smallmwm_header" = "Llevas tiempo pidiéndolo y lo hemos hecho";
+
+"whatsnew_smallmwm_message" = "Hemos dividido el mapa por partes. Ahora, puedes descargar regiones individuales, en vez de el país entero.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Hemos mejorado notablemente la búsqueda por dirección. Compruébalo.";
+
+"whatsnew_editor_title" = "Editar el mapa*";
+
+"whatsnew_editor_message_1" = "Añadir lugares nuevos al mapa y editar los lugares actuales directamente desde la aplicación.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME utiliza datos de la comunidad de OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Nunca volverás a perderte";
+
+"onboarding_offline_navigation_message" = "Planifica rutas óptimas en coche y a pie, ¡incluso si no hay conexión a Internet!";
+
+"onboarding_offline_navigation_title_2" = "Navegación fuera de línea";
+
+"onboarding_offline_navigation_message_2" = "Planifica rutas óptimas en coche y a pie.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - mapas sin conexión";
+
+"onboarding_offline_maps_message" = "Descarga una vez los mapas para el área deseada, y utiliza las funciones de navegación y búsqueda sin conexión a Internet.";
+
+"onboarding_notifications_message" = "Para recibir los mapas más recientes, obtén las notificaciones de actualización";
+
+"onboarding_notifications_title" = "Permitir notificaciones de actualización";
+
+"onboarding_location_title" = "Ayúdanos a encontrarte";
+
+"onboarding_location_message" = "Para utilizar la navegación y otras funciones, necesitamos acceso a tu geolocalización.";
diff --git a/iphone/Maps/fi.lproj/Localizable.strings b/iphone/Maps/fi.lproj/Localizable.strings
index 980914b81d..0c7a886eb8 100644
--- a/iphone/Maps/fi.lproj/Localizable.strings
+++ b/iphone/Maps/fi.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Poista";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Poista vanhat kartat ja jatka";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Älä kysy uudelleen";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Sijaintini";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Internet-yhteyttä ei havaittu";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "WiFi-yhteyttä ei havaittu. Haluatko käyttää mobiilidataa (GPRS, EDGE, 3G tai LTE) ladataksesi tiedoston %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Hae kartalta";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Ei tarpeeksi tyhjää levytilaa";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Lataa koskettamalla";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Uusi MAPS.ME -versio mahdollistaa reittien luonnin nykyisestä sijainnista määränpäähäsi.Päivitä kartat käyttääksesi tätä ominaisuutta.";
 
 /* Update all button text */
-"downloader_update_all" = "Päivitä kaikki";
+"downloader_update_all_button" = "Päivitä kaikki";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Peruuta kaikki";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Ladattu";
+"downloader_downloaded_subtitle" = "Ladatut";
 
 /* Country queued for download */
 "downloader_queued" = "jonossa";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Minun lähelläni";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Kartat: %s";
+
+"downloader_download_all_button" = "Lataa kaikki";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Pidä mielessä seuraavat seikat luodessasi reittejä MAPS.ME -sovelluksella:\n\n- Ehdotettuja reittejä tulee pitää vain suosituksina.\n- Teiden kunto, liikennesäännöt ja -merkit on aina otettava huomioon navigointiehdotuksista huolimatta.\n - Kartassa saattaa olla virheitä, tai se saattaa olla vanhentunut, eikä reittejä sen takia voida luoda parhaalla mahdollisella tavalla.\n\nPysy valppaana liikenteessä ja pidä huolta itsestäsi!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Kartta + reititys";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Poista kartta";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Seuraava";
 
-"whats_new_night_caption" = "Yötilanavigaatio";
-
-"whats_new_night_body" = "Olemme lisänneet yötilan helpottaaksemme MAPS.ME:n käyttöä pimeällä ajettaessa. Se menee automaattisesti päälle auringonlaskun jälkeen.";
-
 "editor_time_add" = "Lisää aikataulu";
 
 "editor_time_delete" = "Poista aikataulu";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Tärkeää!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Olemme jakaneet kartat osiin, joten voitkin nyt ladata pelkkiä alueita lataamatta koko maan karttaa. Ennen uusien karttojen lataamista tulee sinun kuitenkin poistaa vanhat kartat laitteeltasi.";
-
-"youve_been_asking" = "Sitä on pyydetty, ja nyt se on tarjolla";
-
 /* Android uses image instead of text. */
 "download_all" = "Lataa kaikki";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Puhelinnumero";
 
-"whats_new_editor_caption" = "Muokkaa karttoja suoraan MAPS.ME -sovelluksessa";
+"please_note" = "Huomaathan, että";
 
-"whats_new_editor_message" = "Muokkauksesi auttavat miljoonia käyttäjiä — parannetaan maailmaa yhdessä!";
+"common_no_wifi_dialog" = "Ei Wi-Fi -yhteyttä. Haluatko jatkaa mobiilidatan avulla?";
+
+"downloader_delete_map_dialog" = "Kaikki karttaan tehdyt muutokset poistetaan kartan mukana.";
+
+"downloader_update_maps" = "Päivitä kartat";
+
+"downloader_mwm_migration_dialog" = "Sinun täytyy päivittää kaikki kartat ja suunnitella reitti uudelleen luodaksesi uuden reitin.";
+
+"downloader_search_field_hint" = "Etsi kartta";
+
+"migration_update_all_button" = "Päivitä kaikki kartat";
+
+"migration_delete_all_download_current_button" = "Lataa nykyinen kartta ja poista kaikki vanhat kartat";
+
+"migration_prefetch_status" = "Karttojen päivitystä ladataan…";
+
+"migration_download_error_dialog" = "Latausvirhe";
+
+"common_check_internet_connection_dialog" = "Tarkista asetuksesi ja varmista, että laitteesi on yhteydessä Internetiin.";
+
+"downloader_no_space_title" = "Ei tarpeeksi tilaa";
+
+"downloader_no_space_message" = "Poista tarpeeton data";
+
+"editor_general_auth_error_dialog" = "Yleinen kirjautumisvirhe.";
+
+"editor_login_error_dialog" = "Kirjautumisvirhe.";
+
+"editor_login_failed_dialog" = "Kirjautuminen epäonnistui";
+
+"editor_username_error_dialog" = "Käyttäjätunnus on virheellinen";
+
+"editor_place_edited_dialog" = "Olet muokannut kohdetta!";
+
+"editor_login_with_osm" = "Kirjaudu sisään OpenStreetMapissa";
+
+"editor_profile_changes" = "Muutokset:";
+
+"editor_profile_unsent_changes" = "Ei lähetetty";
+
+"editor_focus_map_on_location" = "Vedä karttaa valitaksesi kohteelle oikean sijainnin.";
+
+"editor_add_select_category" = "Valitse kategoria";
+
+"editor_add_select_category_popular_subtitle" = "Suositut";
+
+"editor_add_select_category_all_subtitle" = "Kaikki kategoriat";
+
+"editor_edit_place_title" = "Muokkaus";
+
+"editor_add_place_title" = "Lisääminen";
+
+"editor_edit_place_name_hint" = "Paikan nimi";
+
+"editor_edit_place_category_title" = "Kategoria";
+
+"placepage_add_place_button" = "Lisää paikka";
+
+"placepage_report_problem_button" = "Ilmoita ongelmasta";
+
+"whatsnew_smallmwm_header" = "Sitä on pyydetty, ja nyt se on tarjolla";
+
+"whatsnew_smallmwm_message" = "Olemme jakaneet kartat osiin, joten voitkin nyt ladata pelkkiä alueita lataamatta koko maan karttaa.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Olemme selkeästi parantaneet osoitehakua - kokeile vaikka itse.";
+
+"whatsnew_editor_title" = "Muokkaa karttaa*";
+
+"whatsnew_editor_message_1" = "Lisää karttaan uusia paikkoja ja muokkaa sovelluksessa olevia karttoja suoraan sovelluksessa.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME käyttää OpenStreetMap -yhteisön dataa.";
+
+"onboarding_offline_navigation_title" = "Et eksy enää koskaan";
+
+"onboarding_offline_navigation_message" = "Suunnittele ihanteellinen autoilu- tai kävelyreitti jopa ilman Internet-yhteyttä!";
+
+"onboarding_offline_navigation_title_2" = "Offline-navigointi";
+
+"onboarding_offline_navigation_message_2" = "Suunnittele ihanteelliset autoilu- ja kävelyreitit.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline-kartat";
+
+"onboarding_offline_maps_message" = "Lataa haluamasi alueen kartat yhden kerran ja voit käyttää navigointi- ja hakutoimintoja ilman Internet-yhteyttä.";
+
+"onboarding_notifications_message" = "Ota päivitysilmoitukset käyttöön saadaksesi tuoreimmat kartat";
+
+"onboarding_notifications_title" = "Ota päivitysilmoitukset käyttöön";
+
+"onboarding_location_title" = "Auta meitä löytämään sinut";
+
+"onboarding_location_message" = "Tarvitsemme sijaintisi käyttääksemme navigointia ja muita ominaisuuksia.";
diff --git a/iphone/Maps/fr.lproj/Localizable.strings b/iphone/Maps/fr.lproj/Localizable.strings
index 84f336ca08..7901230df4 100644
--- a/iphone/Maps/fr.lproj/Localizable.strings
+++ b/iphone/Maps/fr.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Supprimer";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Supprimer les anciennes cartes et continuer";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Ne plus me demander";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Ma position";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Aucune connexion Internet détectée";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Aucun connexion Wi-Fi détectée. Désirez-vous utiliser les données mobiles (GPRS, EDGE, 3G ou LTE) pour télécharger %@ ?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Rechercher sur la carte";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Il n'y a pas assez d'espace disque libre";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Toucher pour télécharger";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "La nouvelle version de MAPS.ME permet de créer des itinéraires à partir de votre position actuelle vers un point de destination. Veuillez mettre à jour les cartes pour utiliser cette fonctionnalité.";
 
 /* Update all button text */
-"downloader_update_all" = "Tout mettre à jour";
+"downloader_update_all_button" = "Mettre à jour tout";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Tout annuler";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Téléchargé";
+"downloader_downloaded_subtitle" = "Téléchargé";
 
 /* Country queued for download */
 "downloader_queued" = "en file d'attente";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Près de moi";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Cartes : %s";
+
+"downloader_download_all_button" = "Télécharger tout";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Quand vous créez des itinéraires sur l'application MAPS.ME, veuillez garder à l'esprit les points suivants :\n\n  - Les itinéraires suggérés ne doivent être considérés que comme des recommandations.\n\n  - Les conditions des routes, les règlementations de circulations et les panneaux sont prioritaires sur les conseils de navigation.\n\n  - Il est possible qu'une carte soit incorrecte ou obsolète, et les itinéraires ne sont pas toujours créés de la meilleure façon possible.\n\n  Soyez prudents sur les routes et prenez soin de vous.";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Carte + itinéraire";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Supprimer carte";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Neste";
 
-"whats_new_night_caption" = "Navigation en mode nuit";
-
-"whats_new_night_body" = "Pour faciliter l'utilisation de MAPS.ME en conduisant dans l'obscurité, nous avons ajouté le mode nuit. Il se met automatiquement en marche après le coucher du soleil.";
-
 "editor_time_add" = "Ajouter au planning";
 
 "editor_time_delete" = "Supprimer du planning";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Important !";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Nous avons divisé la carte en plusieurs parties. Désormais, vous pouvez télécharger des régions bien précises, et non plus le pays tout entier. Avant de commencer à télécharger de nouvelles cartes , veillez à effacer les anciennes.";
-
-"youve_been_asking" = "Vous avez été nombreux à nous le demander et nous avons satisfait votre requête.";
-
 /* Android uses image instead of text. */
 "download_all" = "Tout télécharger";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Numéro de téléphone";
 
-"whats_new_editor_caption" = "Modifiez la carte directement depuis MAPS.ME";
+"please_note" = "À noter";
 
-"whats_new_editor_message" = "Vos modifications aideront des millions d'utilisateurs. Améliorons le monde ensemble !";
+"common_no_wifi_dialog" = "Aucune connexion Wi-Fi. Voulez-vous continuer avec les données mobiles ?";
+
+"downloader_delete_map_dialog" = "Toutes les modifications de la carte seront supprimées avec elle.";
+
+"downloader_update_maps" = "Mettre à jour les cartes";
+
+"downloader_mwm_migration_dialog" = "Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l'itinéraire.";
+
+"downloader_search_field_hint" = "Trouver la carte";
+
+"migration_update_all_button" = "Mettre à jour toutes les cartes";
+
+"migration_delete_all_download_current_button" = "Téléchargez la carte actuelle et supprimez les anciennes";
+
+"migration_prefetch_status" = "Préparation de la mise à jour des cartes…";
+
+"migration_download_error_dialog" = "Erreur de téléchargement";
+
+"common_check_internet_connection_dialog" = "Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet.";
+
+"downloader_no_space_title" = "Espace insuffisant";
+
+"downloader_no_space_message" = "Veuillez supprimer les données inutiles";
+
+"editor_general_auth_error_dialog" = "Erreur générale de connexion.";
+
+"editor_login_error_dialog" = "Erreur de connexion.";
+
+"editor_login_failed_dialog" = "La connexion a échoué";
+
+"editor_username_error_dialog" = "Le nom d'utilisateur est invalide";
+
+"editor_place_edited_dialog" = "Vous avez modifié un objet !";
+
+"editor_login_with_osm" = "Connexion avec OpenStreetMap";
+
+"editor_profile_changes" = "Modifications :";
+
+"editor_profile_unsent_changes" = "Non envoyé";
+
+"editor_focus_map_on_location" = "Tirez la carte pour sélectionner la bonne position de l'objet.";
+
+"editor_add_select_category" = "Sélectionner une catégorie";
+
+"editor_add_select_category_popular_subtitle" = "Populaire";
+
+"editor_add_select_category_all_subtitle" = "Toutes les catégories";
+
+"editor_edit_place_title" = "Modification";
+
+"editor_add_place_title" = "Ajout";
+
+"editor_edit_place_name_hint" = "Nom du lieu";
+
+"editor_edit_place_category_title" = "Catégorie";
+
+"placepage_add_place_button" = "Ajouter une position";
+
+"placepage_report_problem_button" = "Signaler un problème";
+
+"whatsnew_smallmwm_header" = "Vous avez été nombreux à nous le demander et nous avons satisfait votre requête";
+
+"whatsnew_smallmwm_message" = "Nous avons divisé la carte en plusieurs parties. Désormais, vous pouvez télécharger des régions bien précises, et non plus le pays tout entier.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Nous avons apporté des améliorations considérables à la recherche par adresse. Voyez par vous-même.";
+
+"whatsnew_editor_title" = "Modifier la carte*";
+
+"whatsnew_editor_message_1" = "Ajoutez de nouveaux lieux sur la carte et modifiez les lieux existants directement depuis l'appli.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME utilise les données de la communauté OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Vous ne vous perdrez plus jamais";
+
+"onboarding_offline_navigation_message" = "Planifiez des itinéraires optimaux en voiture ou à pied, même en l'absence de connexion Internet !";
+
+"onboarding_offline_navigation_title_2" = "Navigation hors-ligne";
+
+"onboarding_offline_navigation_message_2" = "Planifiez des itinéraires optimaux en voiture ou à pied.";
+
+"onboarding_offline_maps_title" = "MAPS.ME – cartes hors-ligne";
+
+"onboarding_offline_maps_message" = "Téléchargez une seule fois les cartes de la zone désirée, et utilisez les fonctions de navigation et de recherche sans connexion Internet.";
+
+"onboarding_notifications_message" = "Pour recevoir les dernières cartes, recevez des notifications de mise à jour";
+
+"onboarding_notifications_title" = "Activer les notifications de mise à jour";
+
+"onboarding_location_title" = "Aidez-nous à vous trouver";
+
+"onboarding_location_message" = "Pour utiliser la navigation et d'autres fonctionnalités, nous devons pouvoir accéder à votre position géographique.";
diff --git a/iphone/Maps/hu.lproj/Localizable.strings b/iphone/Maps/hu.lproj/Localizable.strings
index 75b0d26b3d..f6f5379136 100644
--- a/iphone/Maps/hu.lproj/Localizable.strings
+++ b/iphone/Maps/hu.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Törlés";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Régi térképek törlése és folytatás";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Ne kérdezze többször";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Saját helyzet";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Nem találtam internet kapcsolatot";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Nem találtam WiFi kapcsolatot. Használjunk mobil kapcsolatot (GPRS, EDGE, 3G vagy LTE) %@ letöltéséhez?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Keresés a térképen";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Nincs elég szabad hely a lemezen";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Érintse meg letöltéshez";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "A MAPS.ME új verziójában már útvonalakt is létrehozhatsz tartózkodási helyedtől az úticélodig. Kérjük, ennek a funkciónak a használatához frissítsd a térképeket.";
 
 /* Update all button text */
-"downloader_update_all" = "Mind frissítése";
+"downloader_update_all_button" = "Mindegyik frissítése";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Mindent visszavon";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Letöltve";
+"downloader_downloaded_subtitle" = "Letöltve";
 
 /* Country queued for download */
 "downloader_queued" = "várólistás";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "A közelemben";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Térképek: %s";
+
+"downloader_download_all_button" = "Mindegyik letöltése";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Amikor útvonalakat készít a MAPS.ME appban, kérjük, vegye figyelembe a következőket:\n\n  - Az ajánlott útvonalak csak javaslatoknak tekintendők.\n - Az utak kondíciója, a forgalmi szabályok és jelzőtáblák magasabb prioritásúak, mint a navigációs javaslatok.\n - A térkép lehet, hogy hibás vagy idejétmúlt, az útvonalak pedig lehet, hogy nem a lehető legjobb módon készülnek el.\n\n  Legyen óvatos az utakon és vigyázzon magára!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Térkép + útvonal megállapítása";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Térkép törlése";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Következő";
 
-"whats_new_night_caption" = "Navigáció éjszakai módban";
-
-"whats_new_night_body" = "A MAPS.ME használatának sötétben való vezetés közbeni elősegítése érdekében hozzáadtuk a funkciókhoz az éjszakai módot. Naplemente után automatikusan bekapcsol.";
-
 "editor_time_add" = "Időrend felvitele";
 
 "editor_time_delete" = "Időrend törlése";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Fontos!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Felosztottuk részekre a térképeket. Mostantól az egyes régiókat is letöltheted, nem csak az egész országot. Az új térképek letöltése előtt kérjük, távolítsd el a régieket.";
-
-"youve_been_asking" = "Te kérted, mi elkészítettük";
-
 /* Android uses image instead of text. */
 "download_all" = "Összes letöltése";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefonszám";
 
-"whats_new_editor_caption" = "Térkép szerkesztése közvetlenül a MAPS.ME-ből";
+"please_note" = "Megjegyzés";
 
-"whats_new_editor_message" = "Javításaid felhasználóik millióinak fognak majd segíteni. Javítsunk együtt a világon!";
+"common_no_wifi_dialog" = "Nincs WiFi-kapcsolat. Szeretnéd folytatni mobil adatforgalom használatával?";
+
+"downloader_delete_map_dialog" = "A térképekkel együtt minden rajtuk végzett módosítás is törlésre kerül.";
+
+"downloader_update_maps" = "Térképek frissítése";
+
+"downloader_mwm_migration_dialog" = "Útvonal létrehozásához frissítsd az összes térképet, majd tervezd meg újra az útvonalat.";
+
+"downloader_search_field_hint" = "Térkép keresése";
+
+"migration_update_all_button" = "Minden térkép frissítése";
+
+"migration_delete_all_download_current_button" = "Töltsd le a jelenlegi térképet és töröld a régieket";
+
+"migration_prefetch_status" = "Térképfrissítések előkészítése…";
+
+"migration_download_error_dialog" = "Letöltési hiba";
+
+"common_check_internet_connection_dialog" = "Kérjük, ellenőrizd a beállításaid és győződj meg arról, hogy a készüléked kapcsolódik az internethez.";
+
+"downloader_no_space_title" = "Nincs elegendő tárhely";
+
+"downloader_no_space_message" = "Kérjük, töröld a szükségtelen adatokat";
+
+"editor_general_auth_error_dialog" = "Általános bejelentkezési hiba.";
+
+"editor_login_error_dialog" = "Bejelentkezési hiba.";
+
+"editor_login_failed_dialog" = "Sikertelen bejelentkezés";
+
+"editor_username_error_dialog" = "Érvénytelen felhasználónév";
+
+"editor_place_edited_dialog" = "Szerkesztettél egy objektumot!";
+
+"editor_login_with_osm" = "Bejelentkezés OpenStreetMappel";
+
+"editor_profile_changes" = "Változások:";
+
+"editor_profile_unsent_changes" = "Nincs elküldve";
+
+"editor_focus_map_on_location" = "Húzd a térképet a megfelelő helyre az objektum helyes helyszínének kiválasztásához.";
+
+"editor_add_select_category" = "Válassz kategóriát";
+
+"editor_add_select_category_popular_subtitle" = "Népszerűek";
+
+"editor_add_select_category_all_subtitle" = "Minden kategória";
+
+"editor_edit_place_title" = "Szerkesztés";
+
+"editor_add_place_title" = "Hozzáadás";
+
+"editor_edit_place_name_hint" = "Hely neve";
+
+"editor_edit_place_category_title" = "Kategória";
+
+"placepage_add_place_button" = "Hely hozzáadása";
+
+"placepage_report_problem_button" = "Hibabejelentés";
+
+"whatsnew_smallmwm_header" = "Te kérted, mi elkészítettük";
+
+"whatsnew_smallmwm_message" = "Felosztottuk részekre a térképeket. Mostantól az egyes régiókat is letöltheted, nem csak az egész országot.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Jelentősen javítottunk a címen alapuló keresésünkön. Nézd meg magadnak.";
+
+"whatsnew_editor_title" = "Térkép szerkesztése*";
+
+"whatsnew_editor_message_1" = "Adj hozzá új helyeket a térképhez, és szerkeszd a meglévőket közvetlenül az alkalmazásból.";
+
+"whatsnew_editor_message_2" = "* A MAPS.ME az OpenStreetMap közösség adatait használja.";
+
+"onboarding_offline_navigation_title" = "Többé nem fogsz eltévedni";
+
+"onboarding_offline_navigation_message" = "Tervezd meg az optimális autós és gyalogos útvonalakat, akkor is, ha nincs internetkapcsolat!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigáció";
+
+"onboarding_offline_navigation_message_2" = "Tervezd meg az optimális autós és gyalogos útvonalakat.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline térképek";
+
+"onboarding_offline_maps_message" = "Mindössze egyszer kell letöltened egy adott helyszín térképét, azt követően internetkapcsolat nélkül is használhatod a navigációs és keresési funkciókat.";
+
+"onboarding_notifications_message" = "Fogadj értesítő üzeneteket a legfrissebb térképekről";
+
+"onboarding_notifications_title" = "Értesítések engedélyezése";
+
+"onboarding_location_title" = "Segíts, hogy megtaláljunk";
+
+"onboarding_location_message" = "A navigáció és egyéb funkciók használatához hozzá kell férnünk a geolokációdhoz.";
diff --git a/iphone/Maps/id.lproj/Localizable.strings b/iphone/Maps/id.lproj/Localizable.strings
index 53822234e1..158f69b841 100644
--- a/iphone/Maps/id.lproj/Localizable.strings
+++ b/iphone/Maps/id.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Hapus";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Hapus peta tua dan lanjutkan";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Jangan tanyai saya lagi";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Posisi Saya";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Tidak ada koneksi internet yang terdeteksi";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Tidak ada koneksi WiFi yang terdeteksi. Apakah Anda ingin menggunakan paket data seluler (GPRS, EDGE, 3G or LTE) untuk mengunduh %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Cari Peta";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Tidak ada ruang kosong yang cukup";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Sentuh untuk mengunduh";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Versi MAPS.ME yang terbaru memungkinkan pembuatan rute dari posisi Anda saat itu ke titik tujuan. Mohon perbarui peta untuk menggunakan fitur ini.";
 
 /* Update all button text */
-"downloader_update_all" = "Perbarui semuanya";
+"downloader_update_all_button" = "Perbarui semua";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Batalkan Semuanya";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Telah Diunduh";
+"downloader_downloaded_subtitle" = "Diunduh";
 
 /* Country queued for download */
 "downloader_queued" = "telah diantrekan";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Dekat saya";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Peta: %s";
+
+"downloader_download_all_button" = "Unduh semua";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Dalam membuat rute di aplikasi MAPS.ME, mohon ingat:\n\n- Rute yang disarankan hanya dapat dianggap sebagai rekomendasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Kondisi jalan, peraturan dan tanda-tanda lalu lintas memiliki prioritas yang lebih tinggi daripada saran navigasi.\n- Peta bisa saja salah atau sudah usang, dan rute yang dibuat mungkin bukan yang terbaik.\n\nBerhati-hatilah di jalan dan jagalah diri Anda sendiri!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Peta + Rute";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Hapus Peta";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Berikut";
 
-"whats_new_night_caption" = "Navigasi mode malam";
-
-"whats_new_night_body" = "Untuk memfasilitasi penggunaan MAPS.ME saat berkendara dalam gelap, kami telah menambahkan mode malam. Mode ini diaktifkan secara otomatis setelah matahari terbenam.";
-
 "editor_time_add" = "Tambah Jadwal";
 
 "editor_time_delete" = "Hapus Jadwal";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Penting!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Kami telah membagi peta menjadi beberapa bagian. Sekarang Anda dapat mengunduh wilayah-wilayah yang terpisah, bukan seluruh negara. Sebelum Anda mulai mengunduh peta-peta baru, harap menghapus peta-peta yang lama.";
-
-"youve_been_asking" = "Anda memintanya dan kami telah malakukannya";
-
 /* Android uses image instead of text. */
 "download_all" = "Unduh semua";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telepon";
 
-"whats_new_editor_caption" = "Edit peta secara langsung dari MAPS.ME";
+"please_note" = "Harap diperhatikan";
 
-"whats_new_editor_message" = "Perubahan yang anda lakukan akan membantu jutaan pengguna. Marilah meningkatkan dunia bersama-sama!";
+"common_no_wifi_dialog" = "Tidak ada koneksi WiFi. Apakah Anda ingin melanjutkan dengan data seluler?";
+
+"downloader_delete_map_dialog" = "Semua perubahan peta akan dihapus bersama dengan peta.";
+
+"downloader_update_maps" = "Perbarui peta";
+
+"downloader_mwm_migration_dialog" = "Untuk membuat rute, Anda perlu memperbarui semua peta dan kemudian merencanakan rute tersebut lagi.";
+
+"downloader_search_field_hint" = "Temukan peta";
+
+"migration_update_all_button" = "Perbarui semua peta";
+
+"migration_delete_all_download_current_button" = "Unduh peta sekarang dan hapus peta lama";
+
+"migration_prefetch_status" = "Mempersiapkan pembaruan peta…";
+
+"migration_download_error_dialog" = "Unduh kesalahan";
+
+"common_check_internet_connection_dialog" = "Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.";
+
+"downloader_no_space_title" = "Tidak cukup ruang";
+
+"downloader_no_space_message" = "Harap menghapus data yang tidak diperlukan";
+
+"editor_general_auth_error_dialog" = "Kesalahan masuk umum.";
+
+"editor_login_error_dialog" = "Kesalahan masuk.";
+
+"editor_login_failed_dialog" = "Masuk gagal";
+
+"editor_username_error_dialog" = "Nama pengguna tidak benar";
+
+"editor_place_edited_dialog" = "Anda telah mengedit sebuah obyek!";
+
+"editor_login_with_osm" = "Masuk dengan OpenStreetMap";
+
+"editor_profile_changes" = "Perubahan:";
+
+"editor_profile_unsent_changes" = "Tidak terkirim";
+
+"editor_focus_map_on_location" = "Tarik peta untuk memilih lokasi yang benar dari obyek.";
+
+"editor_add_select_category" = "Pilih kategori";
+
+"editor_add_select_category_popular_subtitle" = "Populer";
+
+"editor_add_select_category_all_subtitle" = "Semua kategori";
+
+"editor_edit_place_title" = "Mengedit";
+
+"editor_add_place_title" = "Menambahkan";
+
+"editor_edit_place_name_hint" = "Nama tempat";
+
+"editor_edit_place_category_title" = "Kategori";
+
+"placepage_add_place_button" = "Tambahkan tempat";
+
+"placepage_report_problem_button" = "Laporkan masalah";
+
+"whatsnew_smallmwm_header" = "Anda memintanya dan kami telah malakukannya";
+
+"whatsnew_smallmwm_message" = "Kami telah membagi peta menjadi beberapa bagian. Sekarang Anda dapat mengunduh wilayah-wilayah yang terpisah, bukan seluruh negara.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Kami secara signifikan telah meningkatkan pencarian menurut alamat. Lihat sendiri.";
+
+"whatsnew_editor_title" = "Edit peta*";
+
+"whatsnew_editor_message_1" = "Tambahkan tempat-tempat baru di peta, dan edit peta-peta yang ada langsung dari aplikasi.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME menggunakan data komunitas OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Anda tidak akan tersesat lagi";
+
+"onboarding_offline_navigation_message" = "Rencanakan rute mobil dan pejalan kaki yang optimal, meskipun tidak ada koneksi internet!";
+
+"onboarding_offline_navigation_title_2" = "Navigasi Offline";
+
+"onboarding_offline_navigation_message_2" = "Rencanakan rute mobil dan pejalan kaki yang optimal.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - peta offline";
+
+"onboarding_offline_maps_message" = "Unduh peta untuk daerah yang diinginkan sekali, dan gunakan navigasi dan fungsi pencarian tanpa koneksi internet.";
+
+"onboarding_notifications_message" = "Untuk menerima peta-peta terbaru, dapatkan pemberitahuan pembaruan";
+
+"onboarding_notifications_title" = "Aktifkan pemberitahuan pembaruan";
+
+"onboarding_location_title" = "Membantu kami menemukan Anda";
+
+"onboarding_location_message" = "Untuk menggunakan navigasi dan fitur-fitur lainnya, kami perlu mengakses geolokasi Anda.";
diff --git a/iphone/Maps/it.lproj/Localizable.strings b/iphone/Maps/it.lproj/Localizable.strings
index 38cc358fbf..f07d4b78f9 100644
--- a/iphone/Maps/it.lproj/Localizable.strings
+++ b/iphone/Maps/it.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Cancella";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Cancella le vecchie mappe e procedi";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Non me lo chiedere di nuovo";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "La mia posizione";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Non è stata rilevata alcuna connessione Internet";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Non è stata rilevata alcuna connessione WiFi. Vuoi utilizzare i dati cellulare (GPRS, EDGE, 3G o LTE) per scaricare %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Ricerca Mappa";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Non c'è abbastanza spazio libero su disco";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Tocca per scaricare";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "La nuova versione di MAPS.ME ti permette di creare itinerari dalla tua posizione attuale a un punto di destinazione. Aggiorna le mappe per utilizzare questa funzione.";
 
 /* Update all button text */
-"downloader_update_all" = "Aggiorna tutto";
+"downloader_update_all_button" = "Aggiorna tutte";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Annulla tutto";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Scaricate";
+"downloader_downloaded_subtitle" = "Scaricate";
 
 /* Country queued for download */
 "downloader_queued" = "in coda";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Vicino a me";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mappe: %s";
+
+"downloader_download_all_button" = "Scarica tutte";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Creando percorsi nell'app MAPS.ME tieni a mente quanto segue:\n\n  - I percorsi suggeriti possono essere considerati solo come consigliati.\n - Le condizioni della strada, le regole del traffico e i segnali hanno una priorità maggiore rispetto ai consigli sulla circolazione.\n - La mappa potrebbe essere scorretta o datata e i percorsi potrebbero non aver creato la strada migliore possibile.\n\n  Stai attento sulle strade e prenditi cura di te!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mappa + percorso";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Elimina mappa";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Avanti";
 
-"whats_new_night_caption" = "Navigazione in modalità notturna";
-
-"whats_new_night_body" = "Per poter utilizzare al meglio MAPS.ME di sera o di notte, abbiamo aggiunto la modalità notturna. L'applicazione passerà automaticamente a questa modalità dopo il tramonto.";
-
 "editor_time_add" = "Aggiungi orari";
 
 "editor_time_delete" = "Elimina orari";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Importante!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Abbiamo diviso le mappe in parti. Ora puoi scaricare le regioni separate, non l'intero paese. Prima di iniziare lo scaricamento di nuove mappe, elimina quelle vecchie.";
-
-"youve_been_asking" = "Ce lo avete chiesto e noi lo abbiamo fatto";
-
 /* Android uses image instead of text. */
 "download_all" = "Scarica tutto";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefono";
 
-"whats_new_editor_caption" = "Modifica la mappa direttamente da MAPS.ME";
+"please_note" = "Si prega di notare";
 
-"whats_new_editor_message" = "Le tue modifiche aiuteranno milioni di utenti. Cerchiamo di migliorare il mondo insieme!";
+"common_no_wifi_dialog" = "Nessuna connessione WiFi. Vuoi continuare con la connessione dati?";
+
+"downloader_delete_map_dialog" = "Tutti i cambiamenti nella mappa saranno cancellati insieme alla mappa.";
+
+"downloader_update_maps" = "Aggiorna mappe";
+
+"downloader_mwm_migration_dialog" = "Per creare un percorso, devi aggiornare tutte le mappe e pianificare nuovamente il percorso.";
+
+"downloader_search_field_hint" = "Trova la mappa";
+
+"migration_update_all_button" = "Aggiorna tutte le mappe";
+
+"migration_delete_all_download_current_button" = "Scarica la mappa attuale e cancella quelle vecchie";
+
+"migration_prefetch_status" = "Preparazione aggiornamento delle mappe…";
+
+"migration_download_error_dialog" = "Errore nel download";
+
+"common_check_internet_connection_dialog" = "Sei pregato di verificare le tue impostazioni e assicurarti che il tuo dispositivo sia connesso a internet.";
+
+"downloader_no_space_title" = "Spazio insufficiente";
+
+"downloader_no_space_message" = "Si prega di rimuovere i dati non necessari";
+
+"editor_general_auth_error_dialog" = "Errore generale di accesso.";
+
+"editor_login_error_dialog" = "Errore accesso.";
+
+"editor_login_failed_dialog" = "Accesso fallito";
+
+"editor_username_error_dialog" = "Nome utente non valido";
+
+"editor_place_edited_dialog" = "Hai modificato un oggetto!";
+
+"editor_login_with_osm" = "Accedi con OpenStreetMap";
+
+"editor_profile_changes" = "Modifiche:";
+
+"editor_profile_unsent_changes" = "Non inviato";
+
+"editor_focus_map_on_location" = "Sposta la mappa per selezionare l’esatta posizione dell’oggetto.";
+
+"editor_add_select_category" = "Seleziona categoria";
+
+"editor_add_select_category_popular_subtitle" = "Popolari";
+
+"editor_add_select_category_all_subtitle" = "Tutte le categorie";
+
+"editor_edit_place_title" = "Modifica";
+
+"editor_add_place_title" = "Aggiunta";
+
+"editor_edit_place_name_hint" = "Nome del luogo";
+
+"editor_edit_place_category_title" = "Categoria";
+
+"placepage_add_place_button" = "Aggiungi un luogo";
+
+"placepage_report_problem_button" = "Riporta un problema";
+
+"whatsnew_smallmwm_header" = "Ce lo avete chiesto e noi lo abbiamo fatto";
+
+"whatsnew_smallmwm_message" = "Abbiamo diviso le mappe in parti. Ora puoi scaricare le regioni separate, non l'intero paese.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Abbiamo migliorato significativamente la ricerca per indirizzo. Guarda tu stesso.";
+
+"whatsnew_editor_title" = "Modifica la mappa*";
+
+"whatsnew_editor_message_1" = "Aggiungi nuovi luoghi alla mappa, e modifica quelli già esistenti direttamente dall’app.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME usa i dati della community OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Non ti perderai mai più";
+
+"onboarding_offline_navigation_message" = "Pianifica percorsi ottimali in auto o a piedi, anche senza connessione internet!";
+
+"onboarding_offline_navigation_title_2" = "Navigazione offline";
+
+"onboarding_offline_navigation_message_2" = "Pianifica percorsi ottimali in auto o a piedi.";
+
+"onboarding_offline_maps_title" = "MAPS.ME – mappe offline";
+
+"onboarding_offline_maps_message" = "Scarica una volta le mappe per l’area desiderata e usa la navigazione e le funzioni di ricerca senza una connessione internet.";
+
+"onboarding_notifications_message" = "Per ricevere le mappe aggiornate, attiva le notifiche di aggiornamento";
+
+"onboarding_notifications_title" = "Attiva notifiche di aggiornamento";
+
+"onboarding_location_title" = "Aiutaci a trovarti";
+
+"onboarding_location_message" = "Per usare la navigazione e altri strumenti, dobbiamo accedere alla tua geolocalizzazione.";
diff --git a/iphone/Maps/ja.lproj/Localizable.strings b/iphone/Maps/ja.lproj/Localizable.strings
index cf9581c688..6d7bb90d3f 100644
--- a/iphone/Maps/ja.lproj/Localizable.strings
+++ b/iphone/Maps/ja.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "削除";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "古いマップを削除して処理を続行";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "以後、このメッセージを表示しない";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "現在地";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "インターネットに接続されていません";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "WiFi接続が見つかりません。GPRS、EDGE、3G、LTE等の携帯電話回線で%@をダウンロードしますか？";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "マップを検索";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "ディスクに十分な空き領域がありません";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "タッチしてダウンロード";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "新バージョンのMAPS.MEは現在地から目的地までのルートを作成可能です。 この機能を使うためにマップを更新してください。";
 
 /* Update all button text */
-"downloader_update_all" = "全てをアップデート";
+"downloader_update_all_button" = "全てをアップデート";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "すべてキャンセル";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "ダウンロード済";
+"downloader_downloaded_subtitle" = "ダウンロード済み";
 
 /* Country queued for download */
 "downloader_queued" = "待ち行列型の";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "付近";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "地図: %s";
+
+"downloader_download_all_button" = "全てをダウンロード";
 
 /* Disclaimer message */
 "routing_disclaimer" = "MAPS.MEアプリでルートを作成する時は、以下のことに留意してください：\n\n  - 提案されたルートは推奨するだけです。\n - 道路状況、交通規則と標識はナビゲーションのアドバイスより優先度が高くなっています。\n - マップが不正確または古くなっている場合や、ルートが最適な方法で作成されていないことがあります。\n\n  安全運転でご自愛ください！";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "地図とルート";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "地図を削除";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "次へ";
 
-"whats_new_night_caption" = "夜間モードナビゲーション";
-
-"whats_new_night_body" = "MAPS.MEを夜間の運転中に使いやすくするため、夜間モードを追加しました。日の入り後に自動的に切り替わります。";
-
 "editor_time_add" = "スケジュール追加";
 
 "editor_time_delete" = "スケジュール削除";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "重要！";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "マップを分割し、国全体でなく個別の地域をダウンロードできるようにしました。新しいマップをダウンロードする前に、古いものを削除してください。";
-
-"youve_been_asking" = "皆様のご要望にお応えして、実現を果たしました";
-
 /* Android uses image instead of text. */
 "download_all" = "全てをダウンロード";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "電話";
 
-"whats_new_editor_caption" = "MAPS.MEで直接地図を編集可能";
+"please_note" = "ご注意ください";
 
-"whats_new_editor_message" = "地図を修正すると、何百万人ものユーザーの役に立ちます。一緒に世界を改善していきましょう！";
+"common_no_wifi_dialog" = "WiFi接続がありません。モバイルデータ通信を続行しますか?";
+
+"downloader_delete_map_dialog" = "この地図を削除すると、今まで行った変更の全ても一緒に削除されます。";
+
+"downloader_update_maps" = "地図をアップデート";
+
+"downloader_mwm_migration_dialog" = "ルートを作成するには、全ての地図をアップデートした後で再びルート計画を行う必要があります。";
+
+"downloader_search_field_hint" = "地図を検索";
+
+"migration_update_all_button" = "全ての地図をアップデート";
+
+"migration_delete_all_download_current_button" = "現在の地図をダウンロードして古い地図を削除";
+
+"migration_prefetch_status" = "地図のアップデートの準備中…";
+
+"migration_download_error_dialog" = "ダウンロードエラー";
+
+"common_check_internet_connection_dialog" = "設定をチェックし、デバイスがインターネットに接続されているか確認してください。";
+
+"downloader_no_space_title" = "十分な空き容量がありません";
+
+"downloader_no_space_message" = "不必要なデータを削除してください";
+
+"editor_general_auth_error_dialog" = "一般的なログインエラー。";
+
+"editor_login_error_dialog" = "ログインエラー。";
+
+"editor_login_failed_dialog" = "ログインに失敗しました";
+
+"editor_username_error_dialog" = "ユーザー名が無効です";
+
+"editor_place_edited_dialog" = "オブジェクトを編集しました!";
+
+"editor_login_with_osm" = "OpenStreetMapを使ってログイン";
+
+"editor_profile_changes" = "変更回数:";
+
+"editor_profile_unsent_changes" = "未送信";
+
+"editor_focus_map_on_location" = "地図をプルしてオブジェクトの正しい場所を選択します。";
+
+"editor_add_select_category" = "カテゴリを選択";
+
+"editor_add_select_category_popular_subtitle" = "人気";
+
+"editor_add_select_category_all_subtitle" = "全てのカテゴリ";
+
+"editor_edit_place_title" = "編集中";
+
+"editor_add_place_title" = "追加中";
+
+"editor_edit_place_name_hint" = "場所の名前";
+
+"editor_edit_place_category_title" = "カテゴリ";
+
+"placepage_add_place_button" = "場所を追加";
+
+"placepage_report_problem_button" = "問題を報告";
+
+"whatsnew_smallmwm_header" = "皆様のご要望にお応えして、実現を果たしました";
+
+"whatsnew_smallmwm_message" = "マップを分割し、国全体でなく個別の地域をダウンロードできるようにしました。";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "住所での検索機能を大幅に改善しました。ご自身の目でご覧ください。";
+
+"whatsnew_editor_title" = "地図を編集*";
+
+"whatsnew_editor_message_1" = "アプリから直接地図に新しい場所を追加したり、既存の場所を編集できます。";
+
+"whatsnew_editor_message_2" = "* MAPS.MEはOpenStreetMapコミュニティのデータを使用しています。";
+
+"onboarding_offline_navigation_title" = "もう道に迷うことは絶対ありません";
+
+"onboarding_offline_navigation_message" = "インターネット接続がなくても、車や徒歩での最短ルートを計画できます!";
+
+"onboarding_offline_navigation_title_2" = "オフラインナビゲーション";
+
+"onboarding_offline_navigation_message_2" = "車や徒歩での最短ルートを計画できます。";
+
+"onboarding_offline_maps_title" = "MAPS.ME - オフライン地図";
+
+"onboarding_offline_maps_message" = "希望するエリアの地図を一回ダウンロードするだけで、インターネット接続なしでもナビゲーションや検索の機能を使用できます。";
+
+"onboarding_notifications_message" = "最新地図の入手のためにアップデート通知を受信";
+
+"onboarding_notifications_title" = "アップデート通知を有効にする";
+
+"onboarding_location_title" = "現在地判定のお手伝い";
+
+"onboarding_location_message" = "ナビゲーションやその他の機能の使用のために、アプリがGeolocationにアクセスする必要があります";
diff --git a/iphone/Maps/ko.lproj/Localizable.strings b/iphone/Maps/ko.lproj/Localizable.strings
index 8bf6477a2d..2716613029 100644
--- a/iphone/Maps/ko.lproj/Localizable.strings
+++ b/iphone/Maps/ko.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "삭제하기";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "이전의 지도를 삭제하고 진행하기";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "또 묻지 마세요.";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "나의 위치";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "인터넷이 연결되지 않았습니다.";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "WiFi 연결이 감지되지 않았습니다. %@를 다운로드하기 위해 휴대 자료(GPRS, EDGE, 3G 혹은 LTE)를 사용하시겠습니까?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "지도 검색하기";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "디스크 공간이 부족합니다.";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "두드려 다운로드하세요";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "MAPS.ME의 새로운 버전으로 당신의 현재 위치에서 목적지 지점으로 경로를 생성할 수 있습니다. 이 기능을 사용하려면 지도를 업데이트하십시오.";
 
 /* Update all button text */
-"downloader_update_all" = "모두 업데이트";
+"downloader_update_all_button" = "모두 업데이트";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "모두 취소";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "다운로드";
+"downloader_downloaded_subtitle" = "다운로드";
 
 /* Country queued for download */
 "downloader_queued" = "대기";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "내 근처";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "지도: %s";
+
+"downloader_download_all_button" = "모두 다운로드";
 
 /* Disclaimer message */
 "routing_disclaimer" = "MAPS.ME 앱에서 경로를 작성할 때, 다음에 유의하시기 바랍니다:\n\n  - 추천 루트는 권장 사항으로만 간주될 수 있습니다.\n - 도로 조건, 교통 규칙 및 징후는 탐색 조언보다 더 높은 우선 순위를 갖습니다.\n -지도는 잘못되었거나 만료되었을 수 있으며, 경로는 최상의 방법을 만들어지지 않을 수 있습니다.\n\n  도로에서 안전하게 몸조심하세요!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "지도 + 라우팅";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "지도 삭제";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "다음";
 
-"whats_new_night_caption" = "야간 모드 탐색";
-
-"whats_new_night_body" = "어두운 곳에서 운전할 때 MAPS.ME를 사용하는 걸 용이하게 하려면, 야간 모드에 추가됩니다. 이는 일몰 후 자동으로 전환됩니다.";
-
 "editor_time_add" = "스케줄 추가";
 
 "editor_time_delete" = "스케줄 삭제";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "중요!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "지도를 여러 부분으로 나눴습니다. 이제는 전체 국가가 아닌 개별 지역을 다운로드할 수 있습니다. 새 지도를 다운로드하기 전에 오래된 지도를 제거하십시오.";
-
-"youve_been_asking" = "여러분이 요청한 것을 저희가 해냈습니다";
-
 /* Android uses image instead of text. */
 "download_all" = "모두 다운로드";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "전화";
 
-"whats_new_editor_caption" = "MAPS.ME 와 직접 지도 편집";
+"please_note" = "참고 사항";
 
-"whats_new_editor_message" = "귀하의 변화는 수 백만 사용자를 도울 것입니다. 자 함께 세상의 발전을!";
+"common_no_wifi_dialog" = "WiFi 연결이 없습니다. 모바일 데이터를 계속하시겠습니까?";
+
+"downloader_delete_map_dialog" = "모든 지도의 변경 사항은 지도와 함께 삭제됩니다.";
+
+"downloader_update_maps" = "지도 업데이트";
+
+"downloader_mwm_migration_dialog" = "경로를 만들려면, 모든 지도를 업데이트한 다음, 다시 경로를 계획해야 합니다.";
+
+"downloader_search_field_hint" = "지도 찾기";
+
+"migration_update_all_button" = "모든지도 업데이트";
+
+"migration_delete_all_download_current_button" = "현재 지도 다운로드 및 기존 지도 삭제";
+
+"migration_prefetch_status" = "지도 업데이트 준비 중…";
+
+"migration_download_error_dialog" = "다운로드 오류";
+
+"common_check_internet_connection_dialog" = "설정을 확인하고 장치가 인터넷에 연결되어 있는지 확인하십시오.";
+
+"downloader_no_space_title" = "충분하지 않은 여유 공간";
+
+"downloader_no_space_message" = "불필요한 데이터를 제거하십시오.";
+
+"editor_general_auth_error_dialog" = "일반 로그인 오류.";
+
+"editor_login_error_dialog" = "로그인 오류.";
+
+"editor_login_failed_dialog" = "로그인 실패";
+
+"editor_username_error_dialog" = "잘못된 사용자 이름";
+
+"editor_place_edited_dialog" = "개체를 편집했습니다!";
+
+"editor_login_with_osm" = "OpenStreetMap으로 로그인";
+
+"editor_profile_changes" = "변경 사항:";
+
+"editor_profile_unsent_changes" = "전송되지 않음";
+
+"editor_focus_map_on_location" = "개체의 정확한 위치를 선택하려면 지도를 당깁니다.";
+
+"editor_add_select_category" = "범주 선택";
+
+"editor_add_select_category_popular_subtitle" = "인기있는";
+
+"editor_add_select_category_all_subtitle" = "모든 카테고리";
+
+"editor_edit_place_title" = "편집 중";
+
+"editor_add_place_title" = "첨가 중";
+
+"editor_edit_place_name_hint" = "장소 이름";
+
+"editor_edit_place_category_title" = "범주";
+
+"placepage_add_place_button" = "장소 추가";
+
+"placepage_report_problem_button" = "문제 신고";
+
+"whatsnew_smallmwm_header" = "여러분이 요청한 것을 저희가 해냈습니다";
+
+"whatsnew_smallmwm_message" = "지도를 여러 부분으로 나눴습니다. 이제는 전체 국가가 아닌 개별 지역을 다운로드할 수 있습니다.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "저희는 주소에 의한 검색을 놀랍게 개선 했습니다. 직접 경험해 보세요.";
+
+"whatsnew_editor_title" = "지도 편집*";
+
+"whatsnew_editor_message_1" = "지도에 새로운 장소를 추가하고 응용 프로그램에서 직접 기존 편집 할 수 있습니다.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME는 OpenStreetMap 커뮤니티 데이터를 사용합니다.";
+
+"onboarding_offline_navigation_title" = "다시 손실되지 않을 것임";
+
+"onboarding_offline_navigation_message" = "인터넷에 연결이 없는 경우에도, 최적의 자동차와 보행자 경로를 계획하십시오!";
+
+"onboarding_offline_navigation_title_2" = "오프라인 탐색";
+
+"onboarding_offline_navigation_message_2" = "최적의 자동차와 보행자 경로를 계획합니다.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - 오프라인지도";
+
+"onboarding_offline_maps_message" = "한 번에 원하는 지역의 지도를 다운로드하고, 인터넷 연결없이 탐색 및 검색 기능을 사용합니다.";
+
+"onboarding_notifications_message" = "최신지도를 받으려면, 업데이트 알림 받기";
+
+"onboarding_notifications_title" = "업데이트 알림 활성화";
+
+"onboarding_location_title" = "사용자를 찾도록 돕기";
+
+"onboarding_location_message" = "탐색 및 기타 기능을 사용하려면, 위치 정보에 액세스해야 합니다.";
diff --git a/iphone/Maps/nb.lproj/Localizable.strings b/iphone/Maps/nb.lproj/Localizable.strings
index 7452aef6a5..236f79fb82 100644
--- a/iphone/Maps/nb.lproj/Localizable.strings
+++ b/iphone/Maps/nb.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Slett";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Slett gamle kart og fortsett";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Ikke spør meg igjen";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Min posisjon";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Ingen Internett-tilkobling oppdaget";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Ingen WiFi-tilkobling oppdaget. Har du lyst til å bruke mobildata (GPRS, EDGE, 3G eller LTE) for å laste ned %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Søk kart";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Det er ikke nok ledig diskplass";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Trykk for å laste ned";
 
@@ -288,7 +279,7 @@
 "move_maps" = "Flytt kart?";
 
 /* Ask to wait user several minutes (some long process in modal dialog). */
-"wait_several_minutes" = "Dette kan ta flere minutter. Vent et øyeblikk ...";
+"wait_several_minutes" = "Dette kan ta flere minutter. Vent et øyeblikk …";
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Synlig";
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Med den nye versjonen av MAPS.ME kan du opprette ruter fra din nåværende posisjon til et ankomststed på kartet. Oppdater kartene for å bruke denne funksjonen.";
 
 /* Update all button text */
-"downloader_update_all" = "Oppdater alle";
+"downloader_update_all_button" = "Oppdater alle";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Avbryt alle";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Lastet ned";
+"downloader_downloaded_subtitle" = "Lastet ned";
 
 /* Country queued for download */
 "downloader_queued" = "lagt i kø";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "I nærheten";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Kart: %s";
+
+"downloader_download_all_button" = "Last ned alle";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Når du oppretter ruter i MAPS.ME-appen må du huske på følgende:\n\n- Foreslåtte ruter må bare betraktes som anbefalinger.\n- Veiforhold, trafikkregler og skilt må gis høyere prioritet enn navigasjonsråd.\n- Kartet kan være feil eller utdatert, og det er ikke sikkert at rutene opprettes på best mulig måte.\n\nVær nøye med veisikkerheten og pass på deg selv!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Kart + rutetilordning";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Slett kart";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Neste";
 
-"whats_new_night_caption" = "Nattmodus-navigering";
-
-"whats_new_night_body" = "For å tilrettelegge bruk av MAPS.ME under mørkekjøring har vi lagt til funksjonen nattmodus. Funksjonen skrues automatisk på etter solnedgang.";
-
 "editor_time_add" = "Legg til tidsrom";
 
 "editor_time_delete" = "Slett tidsrom";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Viktig!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Vi har delt opp kartene i separate deler. Nå kan du laste ned separate regioner istedenfor hele land. Sørg for at du fjerner de gamle kartene før du begynner å laste ned nye.";
-
-"youve_been_asking" = "Dere har bedt om det og vi har fått det til";
-
 /* Android uses image instead of text. */
 "download_all" = "Last ned alle";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Rediger kartet direkte fra MAPS.ME";
+"please_note" = "Vær oppmerksom på at";
 
-"whats_new_editor_message" = "Endringene dine vil hjelpe millioner av brukere. La oss forbedre verden sammen!";
+"common_no_wifi_dialog" = "Ingen trådløs forbindelse. Vil du fortsette med mobildata?";
+
+"downloader_delete_map_dialog" = "Alle endringer i kartet vil slettes sammen med kartet.";
+
+"downloader_update_maps" = "Oppdater kart";
+
+"downloader_mwm_migration_dialog" = "For å opprette en reiserute må du oppdatere alle kartene og deretter planlegge reiseruten på nytt.";
+
+"downloader_search_field_hint" = "Finn kartet";
+
+"migration_update_all_button" = "Oppdater alle kart";
+
+"migration_delete_all_download_current_button" = "Last ned det oppdaterte kartet og slett de gamle";
+
+"migration_prefetch_status" = "Forbereder oppdatering av kart…";
+
+"migration_download_error_dialog" = "Nedlastningsfeil";
+
+"common_check_internet_connection_dialog" = "Kontroller innstillingene dine og sørg for at enheten din er koblet til internett.";
+
+"downloader_no_space_title" = "Ikke nok plass";
+
+"downloader_no_space_message" = "Fjern unødvendig data";
+
+"editor_general_auth_error_dialog" = "Generell innloggingsfeil.";
+
+"editor_login_error_dialog" = "Innloggingsfeil.";
+
+"editor_login_failed_dialog" = "Innloggingen mislyktes";
+
+"editor_username_error_dialog" = "Brukernavnet er ugyldig";
+
+"editor_place_edited_dialog" = "Du har redigert et objekt!";
+
+"editor_login_with_osm" = "Logg inn med OpenStreetMat";
+
+"editor_profile_changes" = "Endringer:";
+
+"editor_profile_unsent_changes" = "Ikke sendt";
+
+"editor_focus_map_on_location" = "Dra kartet for å velge riktig beliggenhet for objektet.";
+
+"editor_add_select_category" = "Velg kategori";
+
+"editor_add_select_category_popular_subtitle" = "Populære";
+
+"editor_add_select_category_all_subtitle" = "Alle kategorier";
+
+"editor_edit_place_title" = "Redigerer";
+
+"editor_add_place_title" = "Legger til";
+
+"editor_edit_place_name_hint" = "Navn på stedet";
+
+"editor_edit_place_category_title" = "Kategori";
+
+"placepage_add_place_button" = "Legg til et sted";
+
+"placepage_report_problem_button" = "Rapporter et problem";
+
+"whatsnew_smallmwm_header" = "Dere har bedt om det og vi har fått det til";
+
+"whatsnew_smallmwm_message" = "Vi har delt opp kartene i separate deler. Nå kan du laste ned separate regioner istedenfor hele land.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Nå er det mye enklere å søke etter adresse. Se selv.";
+
+"whatsnew_editor_title" = "Rediger kartet*";
+
+"whatsnew_editor_message_1" = "Legg til nye steder i kartet og rediger eksisterende steder direkte fra appen.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME bruker data fra OpenStreetMap-samfunnet.";
+
+"onboarding_offline_navigation_title" = "Du vil aldri havne på villspor igjen";
+
+"onboarding_offline_navigation_message" = "Planlegg optimale reiseruter med bil og til fots, selv uten internettforbindelse!";
+
+"onboarding_offline_navigation_title_2" = "Offline-navigering";
+
+"onboarding_offline_navigation_message_2" = "Planlegg optimale reiseruter med bil og til fots.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline-kart";
+
+"onboarding_offline_maps_message" = "Last ned kartene for et ønsket område én gang, og bruk navigeringen og andre søkefunksjoner uten internettforbindelse.";
+
+"onboarding_notifications_message" = "Få oppdateringsvarsler for å motta de nyeste kartene";
+
+"onboarding_notifications_title" = "Aktiver oppdateringsvarsler";
+
+"onboarding_location_title" = "Hjelp oss med å finne deg";
+
+"onboarding_location_message" = "For å bruke navigering og andre funksjoner må vi ha tilgang til posisjonen din.";
diff --git a/iphone/Maps/nl.lproj/Localizable.strings b/iphone/Maps/nl.lproj/Localizable.strings
index 67ef3ce7ec..122469cfbc 100644
--- a/iphone/Maps/nl.lproj/Localizable.strings
+++ b/iphone/Maps/nl.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Verwijder";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Verwijder oude kaarten en ga door";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Nooit meer vragen";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Mijn Locatie";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Geen Internet verbinding gedetecteerd";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Geen WiFi verbinding gedetecteerd. Wilt u mobiele data (GPRS, EDGE, 3G of LTE) gebruiken om %@ te downloaden?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Zoek Kaart";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Er is niet genoeg vrije ruimte";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Klik om te downloaden";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Met de nieuwe versie van MAPS.ME kunt u routes maken vanaf uw huidige positie naar een punt van bestemming. Werk kaarten bij om deze functie te gebruiken.";
 
 /* Update all button text */
-"downloader_update_all" = "Alles bijwerken";
+"downloader_update_all_button" = "Update alles";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Alles annuleren";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Gedownload";
+"downloader_downloaded_subtitle" = "Gedownload";
 
 /* Country queued for download */
 "downloader_queued" = "in de wachtrij";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Bij mij in de buurt";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Kaarten: %s";
+
+"downloader_download_all_button" = "Alles downloaden";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Bij het creëren van routes in MAPS.ME-app, dient u rekening te houden met het volgende:\n\n  - Voorgestelde routes kunnen uitsluitend als aanbevelingen beschouwd worden.\n - Wegconditie, verkeersregels en borden hebben een hogere prioriteit dan het navigatie-advies.\n - De kaart kan onjuist of verouderd zijn en de routes kunnen niet op de beste mogelijke manier gecreëerd zijn.\n\n  Wees veilig op wegen en zorg goed voor uzelf!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Kaart + route";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Kaart verwijderen";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Volgende";
 
-"whats_new_night_caption" = "Nachtmodusnavigatie";
-
-"whats_new_night_body" = "Om het gebruik van MAPS.ME te vergemakkelijken tijdens het rijden in het donker, hebben we de nachtmodus toegevoegd. Deze wordt automatisch ingeschakeld na zonsondergang.";
-
 "editor_time_add" = "Schema toevoegen";
 
 "editor_time_delete" = "Schema verwijderen";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Belangrijk!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "We hebben kaarten in delen verdeeld. Nu kunt u afzonderlijke regio's downloaden in plaats van het hele land. Verwijder eerst de oude kaarten voordat uw nieuwe gaat downloaden.";
-
-"youve_been_asking" = "Op veler verzoek hebben we het voor elkaar gekregen";
-
 /* Android uses image instead of text. */
 "download_all" = "Alles downloaden";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefoonnummer";
 
-"whats_new_editor_caption" = "Bewerk de kaart direct vanuit MAPS.ME";
+"please_note" = "Opgelet";
 
-"whats_new_editor_message" = "Jouw wijzigingen zullen miljoenen gebruikers helpen. Laten we samen de wereld verbeteren!";
+"common_no_wifi_dialog" = "Geen WiFi-verbinding. Wil je doorgaan via mobiele data?";
+
+"downloader_delete_map_dialog" = "Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd.";
+
+"downloader_update_maps" = "Kaarten updaten";
+
+"downloader_mwm_migration_dialog" = "Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.";
+
+"downloader_search_field_hint" = "Vind de kaart";
+
+"migration_update_all_button" = "Update alle kaarten";
+
+"migration_delete_all_download_current_button" = "Download de huidige kaart en verwijder de oude";
+
+"migration_prefetch_status" = "Het voorbereiden van de update van de kaart…";
+
+"migration_download_error_dialog" = "Downloadfout";
+
+"common_check_internet_connection_dialog" = "Controleer je instellingen en zorg ervoor dat het apparaat is verbonden met het internet.";
+
+"downloader_no_space_title" = "Niet genoeg ruimte";
+
+"downloader_no_space_message" = "Verwijder overbodige gegevens";
+
+"editor_general_auth_error_dialog" = "Algemene inlogfout.";
+
+"editor_login_error_dialog" = "Inlogfout.";
+
+"editor_login_failed_dialog" = "Inloggen mislukt";
+
+"editor_username_error_dialog" = "Gebruikersnaam is ongeldig";
+
+"editor_place_edited_dialog" = "Je hebt een object bewerkt!";
+
+"editor_login_with_osm" = "Log in met OpenStreetMap";
+
+"editor_profile_changes" = "Wijzigingen:";
+
+"editor_profile_unsent_changes" = "Niet verzonden";
+
+"editor_focus_map_on_location" = "Trek aan de kaart om de juiste locatie van het object te selecteren.";
+
+"editor_add_select_category" = "Selecteer categorie";
+
+"editor_add_select_category_popular_subtitle" = "Populair";
+
+"editor_add_select_category_all_subtitle" = "Alle categorieën";
+
+"editor_edit_place_title" = "Aan het aanpassen";
+
+"editor_add_place_title" = "Aan het toevoegen";
+
+"editor_edit_place_name_hint" = "Naam van de plaats";
+
+"editor_edit_place_category_title" = "Categorie";
+
+"placepage_add_place_button" = "Voeg een plaats toe";
+
+"placepage_report_problem_button" = "Meld een probleem";
+
+"whatsnew_smallmwm_header" = "Op veler verzoek hebben we het voor elkaar gekregen";
+
+"whatsnew_smallmwm_message" = "We hebben kaarten in delen verdeeld. Nu kunt u afzonderlijke regio's downloaden in plaats van het hele land.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "We hebben het zoeken op adres significant verbeterd. Bekijk het zelf.";
+
+"whatsnew_editor_title" = "Bewerk de kaart*";
+
+"whatsnew_editor_message_1" = "Voeg nieuwe plaatsen toe aan de kaart en bewerk de bestaande rechtstreeks vanuit de app.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME gebruikt OpenStreetMap-communitiedata.";
+
+"onboarding_offline_navigation_title" = "Je zult nooit meer verdwalen";
+
+"onboarding_offline_navigation_message" = "Plan optimale auto- en wandelroutes, zelfs als er geen internetverbinding is!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigatie";
+
+"onboarding_offline_navigation_message_2" = "Plan optimale auto- en wandelroutes.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline kaarten";
+
+"onboarding_offline_maps_message" = "Download eenmaal de kaarten voor het gewenste gebied en gebruik de navigatie- en zoekfuncties zonder een internetverbinding.";
+
+"onboarding_notifications_message" = "Ontvang update-meldingen om de nieuwste kaarten te ontvangen";
+
+"onboarding_notifications_title" = "Schakel update-meldingen in";
+
+"onboarding_location_title" = "Help ons om je te vinden";
+
+"onboarding_location_message" = "Om de navigatie en andere functies te kunnen gebruiken, hebben we toegang tot je geolocatie nodig.";
diff --git a/iphone/Maps/pl.lproj/Localizable.strings b/iphone/Maps/pl.lproj/Localizable.strings
index 325b15985a..7ca690f37b 100644
--- a/iphone/Maps/pl.lproj/Localizable.strings
+++ b/iphone/Maps/pl.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Usuń";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Usuń stare mapy i kontynuuj";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Nie pytaj ponownie";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Moja pozycja";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Nie wykryto połączenia z Internetem";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Nie wykryto połączenia z siecią WiFi. Czy chciałbyś skorzystać z trybu sieci danych (GPRS, EDGE, 3G lub LTE), aby pobrać %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Szukaj mapy";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Nie ma wystarczającej ilości wolnego miejsca";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Naciśnij, aby pobrać.";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Nowa wersja aplikacji MAPS.ME pozwala na tworzenie tras z Twojej bieżącej lokalizacji do punktu docelowego. Proszę zaktualizować mapy, by móc korzystać z tej funkcji.";
 
 /* Update all button text */
-"downloader_update_all" = "Uaktualnij wszystko";
+"downloader_update_all_button" = "Aktualizuj wszystkie";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Anuluj wszystko";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Pobrane";
+"downloader_downloaded_subtitle" = "Pobrane";
 
 /* Country queued for download */
 "downloader_queued" = "w kolejce";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Blisko mnie";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mapy: %s";
+
+"downloader_download_all_button" = "Pobierz wszystkie";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Podczas tworzenia tras w aplikacji MAPS.ME pamiętaj o poniższych zasadach:\n\n  - Sugerowane trasy mogą być traktowane jedynie jako propozycje.\n - Warunki na drodze, przepisy ruchu drogowego i znaki mają większy priorytet niż wskazówki nawigacyjne.\n - Mapa może okazać się nieprawidłowa lub nieaktualna a trasy mogą nie zostać utworzone w sposób najlepszy z możliwych.\n\n  Szerokiej drogi, uważaj na siebie!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mapa + trasy";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Usuń mapę";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Dalej";
 
-"whats_new_night_caption" = "Nawigacja w trybie nocnym";
-
-"whats_new_night_body" = "Aby umożliwić korzystanie z MAPS.ME podczas prowadzenia po zmroku, dodaliśmy tryb nocny. Włącza się on automatycznie po zachodzie słońca.";
-
 "editor_time_add" = "Dodaj harmonogram";
 
 "editor_time_delete" = "Usuń harmonogram";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Ważne!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Podzieliliśmy mapy na części. Teraz możesz pobierać oddzielne regiony, zamiast całego kraju. Zanim rozpoczniesz pobieranie nowych map, usuń te stare.";
-
-"youve_been_asking" = "Prosiliście o to, więc to zrobiliśmy";
-
 /* Android uses image instead of text. */
 "download_all" = "Pobierz wszystko";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Edytuj mapy bezpośrednio w MAPS.ME";
+"please_note" = "Uwaga!";
 
-"whats_new_editor_message" = "Wprowadzone przez Ciebie zmiany pomogą milionom użytkowników. Ulepszajmy świat razem!";
+"common_no_wifi_dialog" = "Brak połączenia Wi-Fi. Czy chcesz kontynuować z użyciem danych pakietowych?";
+
+"downloader_delete_map_dialog" = "Wszystkie zmiany dotyczące mapy zostaną usunięte wraz z nią.";
+
+"downloader_update_maps" = "Aktualizuj mapy";
+
+"downloader_mwm_migration_dialog" = "Aby utworzyć trasę, należy zaktualizować wszystkie mapy, a następnie ponownie zaplanować trasę.";
+
+"downloader_search_field_hint" = "Znajdź mapę";
+
+"migration_update_all_button" = "Aktualizuj wszystkie mapy";
+
+"migration_delete_all_download_current_button" = "Pobierz bieżącą mapę i usuń stare";
+
+"migration_prefetch_status" = "Przygotowywanie aktualizacji map…";
+
+"migration_download_error_dialog" = "Błąd pobierania";
+
+"common_check_internet_connection_dialog" = "Sprawdź swoje ustawienia i upewnij się, że urządzenie ma połączenie z Internetem.";
+
+"downloader_no_space_title" = "Brak wolnego miejsca";
+
+"downloader_no_space_message" = "Usuń niepotrzebne dane";
+
+"editor_general_auth_error_dialog" = "Ogólny błąd logowania.";
+
+"editor_login_error_dialog" = "Błąd logowania.";
+
+"editor_login_failed_dialog" = "Nieudane logowanie";
+
+"editor_username_error_dialog" = "Nieprawidłowa nazwa użytkownika";
+
+"editor_place_edited_dialog" = "Obiekt był edytowany!";
+
+"editor_login_with_osm" = "Zaloguj się z OpenStreetMap";
+
+"editor_profile_changes" = "Zmiany:";
+
+"editor_profile_unsent_changes" = "Nie wysłano";
+
+"editor_focus_map_on_location" = "Przeciągnij mapę, aby wybrać poprawną lokalizację obiektu.";
+
+"editor_add_select_category" = "Wybierz kategorię";
+
+"editor_add_select_category_popular_subtitle" = "Popularne";
+
+"editor_add_select_category_all_subtitle" = "Wszystkie kategorie";
+
+"editor_edit_place_title" = "Edycja";
+
+"editor_add_place_title" = "Dodawanie";
+
+"editor_edit_place_name_hint" = "Nazwa miejsca";
+
+"editor_edit_place_category_title" = "Kategoria";
+
+"placepage_add_place_button" = "Dodaj miejsce";
+
+"placepage_report_problem_button" = "Zgłoś problem";
+
+"whatsnew_smallmwm_header" = "Prosiliście o to, więc to zrobiliśmy";
+
+"whatsnew_smallmwm_message" = "Podzieliliśmy mapy na części. Teraz możesz pobierać oddzielne regiony, zamiast całego kraju";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Znacząco usprawniliśmy wyszukiwanie po adresie. Przekonaj się sam.";
+
+"whatsnew_editor_title" = "Edytuj mapę*";
+
+"whatsnew_editor_message_1" = "Dodawaj nowe miejsca do mapy i edytuj już istniejące bezpośrednio z poziomu aplikacji.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME korzysta z danych społeczności OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Nigdy się już nie zgubisz";
+
+"onboarding_offline_navigation_message" = "Planuj optymalne trasy samochodowe i piesze, nawet gdy nie masz połączenia z Internetem!";
+
+"onboarding_offline_navigation_title_2" = "Nawigacja offline";
+
+"onboarding_offline_navigation_message_2" = "Planuj optymalne trasy samochodowe i piesze.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - mapy offline";
+
+"onboarding_offline_maps_message" = "Pobierz jednorazowo mapy dla wybranego obszaru, aby korzystać z nawigacji i wyszukiwania bez połączenia sieciowego.";
+
+"onboarding_notifications_message" = "Aby pobierać najnowsze mapy, włącz powiadomienia o aktualizacjach";
+
+"onboarding_notifications_title" = "Włącz powiadomienia o aktualizacjach";
+
+"onboarding_location_title" = "Pomaga nam znaleźć Ciebie";
+
+"onboarding_location_message" = "Abyś mógł korzystać z nawigacji i innych funkcji, musimy uzyskać dostęp do twojej geolokalizacji.";
diff --git a/iphone/Maps/pt.lproj/Localizable.strings b/iphone/Maps/pt.lproj/Localizable.strings
index 4a84eeb2ea..6d5b3ddfb1 100644
--- a/iphone/Maps/pt.lproj/Localizable.strings
+++ b/iphone/Maps/pt.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Eliminar";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Eliminar mapas antigos e continuar";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Não volte a perguntar-me";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "A minha posição";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Não foi detetada uma ligação à Internet";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Não detetada uma ligação WiFi. Pretende utilizar os dados por pacotes (GPRS, EDGE, 3G or LTE) para descarregar %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Procurar mapa";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Não há espaço livre suficiente em disco";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Toque para descarregar";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "A nova versão do MAPS.ME permite criar rotas a partir da sua posição atual para um ponto de destino. Por favor, atualize o maps para utilizar esta funcionalidade.";
 
 /* Update all button text */
-"downloader_update_all" = "Atualizar tudo";
+"downloader_update_all_button" = "Atualizar tudo";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Cancelar Tudo";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Descarregados";
+"downloader_downloaded_subtitle" = "Descarregado";
 
 /* Country queued for download */
 "downloader_queued" = "Na fila";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Perto de mim";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mapas: %s";
+
+"downloader_download_all_button" = "Descarregar tudo";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Ao criar rotas na aplicação MAPS.ME, por favor, lembre-se do seguinte:\n\n  - As rotas sugeridas podem apenas ser consideradas como recomendações.\n - As condições da estrada, regras de trânsito e sinais têm maior prioridade do que os conselhos de navegação.\n - O mapa poderá estar errado, ou desatualizado, e as rotas poderão não ser criadas da melhor forma possível.\n\n  Circule em segurança nas estradas e cuide do seu bem estar!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mapa + Criação de Trajeto";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Apagar Mapa";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Próxima";
 
-"whats_new_night_caption" = "Navegação em modo noturno";
-
-"whats_new_night_body" = "Para facilitar o uso do MAPS.ME ao dirigir no escuro, adicionamos o modo noturno. Ele é acionado automaticamente após o pôr do sol.";
-
 "editor_time_add" = "Adicionar Horário";
 
 "editor_time_delete" = "Eliminar Horário";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Importante!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Dividimos os mapas em partes. Agora vocês podem baixar regiões separadas em vez do país inteiro. Antes de começarem a baixar novos mapas, apaguem os mapas antigos.";
-
-"youve_been_asking" = "Vocês têm pedido por isso e nós atendemos";
-
 /* Android uses image instead of text. */
 "download_all" = "Baixar tudo";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefone";
 
-"whats_new_editor_caption" = "Modifique o mapa diretamente do MAPS.ME";
+"please_note" = "Por favor note";
 
-"whats_new_editor_message" = "As suas alterações vão ajudar milhões de usuários. Vamos melhorar o mundo juntos!";
+"common_no_wifi_dialog" = "Nenhuma ligação Wi-Fi. Deseja continuar com os dados móveis?";
+
+"downloader_delete_map_dialog" = "Todas as alterações ao mapa serão eliminadas juntamente com o mapa.";
+
+"downloader_update_maps" = "Atualizar mapas";
+
+"downloader_mwm_migration_dialog" = "Para criar um itinerário, é necessário atualizar todos os mapas e, em seguida, voltar a planear o itinerário.";
+
+"downloader_search_field_hint" = "Encontrar o mapa";
+
+"migration_update_all_button" = "Atualizar todos os mapas";
+
+"migration_delete_all_download_current_button" = "Descarregue o mapa atual e elimine os antigos";
+
+"migration_prefetch_status" = "A preparar a atualização de mapas…";
+
+"migration_download_error_dialog" = "Erro de download";
+
+"common_check_internet_connection_dialog" = "Por favor, verifique as suas opções e certifique-se de que o dispositivo está ligado à Internet.";
+
+"downloader_no_space_title" = "Não há espaço suficiente";
+
+"downloader_no_space_message" = "Por favor, remova os dados desnecessários";
+
+"editor_general_auth_error_dialog" = "Erro geral de início de sessão.";
+
+"editor_login_error_dialog" = "Erro de início de sessão.";
+
+"editor_login_failed_dialog" = "O início de sessão falhou";
+
+"editor_username_error_dialog" = "O nome de utilizador é inválido";
+
+"editor_place_edited_dialog" = "Editou um objeto!";
+
+"editor_login_with_osm" = "Iniciar sessão com a OpenStreetMap";
+
+"editor_profile_changes" = "Alterações:";
+
+"editor_profile_unsent_changes" = "Não enviado";
+
+"editor_focus_map_on_location" = "Puxe o mapa para selecionar o lugar correto do objeto.";
+
+"editor_add_select_category" = "Selecionar a categoria";
+
+"editor_add_select_category_popular_subtitle" = "Popular";
+
+"editor_add_select_category_all_subtitle" = "Todas as categorias";
+
+"editor_edit_place_title" = "Edição";
+
+"editor_add_place_title" = "A adicionar";
+
+"editor_edit_place_name_hint" = "Nome do lugar";
+
+"editor_edit_place_category_title" = "Categoria";
+
+"placepage_add_place_button" = "Adicionar um lugar";
+
+"placepage_report_problem_button" = "Comunicar um problema";
+
+"whatsnew_smallmwm_header" = "Vocês têm pedido por isso e nós atendemos";
+
+"whatsnew_smallmwm_message" = "Dividimos os mapas em partes. Agora vocês podem baixar regiões separadas em vez do país inteiro.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Melhoramos consideravelmente a busca por endereço. Veja você mesmo.";
+
+"whatsnew_editor_title" = "Editar o mapa*";
+
+"whatsnew_editor_message_1" = "Adicione novos lugares ao mapa e edite os já existentes diretamente a partir da app.";
+
+"whatsnew_editor_message_2" = "* A MAPS.ME utiliza dados da comunidade OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Nunca mais voltará a perder-se";
+
+"onboarding_offline_navigation_message" = "Planeie itinerários ideais de automóvel e a pé, mesmo se não houver ligação à Internet!";
+
+"onboarding_offline_navigation_title_2" = "Navegação offline";
+
+"onboarding_offline_navigation_message_2" = "Planeie itinerários ideais de automóvel e a pé.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - mapas offline";
+
+"onboarding_offline_maps_message" = "Descarregue uma vez os mapas para a área desejada e utilize as funções de navegação e de pesquisa sem uma ligação à Internet.";
+
+"onboarding_notifications_message" = "Para receber os mapas mais recentes, receba notificações de atualizações";
+
+"onboarding_notifications_title" = "Ativar as notificações de atualizações";
+
+"onboarding_location_title" = "Ajude-nos a encontrá-lo";
+
+"onboarding_location_message" = "Para utilizar a navegação e outros recursos, precisamos de aceder à sua localização geográfica.";
diff --git a/iphone/Maps/ro.lproj/Localizable.strings b/iphone/Maps/ro.lproj/Localizable.strings
index 71fd6178e8..c0b300e36a 100644
--- a/iphone/Maps/ro.lproj/Localizable.strings
+++ b/iphone/Maps/ro.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Ștergere";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Șterge hărțile vechi și continuă";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Nu mă mai întreba";
 
@@ -48,7 +45,7 @@
 "downloading_x_touch_to_cancel" = "Se descarcă %qu%%. Atingeți pentru a anula.";
 
 /* Settings/Downloader - info for country which started downloading */
-"downloading" = "Se descarcă...";
+"downloading" = "Se descarcă…";
 
 "get_it_now" = "Obțineți acum";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Poziția mea";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Nu a fost detectată nicio conexiune la internet.";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Nu a fost detectată nicio conexiune WiFi. Doriți să utilizați datele mobile (GPRS, EDGE, 3G sau LTE) pentru a descărca %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Căutare hartă";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Nu există suficient spațiu liber pe disc.";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Atingeți pentru a descărca.";
 
@@ -288,7 +279,7 @@
 "move_maps" = "Mutare hărți?";
 
 /* Ask to wait user several minutes (some long process in modal dialog). */
-"wait_several_minutes" = "Aceasta poate dura câteva minute.\nVă rugăm să așteptați...";
+"wait_several_minutes" = "Aceasta poate dura câteva minute.\nVă rugăm să așteptați…";
 
 /* Show bookmarks from this category on a map or not */
 "visible" = "Vizibil";
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Noua versiune a MAPS.ME vă permite să creați rute din poziția dvs. actuală către un punct de destinație. Vă rugăm să actualizați harta pentru a utiliza această funcție.";
 
 /* Update all button text */
-"downloader_update_all" = "Actualizare toate";
+"downloader_update_all_button" = "Actualizați toate";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Anulare toate";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Descărcate";
+"downloader_downloaded_subtitle" = "Descărcat";
 
 /* Country queued for download */
 "downloader_queued" = "în lista de așteptare";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Aproape de mine";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Hărți: %s";
+
+"downloader_download_all_button" = "Descărcați toate";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Atunci când creați rute în aplicația MAPS.ME, vă rugăm să nu uitați următoarele:\n\n- Rutele sugerate pot fi luate în considerare numai ca recomandări.\n- Harta poate fi incorectă sau neactualizată, iar rutele pot să nu fie create în cel mai bun mod posibil.\n- Condițiile de trafic, regulile și semnele de circulație au prioritate mai mare decât sugestiile de navigare.\n\nCirculați cu atenție și aveți grijă de dvs.!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Hartă + trasee";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Ștergere hartă";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Următoarea";
 
-"whats_new_night_caption" = "Navigație mod nocturn";
-
-"whats_new_night_body" = "Pentru a facilita utilizarea MAPS.ME atunci când conduceți noaptea, am adăugat modul nocturn. Acesta pornește automat după apusul soarelui.";
-
 "editor_time_add" = "Adăugare planificare";
 
 "editor_time_delete" = "Eliminare planificare";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Important!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Am împărțit hărțile în mai multe secțiuni. Acum, puteți descărca și regiuni separate, nu doar țara întreagă. Înainte de a începe să descărcați hărți noi, vă rugăm să le ștergeți pe cele vechi.";
-
-"youve_been_asking" = "Ne-ați cerut, iar noi am făcut";
-
 /* Android uses image instead of text. */
 "download_all" = "Descarcă toate";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Editează harta direct de pe MAPS.ME";
+"please_note" = "Actualizați hărțile";
 
-"whats_new_editor_message" = "Modificările tale vor ajuta milioane de utilizatori. Hai să facem lumea mai bună împreună!";
+"common_no_wifi_dialog" = "Nu există conexiune WiFi. Doriți să continuați cu conexiunea de pe mobil?";
+
+"downloader_delete_map_dialog" = "Pentru a crea un traseu, trebuie să actualizați toate hărțile, iar apoi să planificați traseul încă o dată.";
+
+"downloader_update_maps" = "Actualizați hărțile";
+
+"downloader_mwm_migration_dialog" = "Pentru a crea un traseu, trebuie să actualizați toate hărțile, iar apoi să planificați traseul încă o dată.";
+
+"downloader_search_field_hint" = "Găsiți harta";
+
+"migration_update_all_button" = "Actualizați toate hărțile";
+
+"migration_delete_all_download_current_button" = "Descărcați harta actuală și ștergeți toate hărțile vechi";
+
+"migration_prefetch_status" = "Pregătește actualizarea hărților…";
+
+"migration_download_error_dialog" = "Eroare de descărcare";
+
+"common_check_internet_connection_dialog" = "Vă rugăm să vă verificați setările și să vă asigurați că dispozitivul dvs. este conectat la Internet.";
+
+"downloader_no_space_title" = "Spațiu insuficient";
+
+"downloader_no_space_message" = "Vă rugăm să ștergeți datele care nu sunt necesare";
+
+"editor_general_auth_error_dialog" = "Eroare generală de conectare.";
+
+"editor_login_error_dialog" = "Eroare de conectare.";
+
+"editor_login_failed_dialog" = "Conectare eșuată";
+
+"editor_username_error_dialog" = "Nume de utilizator nevalid";
+
+"editor_place_edited_dialog" = "Ați editat un obiect!";
+
+"editor_login_with_osm" = "Conectați-vă cu OpenStreetMap";
+
+"editor_profile_changes" = "Modificări:";
+
+"editor_profile_unsent_changes" = "Netrimis";
+
+"editor_focus_map_on_location" = "Trageți de hartă pentru a selecta locația corectă a obiectului.";
+
+"editor_add_select_category" = "Selectați categoria";
+
+"editor_add_select_category_popular_subtitle" = "Popular";
+
+"editor_add_select_category_all_subtitle" = "Toate categoriile";
+
+"editor_edit_place_title" = "Editare";
+
+"editor_add_place_title" = "Adăugare";
+
+"editor_edit_place_name_hint" = "Denumirea locației";
+
+"editor_edit_place_category_title" = "Categorie";
+
+"placepage_add_place_button" = "Adăugați o locație";
+
+"placepage_report_problem_button" = "Raportați o problemă";
+
+"whatsnew_smallmwm_header" = "Ne-ați cerut, iar noi am făcut";
+
+"whatsnew_smallmwm_message" = "Am împărțit hărțile în mai multe secțiuni. Acum, puteți descărca și regiuni separate, nu doar țara întreagă.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Am îmbunătățit semnificativ căutarea după adresă. Convinge-te singur.";
+
+"whatsnew_editor_title" = "Editați harta*";
+
+"whatsnew_editor_message_1" = "Adăugați locuri noi pe hartă și modificați-le pe cele existente direct din aplicație.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME folosește datele comunității OpenStreetMap community.";
+
+"onboarding_offline_navigation_title" = "Niciodată nu vă veți rătăci din nou";
+
+"onboarding_offline_navigation_message" = "Planificați traseele optime cu mașina și cele pietonale, chiar dacă nu există conexiune la Internet!";
+
+"onboarding_offline_navigation_title_2" = "Navigare offline";
+
+"onboarding_offline_navigation_message_2" = "Planificați traseele optime cu mașina și cele pietonale.";
+
+"onboarding_offline_maps_title" = "MAPS.ME – hărți offline";
+
+"onboarding_offline_maps_message" = "Descărcați o dată hărțile pentru zona dorită, pentru a naviga și folosi funcțiile de căutare fără conexiune la Internet.";
+
+"onboarding_notifications_message" = "Pentru a obține cele mai recente hărți, obțineți notificările de actualizări";
+
+"onboarding_notifications_title" = "Activați notificările de actualizări";
+
+"onboarding_location_title" = "Ajutați-ne să vă găsim";
+
+"onboarding_location_message" = "Ca să puteți naviga și folosi alte funcții, trebuie să accesăm poziționarea dvs. geografică.";
diff --git a/iphone/Maps/ru.lproj/Localizable.strings b/iphone/Maps/ru.lproj/Localizable.strings
index 098989b664..75179c63ed 100644
--- a/iphone/Maps/ru.lproj/Localizable.strings
+++ b/iphone/Maps/ru.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Удалить";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Удалить старые карты и продолжить";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Больше не спрашивать";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Мое местоположение";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Отсутствует подключение к интернету";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Нет WiFi соединения. Вы хотите загрузить %@ через сотового оператора (GPRS, EDGE, 3G или LTE)?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Поиск на карте";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Нет свободного места";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Нажмите для загрузки";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "В новой версии MAPS.ME вы сможете строить маршруты от текущего местоположения до точки назначения. Чтобы воспользоваться этой функцией, обновите, пожалуйста, карты.";
 
 /* Update all button text */
-"downloader_update_all" = "Обновить все";
+"downloader_update_all_button" = "Обновить все";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Отменить все";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Загружено";
+"downloader_downloaded_subtitle" = "Загруженные";
 
 /* Country queued for download */
 "downloader_queued" = "в очереди";
 
-"downloader_near_me" = "Рядом со мной";
+"downloader_near_me_subtitle" = "Возле меня";
 
-"downloader_maps_to_update" = "Карт: %1$d (%2$s)";
+"downloader_status_maps" = "Карт: %s";
+
+"downloader_download_all_button" = "Загрузить все";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Используя маршруты в приложении MAPS.ME, пожалуйста, учитывайте следующее:\n\n  - Предлагаемые маршруты могут рассматриваться только в качестве рекомендации.\n - Дорожная обстановка, правила дорожного движения, знаки являются более приоритетными по сравнению с советами навигационной программы.\n - Карта может быть неточной или неактуальной, а предложенный маршрут не самым оптимальным.\n\n  Будьте внимательны на дорогах и берегите себя!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Карта + Маршруты";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Несохранённые правки в данном регионе также будут удалены! Продолжить?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Удалить карту";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Далее";
 
-"whats_new_night_caption" = "Ночной режим навигации";
-
-"whats_new_night_body" = "Для удобства использования MAPS.ME во время вождения автомобиля в темное время суток мы добавили ночной режим. Он запускается автоматически после захода солнца.";
-
 "editor_time_add" = "Добавить расписание";
 
 "editor_time_delete" = "Удалить расписание";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Важно!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Мы разрезали большие карты на части: теперь можно загрузить только нужную область, а не всю страну целиком. Прежде чем начать загружать маленькие карты, пожалуйста, удалите все старые.";
-
-"youve_been_asking" = "Вы долго просили — мы наконец сделали";
-
 /* Android uses image instead of text. */
 "download_all" = "Загрузить все";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Телефон";
 
-"whats_new_editor_caption" = "Редактируйте карту прямо из MAPS.ME";
+"please_note" = "Обратите внимание";
 
-"whats_new_editor_message" = "Ваши изменения помогут миллионам пользователей. Улучшим мир вместе!";
+"common_no_wifi_dialog" = "Нет WiFi соединения. Вы хотите продолжить работу через мобильный интернет?";
+
+"downloader_delete_map_dialog" = "Вместе с картой удалятся и внесенные вами правки на этой карте.";
+
+"downloader_update_maps" = "Обновите карты";
+
+"downloader_mwm_migration_dialog" = "Для построения маршрутов необходимо обновить все карты и построить маршрут заново.";
+
+"downloader_search_field_hint" = "Найти карту";
+
+"migration_update_all_button" = "Обновить все карты";
+
+"migration_delete_all_download_current_button" = "Скачать текущую и удалить все старые карты";
+
+"migration_prefetch_status" = "Подготовка обновления карт…";
+
+"migration_download_error_dialog" = "Ошибка загрузки";
+
+"common_check_internet_connection_dialog" = "Проверьте настройки и убедитесь, что устройство подключено к интернету.";
+
+"downloader_no_space_title" = "Недостаточно места";
+
+"downloader_no_space_message" = "Удалите ненужные данные";
+
+"editor_general_auth_error_dialog" = "Общая ошибка авторизации.";
+
+"editor_login_error_dialog" = "Произошла ошибка при авторизации.";
+
+"editor_login_failed_dialog" = "Войти не удалось";
+
+"editor_username_error_dialog" = "Неверное имя пользователя";
+
+"editor_place_edited_dialog" = "Вы отредактировали объект!";
+
+"editor_login_with_osm" = "Войти через OpenStreetMap";
+
+"editor_profile_changes" = "Правки:";
+
+"editor_profile_unsent_changes" = "Не отправлено";
+
+"editor_focus_map_on_location" = "Потяните карту, чтобы выбрать правильное местоположение объекта.";
+
+"editor_add_select_category" = "Выбрать категорию";
+
+"editor_add_select_category_popular_subtitle" = "Популярные";
+
+"editor_add_select_category_all_subtitle" = "Все категории";
+
+"editor_edit_place_title" = "Редактирование";
+
+"editor_add_place_title" = "Добавление";
+
+"editor_edit_place_name_hint" = "Название места";
+
+"editor_edit_place_category_title" = "Категория";
+
+"placepage_add_place_button" = "Добавить место";
+
+"placepage_report_problem_button" = "Сообщить о проблеме";
+
+"whatsnew_smallmwm_header" = "Вы долго просили — мы наконец сделали";
+
+"whatsnew_smallmwm_message" = "Мы разрезали большие карты на части: теперь загружай только нужную область, а не всю страну целиком.";
+
+"whatsnew_search_header" = "Новый поиск!";
+
+"whatsnew_search_message" = "Качественно улучшили поиск по адресам. Проверяйте.";
+
+"whatsnew_editor_title" = "Редактируйте карту*";
+
+"whatsnew_editor_message_1" = "Добавляйте новые объекты и редактируйте информацию о старых прямо из приложения.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME использует данные открытых карт сообщества OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Вы никогда больше не заблудитесь";
+
+"onboarding_offline_navigation_message" = "Прокладывайте самые оптимальные автомобильные и пешеходные маршруты даже там, где нет связи!";
+
+"onboarding_offline_navigation_title_2" = "Оффлайн навигация";
+
+"onboarding_offline_navigation_message_2" = "Прокладывайте оптимальные автомобильные и пешеходные маршруты.";
+
+"onboarding_offline_maps_title" = "MAPS.ME — оффлайн карты";
+
+"onboarding_offline_maps_message" = "Загрузите карты необходимого региона один раз и пользуйтесь навигацией и поиском без подключения к интернету.";
+
+"onboarding_notifications_message" = "Получайте уведомления об обновлениях, чтобы всегда иметь актуальные карты";
+
+"onboarding_notifications_title" = "Разрешите отправку уведомлений";
+
+"onboarding_location_title" = "Помогите найти вас";
+
+"onboarding_location_message" = "Чтобы пользоваться навигацией и другими функциями приложения, нам необходим доступ к вашей геопозиции.";
diff --git a/iphone/Maps/sk.lproj/Localizable.strings b/iphone/Maps/sk.lproj/Localizable.strings
index 1a1189a447..3bcb289d29 100644
--- a/iphone/Maps/sk.lproj/Localizable.strings
+++ b/iphone/Maps/sk.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Zmazať";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Zmazať staré mapy a pokračovať";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Už sa nepýtať";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Moja poloha";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Nenájdené pripojenie k Internetu";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Nenájdené pripojenie k WiFi. Chcete použiť mobilnú sieť (GPRS, EDGE, 3G alebo LTE) k stiahnutiu %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Prehľadať mapu";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Nedostatok voľného úložného priestoru";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Stlačte pre stiahnutie";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Nová verzia aplikácie MAPS.ME umožňuje vytvárať trasy z vašej aktuálnej polohy do cieľového bodu. Pre použitie tejto funkcie si, prosím, aktualizujte mapy.";
 
 /* Update all button text */
-"downloader_update_all" = "Aktualizovať všetky";
+"downloader_update_all_button" = "Aktualizovať všetko";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Zrušiť všetko";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Stiahnuté";
+"downloader_downloaded_subtitle" = "Stiahnuté";
 
 /* Country queued for download */
 "downloader_queued" = "V rade";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Neďaleko mňa";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Mapy: %s";
+
+"downloader_download_all_button" = "Stiahnuť všetko";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Tvorenie trás v aplikácii MAPS.ME, prosím, majte na pamäti nasledovné:\n\n  - Navrhnuté trasy možno považovať iba za odporúčanie.\n - Stav vozovky, dopravné predpisy a značenie majú vyššiu prioritu, ako navigačné rady.\n - Mapa môže byť nesprávna alebo zastaraná a trasy nemusia byť vytvorené tým najlepším možným spôsobom.\n\n  Buďte na cestách v bezpečí a postarajte sa o seba!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Mapa + Smerovanie";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Zmazať mapu";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Nasledujúca";
 
-"whats_new_night_caption" = "Navigácia v nočnom režime";
-
-"whats_new_night_body" = "Na uľahčenie použitia MAPS.ME pri jazde za tmy sme pridali nočný režim. Automaticky sa zapne po západe slnka.";
-
 "editor_time_add" = "Pridať rozvrh";
 
 "editor_time_delete" = "Zmazať rozvrh";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Dôležité!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Mapy sme rozdelili na časti. Teraz si môžete stiahnuť jednotlivé regióny, nie celú krajinu. Predtým ako si začnete sťahovať nové mapy, prosím, odstráňte staré.";
-
-"youve_been_asking" = "Dožadovali ste sa toho a my sme vám vyhoveli";
-
 /* Android uses image instead of text. */
 "download_all" = "Stiahnuť všetko";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefón";
 
-"whats_new_editor_caption" = "Upravte mapu priamo cez MAPS.ME";
+"please_note" = "Upozorňujeme vás, že";
 
-"whats_new_editor_message" = "Vaše zmeny pomôžu miliónom používateľov. Spoločne zlepšíme svet!";
+"common_no_wifi_dialog" = "Pripojenie k WiFi nie je k dispozícii. Chcete pokračovať s využitím mobilných dát?";
+
+"downloader_delete_map_dialog" = "Všetky zmeny týkajúce sa mapy budú vymazané spolu s mapou.";
+
+"downloader_update_maps" = "Aktualizovať mapy";
+
+"downloader_mwm_migration_dialog" = "Ak chcete vytvoriť cestu, musíte najskôr aktualizovať všetky mapy a potom odznova naplánovať trasu.";
+
+"downloader_search_field_hint" = "Nájsť mapu";
+
+"migration_update_all_button" = "Aktualizovať všetky mapy";
+
+"migration_delete_all_download_current_button" = "Stiahnite si aktuálnu mapu a odstráňte neaktuálne mapy";
+
+"migration_prefetch_status" = "Prebieha príprava aktualizácie máp…";
+
+"migration_download_error_dialog" = "Chyba pri sťahovaní";
+
+"common_check_internet_connection_dialog" = "Prosím, skontrolujte svoje nastavenia a uistite sa, že váš počítač je pripojený k internetu.";
+
+"downloader_no_space_title" = "Nemáte dostatok miesta";
+
+"downloader_no_space_message" = "Prosím, odstráňte prebytočné dáta";
+
+"editor_general_auth_error_dialog" = "Pri prihlasovaní sa vyskytla všeobecná chyba.";
+
+"editor_login_error_dialog" = "Pri prihlasovaní sa vyskytla chyba.";
+
+"editor_login_failed_dialog" = "Prihlasovanie bolo neúspešné";
+
+"editor_username_error_dialog" = "Používateľské meno je neplatné";
+
+"editor_place_edited_dialog" = "Práve ste upravili objekt!";
+
+"editor_login_with_osm" = "Prihlásiť sa prostredníctvom OpenStreetMap";
+
+"editor_profile_changes" = "Zmeny:";
+
+"editor_profile_unsent_changes" = "Neodoslané";
+
+"editor_focus_map_on_location" = "Ak chcete nastaviť správnu polohu objektu, posuňte mapu.";
+
+"editor_add_select_category" = "Vybrať kategóriu";
+
+"editor_add_select_category_popular_subtitle" = "Obľúbené";
+
+"editor_add_select_category_all_subtitle" = "Všetky kategórie";
+
+"editor_edit_place_title" = "Úprava";
+
+"editor_add_place_title" = "Nové";
+
+"editor_edit_place_name_hint" = "Názov miesta";
+
+"editor_edit_place_category_title" = "Kategória";
+
+"placepage_add_place_button" = "Pridať miesto";
+
+"placepage_report_problem_button" = "Nahlásiť problém";
+
+"whatsnew_smallmwm_header" = "Dožadovali ste sa toho a my sme vám vyhoveli";
+
+"whatsnew_smallmwm_message" = "Mapy sme rozdelili na časti. Teraz si môžete stiahnuť jednotlivé regióny, nie celú krajinu.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Významne sme zlepšili vyhľadávanie pomocou adresy. Pozrite sa sami.";
+
+"whatsnew_editor_title" = "Upraviť mapu*";
+
+"whatsnew_editor_message_1" = "Na mapu môžete pridávať nové miesta a upravovať tie, ktoré sú už pridané.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME využíva dáta komunity OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Už sa nikdy nestratíte";
+
+"onboarding_offline_navigation_message" = "Naplánujte si vhodné trasy na cestu autom alebo peši. Internetové pripojenie sa nevyžaduje!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigácia";
+
+"onboarding_offline_navigation_message_2" = "Naplánujte si vhodné trasy na cestu autom alebo peši.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline mapy";
+
+"onboarding_offline_maps_message" = "Stiahnite si jednorázovo potrebné mapy - navigáciu a funkcie vyhľadávania môžete využívať aj bez internetového pripojenia.";
+
+"onboarding_notifications_message" = "Ak chcete získavať najnovšie mapy, zapnite si notifikácie aktualizácií";
+
+"onboarding_notifications_title" = "Povoliť notifikácie aktualizácií";
+
+"onboarding_location_title" = "Pomôžte nám a my vás nájdeme";
+
+"onboarding_location_message" = "Ak chcete používať navigáciu a ostatné funkcie, potrebujeme prístup k vašej aktuálnej polohe.";
diff --git a/iphone/Maps/sv.lproj/Localizable.strings b/iphone/Maps/sv.lproj/Localizable.strings
index e102ff105a..738fef8e67 100644
--- a/iphone/Maps/sv.lproj/Localizable.strings
+++ b/iphone/Maps/sv.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Ta bort";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Ta bort gamla kartor och fortsätt";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Fråga mig inte igen";
 
@@ -48,7 +45,7 @@
 "downloading_x_touch_to_cancel" = "Laddar ner %qu%%, tryck för att avbryta";
 
 /* Settings/Downloader - info for country which started downloading */
-"downloading" = "Laddar ner...";
+"downloading" = "Laddar ner…";
 
 "get_it_now" = "Skaffa det nu";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Min position";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Ingen internetanslutning upptäcktes";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Ingen WiFi-anslutning upptäcktes. Vill du använda mobildata (GPRS, EDGE, 3G eller LTE) till att ladda ner %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Sök karta";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Det finns inte tillräckligt mycket ledigt utrymme på telefonen";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Trycka för att ladda ner";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Den nya versionen av MAPS.ME låter dig skapa rutter från din nuvarande position till en destinationspunkt. Uppdatera kartan för att använda den här funktionen.";
 
 /* Update all button text */
-"downloader_update_all" = "Uppdatera alla";
+"downloader_update_all_button" = "Uppdatera alla";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Avbryt alla";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Nedladdade";
+"downloader_downloaded_subtitle" = "Nedladdade";
 
 /* Country queued for download */
 "downloader_queued" = "Köade";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Nära mig";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Kartor: %s";
+
+"downloader_download_all_button" = "Ladda ned alla";
 
 /* Disclaimer message */
 "routing_disclaimer" = "När du skapar rutter i appen MAPS.ME, vänligen tänk på följande:\n\n  - Föreslagna rutter kan endast ses som rekommendationer.\n - Vägskick, trafikregler och skyltar har högre prioritet än navigeringsråd.\n - Kartan kan vara felaktig eller förlegad, och rutter skapas inte alltid på bästa tänkbara sätt.\n\n  Kör säkert på vägarna och ta hand om dig själv!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Karta + Navigering";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Radera karta";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Nästa";
 
-"whats_new_night_caption" = "Navigering i nattläge";
-
-"whats_new_night_body" = "För att underlätta användandet av MAPS.ME under mörkerkörning har vi lagt till nattläget. Det slås automatiskt på efter att solen gått ned.";
-
 "editor_time_add" = "Lägg till schema";
 
 "editor_time_delete" = "Ta bort schema";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Viktigt!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Vi har delat in kartor i delar. Nu kan du ladda ner separata regioner, inte hela landet. Innan du börjar ladda ner nya kartor, ta bort de gamla.";
-
-"youve_been_asking" = "Du har bett om det och vi har gjort det";
-
 /* Android uses image instead of text. */
 "download_all" = "Ladda ner alla";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Redigera kartan direkt från MAPS.ME";
+"please_note" = "Observera";
 
-"whats_new_editor_message" = "Dina ändringar kommer att hjälpa miljontals användare. Låt oss förbättra världen tillsammans!";
+"common_no_wifi_dialog" = "Ingen wifi-anslutning. Vill du fortsätta med mobildata?";
+
+"downloader_delete_map_dialog" = "Alla kartändringar kommer att raderas tillsammans med kartan.";
+
+"downloader_update_maps" = "Uppdatera kartor";
+
+"downloader_mwm_migration_dialog" = "För att skapa en rutt måste du uppdatera alla kartor och sedan planera rutten igen.";
+
+"downloader_search_field_hint" = "Hitta kartan";
+
+"migration_update_all_button" = "Uppdatera alla kartor";
+
+"migration_delete_all_download_current_button" = "Ladda ned senaste kartan och radera de gamla";
+
+"migration_prefetch_status" = "Förbereder kartuppdatering…";
+
+"migration_download_error_dialog" = "Nedladdningsfel";
+
+"common_check_internet_connection_dialog" = "Kontrollera dina inställningar och se till att din enhet är ansluten till internet.";
+
+"downloader_no_space_title" = "Ej tillräckligt utrymme";
+
+"downloader_no_space_message" = "Ta bort onödig data";
+
+"editor_general_auth_error_dialog" = "Allmänt fel vid inloggning.";
+
+"editor_login_error_dialog" = "Inloggningsfel.";
+
+"editor_login_failed_dialog" = "Inloggningen misslyckades";
+
+"editor_username_error_dialog" = "Användarnamnet är ogiltigt";
+
+"editor_place_edited_dialog" = "Du har redigerat ett objekt!";
+
+"editor_login_with_osm" = "Logga in med OpenStreetMap";
+
+"editor_profile_changes" = "Ändringar:";
+
+"editor_profile_unsent_changes" = "Inte skickade";
+
+"editor_focus_map_on_location" = "Dra på kartan för att välja objektets rätta plats.";
+
+"editor_add_select_category" = "Välj kategori";
+
+"editor_add_select_category_popular_subtitle" = "Populära";
+
+"editor_add_select_category_all_subtitle" = "Alla kategorier";
+
+"editor_edit_place_title" = "Redigerar";
+
+"editor_add_place_title" = "Lägger till";
+
+"editor_edit_place_name_hint" = "Namn på platsen";
+
+"editor_edit_place_category_title" = "Kategori";
+
+"placepage_add_place_button" = "Lägg till en plats";
+
+"placepage_report_problem_button" = "Rapportera ett problem";
+
+"whatsnew_smallmwm_header" = "Du har bett om det och vi har gjort det";
+
+"whatsnew_smallmwm_message" = "Vi har delat in kartor i delar. Nu kan du ladda ner separata regioner, inte hela landet.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Vi har avsevärt förbättrat sökningen på adress. Se själv.";
+
+"whatsnew_editor_title" = "Redigera kartan*";
+
+"whatsnew_editor_message_1" = "Lägg till nya platser till kartan och redigera de befintliga direkt från appen.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME använder data från OpenStreetMaps community.";
+
+"onboarding_offline_navigation_title" = "Du kommer aldrig att gå vilse igen";
+
+"onboarding_offline_navigation_message" = "Planera dina optimala bil- eller promenadrutter även när du saknar internetanslutning!";
+
+"onboarding_offline_navigation_title_2" = "Navigering offline";
+
+"onboarding_offline_navigation_message_2" = "Planera optimala bil- och promenadrutter.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - kartor offline";
+
+"onboarding_offline_maps_message" = "Ladda ned kartorna för önskat område en gång och använd funktionerna för navigering och sökning utan en internetanslutning.";
+
+"onboarding_notifications_message" = "Få avisering om uppdateringar för de senaste kartorna";
+
+"onboarding_notifications_title" = "Aktivera avisering om uppdateringar";
+
+"onboarding_location_title" = "Hjälp oss att hitta dig";
+
+"onboarding_location_message" = "För att använda navigering och andra funktioner behöver vi tillgång till din geografiska plats.";
diff --git a/iphone/Maps/th.lproj/Localizable.strings b/iphone/Maps/th.lproj/Localizable.strings
index 072e228dae..54cad853e4 100644
--- a/iphone/Maps/th.lproj/Localizable.strings
+++ b/iphone/Maps/th.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "ลบ";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "ลบแผนที่เก่าและดำเนินการต่อไป";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "อย่าถามฉันอีก";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "ตำแหน่งของฉัน";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "ไม่สามารถตรวจพบการเชื่อมต่ออินเทอร์เน็ต";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "ไม่สามารถตรวจพบการเชื่อมต่อ WiFi คุณต้องการใช้ข้อมูลโทรศัพท์มือถือ (GPRS, EDGE, 3G หรือ LTE) เพื่อดาวน์โหลด %@?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "ค้นหาแผนที่";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "มีพื้นที่ว่างในดิสก์ไม่เพียงพอ";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "แตะเพื่อดาวน์โหลด";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "เวอร์ชันใหม่ของ MAPS.ME อนุญาติให้สร้างเส้นทางจากตำแหน่งปัจจุบันของคุณไปยังจุดปลายทาง โปรดอัปเดตแผนเพื่อใช้ฟีเจอร์นี้";
 
 /* Update all button text */
-"downloader_update_all" = "อัปเดตทั้งหมด";
+"downloader_update_all_button" = "อัปเดตทั้งหมด";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "ยกเลิกทั้งหมด";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "ดาวน์โหลดเสร็จ";
+"downloader_downloaded_subtitle" = "ดาวน์โหลดแล้ว";
 
 /* Country queued for download */
 "downloader_queued" = "ต่อแถว";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "ใกล้ฉัน";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "แผนที่: %s";
+
+"downloader_download_all_button" = "ดาวน์โหลดทั้งหมด";
 
 /* Disclaimer message */
 "routing_disclaimer" = "การสร้างเส้นทางในแอป MAPS.ME มีสิ่งที่ควรทราบดังต่อไปนี้:\n\n  - พึงพิจารณาเส้นทางที่แนะนำไว้ในฐานะที่เป็นการแนะนำเท่านั้น\n - สภาพถนน กฎจราจรและป้ายมีความสำคัญมากกว่าคำแนะนำในการนำทาง\n - แผนที่อาจไม่ถูกต้องหรือล้าสมัย และอาจไม่ได้มีการสร้างเส้นทางในรูปแบบพอจะเป็นไปได้ที่ดีที่สุด\n\n  ขอให้ปลอดภัยบนท้องถนนและดูแลตัวคุณเองด้วย!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "แผนที่ + เส้นทาง";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "ลบแผนที่";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "ถัดไป";
 
-"whats_new_night_caption" = "การนำทางในโหมดกลางคืน";
-
-"whats_new_night_body" = "เราได้เพิ่มโหมดกลางคืนเพื่อส่งเสริมการใช้ MAPS.ME เมื่อคุณกำลังขับรถในสภาพมืด จะมีการเปิดใช้โหมดนี้โดยอัตโนมัติหลังจากพระอาทิตย์ตก";
-
 "editor_time_add" = "เพิ่มวัน";
 
 "editor_time_delete" = "ลบวัน";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "สำคัญ!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "เราได้แบ่งแผนที่ออกเป็นส่วน ๆ ตอนนี้คุณสามารถดาวน์โหลดภูมิภาคแยกต่างหากได้แล้ว ไม่ต้องโหลดทุกประเทศ ก่อนที่คุณจะเริ่มการดาวน์โหลดแผนที่ใหม่ ขอความกรุณาลบแผนที่อันเก่าออกไปก่อน";
-
-"youve_been_asking" = "คุณได้ขอมา เราจึงทำมัน";
-
 /* Android uses image instead of text. */
 "download_all" = "ดาวน์โหลดทั้งหมด";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "โทรศัพท์";
 
-"whats_new_editor_caption" = "แก้ไขแผนที่โดยตรงจาก MAPS.ME";
+"please_note" = "โปรดทราบ";
 
-"whats_new_editor_message" = "การแก้ไขของคุณจะช่วยผู้ใช้หลายล้านคนได้ มาช่วยทำให้โลกน่าอยู่ขึ้น!";
+"common_no_wifi_dialog" = "ไม่มีการเชื่อมต่อ WiFi คุณต้องการดำเนินการต่อโดยใช้ข้อมูลมือถือหรือไม่?";
+
+"downloader_delete_map_dialog" = "การเปลี่ยนแปลงแผนที่ทั้งหมดจะถูกลบไปพร้อมกับแผนที่";
+
+"downloader_update_maps" = "อัปเดตแผนที่";
+
+"downloader_mwm_migration_dialog" = "ในการสร้างเส้นทาง คุณต้องอัปเดตแผนที่ทั้งหมดแล้ววางแผนเส้นทางอีกครั้ง";
+
+"downloader_search_field_hint" = "ค้นหาแผนที่";
+
+"migration_update_all_button" = "อัปเดตแผนที่ทั้งหมด";
+
+"migration_delete_all_download_current_button" = "ดาวน์โหลดแผนที่ปัจจุบันและลบแผนที่เก่า";
+
+"migration_prefetch_status" = "กำลังเตรียมการอัปเดตแผนที่…";
+
+"migration_download_error_dialog" = "ข้อผิดพลาดในการดาวน์โหลด";
+
+"common_check_internet_connection_dialog" = "กรุณาตรวจสอบการตั้งค่าของคุณแล้วทำให้แน่ใจว่าอุปกรณ์ของคุณได้รับการเชื่อมต่ออินเทอร์เน็ต";
+
+"downloader_no_space_title" = "มีพื้นที่ไม่เพียงพอ";
+
+"downloader_no_space_message" = "กรุณาลบข้อมูลที่ไม่จำเป็น";
+
+"editor_general_auth_error_dialog" = "ข้อผิดพลาดในการล็อกอินทั่วไป";
+
+"editor_login_error_dialog" = "ข้อผิดพลาดในการล็อกอิน";
+
+"editor_login_failed_dialog" = "การล็อกอินล้มเหลว";
+
+"editor_username_error_dialog" = "ชื่อผู้ใช้ไม่ถูกต้อง";
+
+"editor_place_edited_dialog" = "คุณได้แก้ไขวัตถุ!";
+
+"editor_login_with_osm" = "ล็อกอินด้วย OpenStreetMap";
+
+"editor_profile_changes" = "การเปลี่ยนแปลง:";
+
+"editor_profile_unsent_changes" = "ไม่ได้ส่ง";
+
+"editor_focus_map_on_location" = "ดึงแผนที่เพื่อเลือกตำแหน่งวัตถุที่ถูกต้อง";
+
+"editor_add_select_category" = "เลือกหมวดหมู่";
+
+"editor_add_select_category_popular_subtitle" = "ยอดนิยม";
+
+"editor_add_select_category_all_subtitle" = "หมวดหมูทั้งหมด";
+
+"editor_edit_place_title" = "กำลังแก้ไข";
+
+"editor_add_place_title" = "กำลังเพิ่ม";
+
+"editor_edit_place_name_hint" = "ชื่อสถานที่";
+
+"editor_edit_place_category_title" = "หมวดหมู่";
+
+"placepage_add_place_button" = "เพิ่มสถานที่";
+
+"placepage_report_problem_button" = "แจ้งปัญหา";
+
+"whatsnew_smallmwm_header" = "คุณได้ขอมา เราจึงทำมัน";
+
+"whatsnew_smallmwm_message" = "เราได้แบ่งแผนที่ออกเป็นส่วน ๆ ตอนนี้คุณสามารถดาวน์โหลดภูมิภาคแยกต่างหากได้แล้ว";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "เราได้ปรับปรุงครั้งใหญ่สำหรับการค้นหาตามที่อยู่ ลองดูด้วยตัวเอง";
+
+"whatsnew_editor_title" = "แก้ไขแผนที่*";
+
+"whatsnew_editor_message_1" = "เพิ่มสถานที่ใหม่ ๆ ไปยังแผนที่ และแก้ไขสถานที่ที่มีอยู่เดิมจากแอปโดยตรง";
+
+"whatsnew_editor_message_2" = "* MAPS.ME ใช้ข้อมูลจากชุมชน OpenStreetMap";
+
+"onboarding_offline_navigation_title" = "คุณจะไม่หลงทางอีกต่อไป";
+
+"onboarding_offline_navigation_message" = "วางแผนเส้นทางรถยนต์และเส้นทางเดินที่เหมาะสมที่สุด แม้ว่าจะไม่มีการเชื่อมต่ออินเทอร์เน็ต!";
+
+"onboarding_offline_navigation_title_2" = "การนำทางออฟไลน์";
+
+"onboarding_offline_navigation_message_2" = "วางแผนเส้นทางรถยนต์และเส้นทางเดินที่เหมาะสมที่สุด";
+
+"onboarding_offline_maps_title" = "MAPS.ME - แผนที่ออฟไลน์";
+
+"onboarding_offline_maps_message" = "ดาวน์โหลดแผนที่สำหรับพื้นที่ที่ต้องการเพียงหนึ่งครั้ง แล้วใช้การฟังก์ชันการนำทางและการค้นหาโดยไม่ต้องเชื่อมต่ออินเทอร์เน็ต";
+
+"onboarding_notifications_message" = "เพื่อรับแผนที่ล่าสุดและรับการแจ้งเตือนอัปเดต";
+
+"onboarding_notifications_title" = "เปิดการแจ้งเตือนการอัปเดต";
+
+"onboarding_location_title" = "ช่วยให้เราค้นหาคุณ";
+
+"onboarding_location_message" = "เพื่อใช้การนำทางและฟีเจอร์อื่น ๆ เราต้องการเข้าถึงตำแหน่งทางภูมิศาสตร์ของคุณ";
diff --git a/iphone/Maps/tr.lproj/Localizable.strings b/iphone/Maps/tr.lproj/Localizable.strings
index 6a1654807d..6358212982 100644
--- a/iphone/Maps/tr.lproj/Localizable.strings
+++ b/iphone/Maps/tr.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Sil";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Eski haritaları sil ve ilerle";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Bunu tekrar sorma";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Konumum";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "İnternet bağlantısı bulunamadı";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "WiFi bağlantısı bulunamadı. %@ indirmek için hücresel veri (GPRS, EDGE, 3G veya LTE) kullanmak ister misiniz?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Haritada Ara";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Yeterli boş disk alanı yok";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "İndirmek için dokunun";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "MAPS.ME'nin yeni sürümü mevcut pozisyonunuzdan varış noktasına rotalar oluşturmanıza imkan verir. Lütfen bu özelliği kullanmak için haritaları güncelleyin.";
 
 /* Update all button text */
-"downloader_update_all" = "Tümünü güncelle";
+"downloader_update_all_button" = "Hepsini güncelle";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Tümünü İptal Et";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "İndirilenler";
+"downloader_downloaded_subtitle" = "İndirildi";
 
 /* Country queued for download */
 "downloader_queued" = "sıraya alındı";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Yakınlarımda";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Haritalar: %s";
+
+"downloader_download_all_button" = "Hepsini indir";
 
 /* Disclaimer message */
 "routing_disclaimer" = "MAPS.ME uygulamasında rota yaratırken lütfen aşağıdakileri dikkate alın:\n\n  - Önerilen rotalar sadece tavsiyeler olarak düşünülmelidir.\n - Yol koşulları, trafik kuralları ve işaretleri navigasyon tavsiyelerden daha önceliklidir.\n - Harita doğru olmayabilir ya da eskimiş olabilir ve rotalar en iyi mümkün yola göre oluşturulmamış olabilir.\n\n  Yollarda güvende olun ve kendinize dikkat edin!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Harita + Rota";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Haritayı Sil";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Sonraki";
 
-"whats_new_night_caption" = "Gece modu navigasyon";
-
-"whats_new_night_body" = "Karanlıkta sürerken MAPS.ME kullanmayı kolaylaştırmak için gece modunu ekledik. Gün batımından sonra otomatik olarak devreye girer.";
-
 "editor_time_add" = "Plan Ekle";
 
 "editor_time_delete" = "Planı Sil";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Önemli!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Haritaları parçalara ayırdık. Artık tüm ülke yerine belirli bölgeleri indirebilirsiniz. Yeni haritaları indirmeden önce lütfen eski haritaları kaldırın.";
-
-"youve_been_asking" = "Siz istediniz biz yaptık";
-
 /* Android uses image instead of text. */
 "download_all" = "Tümünü indir";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Telefon";
 
-"whats_new_editor_caption" = "Haritayı doğrudan MAPS.ME'den düzenleyin";
+"please_note" = "Lütfen dikkat";
 
-"whats_new_editor_message" = "Değişiklikleriniz milyonlarca kullanıcıya yardımcı olacaktır. Haydi dünyayı birlikte geliştirelim!";
+"common_no_wifi_dialog" = "WiFi bağlantısı yok. Mobil veri ile devam etmek istiyor musunuz?";
+
+"downloader_delete_map_dialog" = "Harita ile birlikte tüm harita değişiklikleri de silinecektir.";
+
+"downloader_update_maps" = "Haritaları güncelle";
+
+"downloader_mwm_migration_dialog" = "Bir rota oluşturmak için tüm haritaları güncellemeli ve ardından rotayı tekrar planlamalısınız.";
+
+"downloader_search_field_hint" = "Harita bul";
+
+"migration_update_all_button" = "Haritaları güncelle";
+
+"migration_delete_all_download_current_button" = "Mevcut haritayı indir ve tüm eski haritaları sil";
+
+"migration_prefetch_status" = "Harita güncellemesi hazırlanıyor…";
+
+"migration_download_error_dialog" = "İndirme hatası";
+
+"common_check_internet_connection_dialog" = "Lütfen ayarlarınızı kontrol edin ve cihazınızın internete bağlı olduğundan emin olun.";
+
+"downloader_no_space_title" = "Yeterli alan yok";
+
+"downloader_no_space_message" = "Lütfen gereksiz verileri silin";
+
+"editor_general_auth_error_dialog" = "Genel giriş hatası.";
+
+"editor_login_error_dialog" = "Giriş hatası";
+
+"editor_login_failed_dialog" = "Giriş başarısız";
+
+"editor_username_error_dialog" = "Kullanıcı adı geçersiz";
+
+"editor_place_edited_dialog" = "Bir objeyi düzenlediniz'!";
+
+"editor_login_with_osm" = "OpenStreetMap ile giriş yapın";
+
+"editor_profile_changes" = "Değişiklikler:";
+
+"editor_profile_unsent_changes" = "Gönderilmedi";
+
+"editor_focus_map_on_location" = "Objenin doğru konumunu seçmek için haritayı çekin.";
+
+"editor_add_select_category" = "Kategori seç";
+
+"editor_add_select_category_popular_subtitle" = "Popüler";
+
+"editor_add_select_category_all_subtitle" = "Tüm kategoriler";
+
+"editor_edit_place_title" = "Düzenleme";
+
+"editor_add_place_title" = "Ekleme";
+
+"editor_edit_place_name_hint" = "Yerin ismi";
+
+"editor_edit_place_category_title" = "Kategori";
+
+"placepage_add_place_button" = "Bir yer ekle";
+
+"placepage_report_problem_button" = "Bir problem bildirin";
+
+"whatsnew_smallmwm_header" = "Siz istediniz biz yaptık";
+
+"whatsnew_smallmwm_message" = "Haritaları parçalara ayırdık. Artık tüm ülke yerine belirli bölgeleri indirebilirsiniz.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Adres ile aramayı önemli ölçüde geliştirdik. Kendiniz görün.";
+
+"whatsnew_editor_title" = "Haritayı düzenleyin*";
+
+"whatsnew_editor_message_1" = "Doğrudan uygulamadan haritaya yeni yerler ekle ve mevcut yerleri düzenleyin.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME, OpenStreetMap topluluğu verilerini kullanmaktadır.";
+
+"onboarding_offline_navigation_title" = "Bir daha asla kaybolmayacaksınız";
+
+"onboarding_offline_navigation_message" = "En iyi araba ve yaya rotalarını planlayın, hatta internet bağlantısı olmadığında bile!";
+
+"onboarding_offline_navigation_title_2" = "Farklı bir problem";
+
+"onboarding_offline_navigation_message_2" = "En iyi araba ve yaya rotalarını planlayın.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - çevrimdışı haritalar";
+
+"onboarding_offline_maps_message" = "İlk önce istenilen alanın haritasını indirin ve internet bağlantısı olmadan navigasyonu ve arama fonksiyonlarını kullanın.";
+
+"onboarding_notifications_message" = "En son haritaları almak için güncelleme bildirimlerini alın";
+
+"onboarding_notifications_title" = "Güncelleme bildirimlerini etkinleştir";
+
+"onboarding_location_title" = "Sizi bulmamıza yardım edin";
+
+"onboarding_location_message" = "Navigasyon ve diğer özellikleri kullanmak için konum belirlemenize erişmeye ihtiyacımız var.";
diff --git a/iphone/Maps/uk.lproj/Localizable.strings b/iphone/Maps/uk.lproj/Localizable.strings
index 9ccd4d37f9..492096a69e 100644
--- a/iphone/Maps/uk.lproj/Localizable.strings
+++ b/iphone/Maps/uk.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Видалити";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Видалити старі карти та продовжити";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Більше не питати";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Моє місце розташування";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Відсутнє підключення до інтернету";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Відсутнє WiFi з'єднання. Ви бажаєте завантажити %@ через стільникового оператора (GPRS, EDGE, 3G або LTE)?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Пошук на картi";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Немає вільного місця";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Натисніть для завантаження";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "В новій версії MAPS.ME ви зможете прокладати маршрут від поточного місця перебування до точки призначення. Щоб скористатися цією функцією, будь ласка, оновіть карти.";
 
 /* Update all button text */
-"downloader_update_all" = "Оновити все";
+"downloader_update_all_button" = "Оновити всі";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Скасувати всі";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Завантажено";
+"downloader_downloaded_subtitle" = "Завантажено";
 
 /* Country queued for download */
 "downloader_queued" = "в черзі";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Поблизу";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Карти: %s";
+
+"downloader_download_all_button" = "Завантажити всі";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Використовуючи маршрути в програмі MAPS.ME, будь ласка, враховуйте наступне:\n\n  - Пропоновані маршрути можуть розглядатися тільки в якості рекомендації.\n - Дорожні умови, правила дорожнього руху, знаки являються більш пріоритетними в порівнянні з порадами навігаційної програми.\n - Карта може бути неточною або неактуальною , а запропонований маршрут не найоптимальнішим.\n\n  Будьте уважні на дорозі та бережіть себе!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Мапа + Маршрути";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Видалити мапу";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Далі";
 
-"whats_new_night_caption" = "Нічний режим навігації";
-
-"whats_new_night_body" = "Для зручності використання MAPS.ME під час водіння автомобіля в темну пору доби ми додали нічний режим. Він запускається автоматично після заходу сонця.";
-
 "editor_time_add" = "Додати розклад";
 
 "editor_time_delete" = "Видалити розклад";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Важливо!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Ми поділили великі мапи на частини: тепер можна завантажити необхідну область окремо від всієї країни. Перед тим як розпочати завантажувати зменьшені мапи, будь ласка, видаліть всі старі.";
-
-"youve_been_asking" = "Ви просили і ми це зробили";
-
 /* Android uses image instead of text. */
 "download_all" = "Завантажити всі";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Телефон";
 
-"whats_new_editor_caption" = "Редагуйте карту відразу з MAPS.ME";
+"please_note" = "Будь ласка, зверніть увагу";
 
-"whats_new_editor_message" = "Ваші зміни допоможуть мільйонам користувачів. Вдосконалимо світ разом!";
+"common_no_wifi_dialog" = "Немає WiFi з’єднання. Ви бажаєте продовжити роботу через мобільний інтернет?";
+
+"downloader_delete_map_dialog" = "Разом з мапою будуть видалені й внесені Вами правки на цій мапі.";
+
+"downloader_update_maps" = "Оновити мапи";
+
+"downloader_mwm_migration_dialog" = "Для побудови маршруту необхідно оновити усі мапи та побудувати маршрут заново.";
+
+"downloader_search_field_hint" = "Знайти карту";
+
+"migration_update_all_button" = "Оновити всі карти";
+
+"migration_delete_all_download_current_button" = "Завантажте поточну карту і видаліть старі";
+
+"migration_prefetch_status" = "Підготовка до оновлення карт…";
+
+"migration_download_error_dialog" = "Помилка завантаження";
+
+"common_check_internet_connection_dialog" = "Будь ласка, перевірте свої налаштування і переконайтеся, що ваш пристрій підлючено до Інтернету.";
+
+"downloader_no_space_title" = "Недостатньо місця";
+
+"downloader_no_space_message" = "Видаліть непотрібні дані";
+
+"editor_general_auth_error_dialog" = "Загальна помилка входу.";
+
+"editor_login_error_dialog" = "Виникла помилка при авторизації.";
+
+"editor_login_failed_dialog" = "Помилка входу";
+
+"editor_username_error_dialog" = "Ім'я користувача є недійсним";
+
+"editor_place_edited_dialog" = "Ви відредагували об’єкт!";
+
+"editor_login_with_osm" = "Увійти через OpenStreetMap";
+
+"editor_profile_changes" = "Правки:";
+
+"editor_profile_unsent_changes" = "Не відправлено";
+
+"editor_focus_map_on_location" = "Потягніть мапу, щоб вибрати правильне місцезнаходження об’єкту.";
+
+"editor_add_select_category" = "Вибрати категорію";
+
+"editor_add_select_category_popular_subtitle" = "Популярні";
+
+"editor_add_select_category_all_subtitle" = "Усі категорії";
+
+"editor_edit_place_title" = "Редагування";
+
+"editor_add_place_title" = "Додовання";
+
+"editor_edit_place_name_hint" = "Назва місця";
+
+"editor_edit_place_category_title" = "Категорія";
+
+"placepage_add_place_button" = "Додати місце";
+
+"placepage_report_problem_button" = "Повідомити про проблему";
+
+"whatsnew_smallmwm_header" = "Ви просили і ми це зробили";
+
+"whatsnew_smallmwm_message" = "Ми поділили карти на частини. Тепер ви можете стягувати окремі регіони, а не країну цілком.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Якісно покращили пошук по адресам. Перевірте.";
+
+"whatsnew_editor_title" = "Редагувати карту*";
+
+"whatsnew_editor_message_1" = "Додати нові місця до карти і редагувати існуючі місця прямо з програми.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME використовує дані спільноти OpenStreetMap.";
+
+"onboarding_offline_navigation_title" = "Ви ніколи не загубитеся знову";
+
+"onboarding_offline_navigation_message" = "Плануйте оптимальні маршрути для поїздок і піших походів навіть без Інтернет з'єднання!";
+
+"onboarding_offline_navigation_title_2" = "Офлайн навігація";
+
+"onboarding_offline_navigation_message_2" = "Плануйте оптимальні маршрути для поїздок і піших походів.";
+
+"onboarding_offline_maps_title" = "MAPS.ME — офлайн мапи";
+
+"onboarding_offline_maps_message" = "Завантажте мапи необхідного регіону один раз та користуйтесь навігацією та пошуком без підключення до інтернету.";
+
+"onboarding_notifications_message" = "Отримуйте повідомлення про оновлення, щоб завжди мати актуальні мапи";
+
+"onboarding_notifications_title" = "Дозвольте відправлення повідомлень";
+
+"onboarding_location_title" = "Допоможіть знайти вас";
+
+"onboarding_location_message" = "Щоб користуватися навігацією та іншими функціями додатку, нам необхідний доступ до вашого місцезнаходження.";
diff --git a/iphone/Maps/vi.lproj/Localizable.strings b/iphone/Maps/vi.lproj/Localizable.strings
index 0e4c13248c..b80dfc1c87 100644
--- a/iphone/Maps/vi.lproj/Localizable.strings
+++ b/iphone/Maps/vi.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "Xóa";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "Xóa bản đồ cũ và tiếp tục";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "Không hỏi tôi một lần nữa";
 
@@ -48,7 +45,7 @@
 "downloading_x_touch_to_cancel" = "Đang tải xuống %qu%%, chạm để hủy bỏ";
 
 /* Settings/Downloader - info for country which started downloading */
-"downloading" = "Đang tải xuống...";
+"downloading" = "Đang tải xuống…";
 
 "get_it_now" = "Tải xuống ngay";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "Vị trí của Tôi";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "Không có kết nối Internet";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "Không có kết nối WiFi. Bạn có muốn sử dụng dữ liệu di động (GPRS, EDGE, 3G hoặc LTE) để tải xuống %@ không?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "Tìm kiếm Bản đồ";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "Không có đủ dung lượng trống trên ổ đĩa";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "Chạm để tải xuống";
 
@@ -589,7 +580,7 @@
 "routes" = "Tuyến đường";
 
 /* Show on first launch. */
-"maps_licence_info" = "Ứng dụng này sử dụng dữ liệu địa lý (bao gồm bản đồ, thông tin doanh nghiệp, các điểm lưu tâm, biên giới quốc gia và khu vực, v.v...) lấy từ dự án OpenStreetMap. Chúng tôi không đảm bảo bất kỳ sự nhất quán, chính xác, toàn vẹn hay phù hợp nào từ các dữ liệu OpenStreetMap.";
+"maps_licence_info" = "Ứng dụng này sử dụng dữ liệu địa lý (bao gồm bản đồ, thông tin doanh nghiệp, các điểm lưu tâm, biên giới quốc gia và khu vực, v.v…) lấy từ dự án OpenStreetMap. Chúng tôi không đảm bảo bất kỳ sự nhất quán, chính xác, toàn vẹn hay phù hợp nào từ các dữ liệu OpenStreetMap.";
 
 /* Show on first launch. */
 "agree" = "Tôi đồng ý";
@@ -673,7 +664,7 @@
 "about_description" = "Joined efforts of Mail.Ru Group and OpenStreetMap make the most useful application for travelers!";
 
 /* About text */
-"about_text" = "MAPS.ME cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, MAPS.ME vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v... gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện MAPS.ME. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@maps.me. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích MAPS.ME và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về MAPS.ME với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại http://openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng MAPS.ME ở phiên bản kế tiếp.";
+"about_text" = "MAPS.ME cung cấp bản đồ ngoại tuyến của tất cả các thành phố và quốc gia trên thế giới một cách nhanh nhất. Hoàn toàn tự tin đi du lịch: dù bạn ở đâu, MAPS.ME vẫn sẽ giúp bạn định vị bản thân trên bản đồ, tìm các nhà hàng, khách sạn, ngân hàng, trạm xăng, v.v… gần nhất. Ứng dụng này không yêu cầu kết nối Internet.\n\nChúng tôi luôn phát triển các tính năng mới và rất chào đón ý kiến của bạn về cách mà chúng tôi có thể cải thiện MAPS.ME. Nếu bạn có bất cứ vấn đề nào với ứng dụng, hãy liên hệ với chúng tôi qua địa chỉ support@maps.me. Chúng tôi sẽ trả lời mọi yêu cầu!\n\nBạn có thích MAPS.ME và muốn hỗ trợ chúng tôi hay không? Sau đây là một số cách đơn giản và hoàn toàn miễn phí:\n\n- viết đánh giá trên Chợ Ứng dụng mà bạn sử dụng\n- thích trang Facebook của chúng tôi http://www.facebook.com/mapswithme\n- hoặc chỉ đơn giản là kể về MAPS.ME với mẹ, bạn bè và đồng nghiệp của bạn :)\n\nCảm ơn bạn đã ủng hộ chúng tôi. Chúng tôi rất cảm ơn sự giúp đỡ của bạn!\n\nT.B. Chúng tôi lấy dữ liệu bản đồ từ OpenStreetMap, một dự án bản đồ tương đương với Wikipedia, cho phép người dùng có thể tạo và sửa bản đồ. Nếu bạn thấy có thông tin bị thiếu hoặc sai trên bản đồ, bạn có thể sửa trực tiếp tại http://openstreetmap.org, và các thay đổi của bạn sẽ xuất hiện trong ứng dụng MAPS.ME ở phiên bản kế tiếp.";
 
 /* Alert text */
 "email_error_body" = "Trình khách email này chưa được thiết lập. Bạn vui lòng cấu hình nó hoặc sử dụng một cách khác để liên hệ với chúng tôi tại %@";
@@ -694,20 +685,22 @@
 "routing_update_maps" = "Phiên bản MAPS.ME mới cho phép tạo các tuyến đường từ vị trí hiện tại của bạn đến điểm đến. Vui lòng cập nhật bản đồ để sử dụng tính năng này.";
 
 /* Update all button text */
-"downloader_update_all" = "Cập nhật tất cả";
+"downloader_update_all_button" = "Update All";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "Hủy tất cả";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "Đã tải xuống";
+"downloader_downloaded_subtitle" = "Downloaded";
 
 /* Country queued for download */
 "downloader_queued" = "đã xếp hàng chờ";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "Near me";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "Maps: %s";
+
+"downloader_download_all_button" = "Download All";
 
 /* Disclaimer message */
 "routing_disclaimer" = "Tạo các tuyến đường trong ứng dụng MAPS.ME, xin lưu ý điều sau:\n\n – Các tuyến đường được gợi ý chỉ có thể được xem là đề xuất.\n – Điều kiện con đường, luật giao thông và biển báo có mức ưu tiên cao hơn lời khuyên dẫn hướng.\n – Bản đồ có thể không chính xác hoặc lỗi thời, tuyến đường có thể không được tạo theo cách tốt nhất có thể.\n\n Hãy lái xe an toàn trên đường và bảo trọng!";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "Bản đồ + Định tuyến";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "Xóa Bản đồ";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "Tiếp theo";
 
-"whats_new_night_caption" = "Điều hướng chế độ ban đêm";
-
-"whats_new_night_body" = "Để tạo điều kiện sử dụng MAPS.ME khi lái xe trong đêm tối, chúng tôi đã thêm chế độ ban đêm. Nó tự động mở sau khi mặt trời lặn.";
-
 "editor_time_add" = "Thêm lịch biểu";
 
 "editor_time_delete" = "Xóa lịch biểu";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "Quan trọng!";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "Chúng tôi đã chia bản đồ thành nhiều phần. Bây giờ bạn có thể tải về các vùng riêng biệt, không phải là toàn bộ quốc gia. Trước khi bạn bắt đầu tải những bản đồ mới, hãy loại bỏ những cái cũ.";
-
-"youve_been_asking" = "Bạn đã yêu cầu điều đó và chúng tôi đã thực hiện nó";
-
 /* Android uses image instead of text. */
 "download_all" = "Tải về tất cả";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "Điện thoại";
 
-"whats_new_editor_caption" = "Chỉnh sửa bản đồ trực tiếp từ MAPS.ME";
+"please_note" = "Please note";
 
-"whats_new_editor_message" = "Thay đổi của bạn sẽ giúp cho hàng triệu người dùng. Hãy cùng nhau cải thiện thế giới!";
+"common_no_wifi_dialog" = "No WiFi connection. Do you want to continue with mobile data?";
+
+"downloader_delete_map_dialog" = "All map edits will be deleted together with the map.";
+
+"downloader_update_maps" = "Update Maps";
+
+"downloader_mwm_migration_dialog" = "To create a route, you need to update all maps and then plan the route again.";
+
+"downloader_search_field_hint" = "Find the map";
+
+"migration_update_all_button" = "Update All Maps";
+
+"migration_delete_all_download_current_button" = "Download current map and delete the old ones";
+
+"migration_prefetch_status" = "Preparing maps update…";
+
+"migration_download_error_dialog" = "Download error";
+
+"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the internet.";
+
+"downloader_no_space_title" = "Not enough space";
+
+"downloader_no_space_message" = "Please, remove unnecessary data";
+
+"editor_general_auth_error_dialog" = "General login error.";
+
+"editor_login_error_dialog" = "Login error.";
+
+"editor_login_failed_dialog" = "Login failed";
+
+"editor_username_error_dialog" = "Username is invalid";
+
+"editor_place_edited_dialog" = "You’ve edited an object!";
+
+"editor_login_with_osm" = "Login with OpenStreetMap";
+
+"editor_profile_changes" = "Edits:";
+
+"editor_profile_unsent_changes" = "Not sent";
+
+"editor_focus_map_on_location" = "Pull the map to select the correct location of the object.";
+
+"editor_add_select_category" = "Select category";
+
+"editor_add_select_category_popular_subtitle" = "Popular";
+
+"editor_add_select_category_all_subtitle" = "All Categories";
+
+"editor_edit_place_title" = "Editing";
+
+"editor_add_place_title" = "Adding";
+
+"editor_edit_place_name_hint" = "Name of the place";
+
+"editor_edit_place_category_title" = "Category";
+
+"placepage_add_place_button" = "Add a place";
+
+"placepage_report_problem_button" = "Report a problem";
+
+"whatsnew_smallmwm_header" = "Bạn đã yêu cầu điều đó và chúng tôi đã thực hiện nó";
+
+"whatsnew_smallmwm_message" = "Chúng tôi đã chia bản đồ thành nhiều phần. Bây giờ bạn có thể tải về các vùng riêng biệt, không phải là toàn bộ quốc gia.";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "Chúng tôi đã cải thiện đáng kể việc tìm kiếm theo địa chỉ. Bạn hãy tự xem thử.";
+
+"whatsnew_editor_title" = "Edit the map*";
+
+"whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
+
+"whatsnew_editor_message_2" = "* MAPS.ME uses OpenStreetMap community data.";
+
+"onboarding_offline_navigation_title" = "You will never get lost again";
+
+"onboarding_offline_navigation_message" = "Plan optimal car and pedestrian routes, even if there is no internet connection!";
+
+"onboarding_offline_navigation_title_2" = "Offline navigation";
+
+"onboarding_offline_navigation_message_2" = "Plan optimal car and pedestrian routes.";
+
+"onboarding_offline_maps_title" = "MAPS.ME - offline maps";
+
+"onboarding_offline_maps_message" = "Download the maps for the desired area once, and use the navigation and search functions without an internet connection.";
+
+"onboarding_notifications_message" = "To receive the latest maps, get updates notifications";
+
+"onboarding_notifications_title" = "Enable updates notifications";
+
+"onboarding_location_title" = "Help us find you";
+
+"onboarding_location_message" = "To use navigation and other features, we need access to your geolocation.";
diff --git a/iphone/Maps/zh-Hans.lproj/Localizable.strings b/iphone/Maps/zh-Hans.lproj/Localizable.strings
index 6d2421e664..a6a76e1443 100644
--- a/iphone/Maps/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hans.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "删除";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "删除旧地图，然后继续";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "不要再问我";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "我的位置";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "未检测到互联网连接";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "未检测到 WiFi 连接。您想使用蜂窝数据 (GPRS, EDGE, 3G 或 LTE)下载%@吗?";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "搜索地图";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "没有足够的可用磁盘空间";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "轻触下载";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "使用新版本的MAPS.ME可以创建从您的当前位置至一个目的地的路线。请更新地图以使用该功能。";
 
 /* Update all button text */
-"downloader_update_all" = "更新全部";
+"downloader_update_all_button" = "更新全部";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "全部取消";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "已下载";
+"downloader_downloaded_subtitle" = "已下载";
 
 /* Country queued for download */
 "downloader_queued" = "已排队";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "在我附近";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "地图： %s";
+
+"downloader_download_all_button" = "下载全部";
 
 /* Disclaimer message */
 "routing_disclaimer" = "在MAPS.ME应用中制定路线时请谨记以下 几点：\n\n  - 建议路线仅可当作推荐路线。\n - 路况、交通规则以及标志应优先于导航建议。\n - 地图可能会不正确或者过时，路线也可能不是以最佳可能方式制定的。\n\n  行车安全，请照顾好您自己！";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "地图 + 布置路线";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "删除地图";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "下一页";
 
-"whats_new_night_caption" = "夜间模式导航";
-
-"whats_new_night_body" = "为了便于天黑行驶时使用MAPS.ME，我们增加了夜间模式。该模式在日落之后会自动开启。";
-
 "editor_time_add" = "添加计划";
 
 "editor_time_delete" = "删除计划";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "重要！";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "我们将地图分成了几部分。现在，您可以下载独立的区域，而不是整个国家。在开始下载新地图前，请删除旧地图。";
-
-"youve_been_asking" = "我们满足了您一直以来的要求";
-
 /* Android uses image instead of text. */
 "download_all" = "下载所有";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "电话";
 
-"whats_new_editor_caption" = "直接从MAPS.ME编辑地图";
+"please_note" = "请注意";
 
-"whats_new_editor_message" = "您的修改将帮助上百万用户。让我们一起让世界变好！";
+"common_no_wifi_dialog" = "无WiFi连接。您想继续使用移动数据进行连接吗？";
+
+"downloader_delete_map_dialog" = "所有对地图的修改都将与地图一起被删除。";
+
+"downloader_update_maps" = "更新地图";
+
+"downloader_mwm_migration_dialog" = "为了创建路线，您需要更新全部地图并重新规划路线。";
+
+"downloader_search_field_hint" = "找到地图";
+
+"migration_update_all_button" = "更新全部地图";
+
+"migration_delete_all_download_current_button" = "下载当前地图并删除旧地图";
+
+"migration_prefetch_status" = "正在准备地图更新…";
+
+"migration_download_error_dialog" = "下载错误";
+
+"common_check_internet_connection_dialog" = "请检查您的设置并确保您的设备已连接至网络。";
+
+"downloader_no_space_title" = "无足够的空间";
+
+"downloader_no_space_message" = "请删除不必要的数据";
+
+"editor_general_auth_error_dialog" = "一般登录错误。";
+
+"editor_login_error_dialog" = "登录错误。";
+
+"editor_login_failed_dialog" = "登录失败";
+
+"editor_username_error_dialog" = "用户名不存在";
+
+"editor_place_edited_dialog" = "您已编辑了一个对象！";
+
+"editor_login_with_osm" = "使用OpenStreetMap进行登录";
+
+"editor_profile_changes" = "更改数目：";
+
+"editor_profile_unsent_changes" = "未发送";
+
+"editor_focus_map_on_location" = "拖动地图以选择此对象的正确位置。";
+
+"editor_add_select_category" = "选择类别";
+
+"editor_add_select_category_popular_subtitle" = "受欢迎的";
+
+"editor_add_select_category_all_subtitle" = "所有类别";
+
+"editor_edit_place_title" = "编辑中";
+
+"editor_add_place_title" = "添加中";
+
+"editor_edit_place_name_hint" = "该地点的名称";
+
+"editor_edit_place_category_title" = "类别";
+
+"placepage_add_place_button" = "添加一个地点";
+
+"placepage_report_problem_button" = "报告一个问题";
+
+"whatsnew_smallmwm_header" = "我们满足了您一直以来的要求";
+
+"whatsnew_smallmwm_message" = "我们将地图分成了几部分。现在，您可以下载独立的区域，而不是整个国家。";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "我们已明显改进了按地址的搜索。亲自看看。";
+
+"whatsnew_editor_title" = "编辑此地图*";
+
+"whatsnew_editor_message_1" = "添加新地点到该地图，并直接通过此应用编辑已存在的地点。";
+
+"whatsnew_editor_message_2" = "* MAPS.ME使用OpenStreetMap社区的数据。";
+
+"onboarding_offline_navigation_title" = "您将不再迷路";
+
+"onboarding_offline_navigation_message" = "规划最佳的驾车和步行路线，即使在没有网络连接的情况下！";
+
+"onboarding_offline_navigation_title_2" = "离线导航";
+
+"onboarding_offline_navigation_message_2" = "规划最佳的驾车和步行路线。";
+
+"onboarding_offline_maps_title" = "MAPS.ME - 离线地图";
+
+"onboarding_offline_maps_message" = "下载一次所需区域的地图，您便可以在无网络连接的情况下使用导航和搜索功能。";
+
+"onboarding_notifications_message" = "为了接收最新的地图，请获取更新通知";
+
+"onboarding_notifications_title" = "允许更新通知";
+
+"onboarding_location_title" = "帮助我们找到您";
+
+"onboarding_location_message" = "为了使用导航和其他功能，我们需要访问您的地理位置信息.";
diff --git a/iphone/Maps/zh-Hant.lproj/Localizable.strings b/iphone/Maps/zh-Hant.lproj/Localizable.strings
index 48786af4dd..8c8c06cdbe 100644
--- a/iphone/Maps/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/zh-Hant.lproj/Localizable.strings
@@ -21,9 +21,6 @@
 /* Button which deletes downloaded country */
 "delete" = "刪除";
 
-/* Button in iOS Downloader, displayed only when upgrading from v1 to v2 */
-"delete_old_maps" = "刪除舊的地圖並繼續";
-
 /* Button to dismiss dialog forever */
 "do_not_ask_me_again" = "別再問我";
 
@@ -79,9 +76,6 @@
 /* View and button titles for accessibility */
 "my_position" = "我的位置";
 
-/* Settings/Downloader - No internet connection dialog title */
-"no_internet_connection_detected" = "無網路連線";
-
 /* Settings/Downloader - 3G download warning dialog title */
 "no_wifi_ask_cellular_download" = "未發現WiFi訊號!您想使用其他的網路連線方式(GPRS, EDGE, 3G 或 LTE)來下載嗎 %@？";
 
@@ -111,9 +105,6 @@
 /* Search box placeholder text */
 "search_map" = "搜尋地圖";
 
-/* Settings/Downloader - No free space dialog title */
-"not_enough_disk_space" = "沒有足夠的儲存空間";
-
 /* Settings/Downloader - info for not downloaded country */
 "touch_to_download" = "輕觸後下載";
 
@@ -694,20 +685,22 @@
 "routing_update_maps" = "使用新版本的MAPS.ME可以創建從您的當前位置至一個目的地的路線。請更新地圖以使用該功能。";
 
 /* Update all button text */
-"downloader_update_all" = "更新全部";
+"downloader_update_all_button" = "更新全部";
 
 /* Cancel all button text */
 "downloader_cancel_all" = "取消全部";
 
 /* Downloaded maps category */
-"downloader_downloaded" = "已下載";
+"downloader_downloaded_subtitle" = "已下載";
 
 /* Country queued for download */
 "downloader_queued" = "已佇列";
 
-"downloader_near_me" = "Near me";
+"downloader_near_me_subtitle" = "在我附近";
 
-"downloader_maps_to_update" = "Maps: %1$d (%2$s)";
+"downloader_status_maps" = "地圖： %s";
+
+"downloader_download_all_button" = "下載全部";
 
 /* Disclaimer message */
 "routing_disclaimer" = "在MAPS.ME應用中制定路線時請謹記以下幾點：\n\n  - 建議路線僅可當作推薦路線。\n - 路況、交通規則以及標誌應優先於導航建議。\n - 地圖可能會不正確或者過時，路線也可能不是以最佳可能方式制定的。\n\n  行車安全，請照顧好您自己！";
@@ -768,9 +761,6 @@
 /* Item in context menu. */
 "downloader_map_and_routing" = "地圖 + 布置路線";
 
-/* Dialog confirmation when trying to delete map and there are unsaved changes present on it. */
-"downloader_delete_editor_changes" = "Unsaved changes for this map will be removed too. Continue anyway?";
-
 /* Item in context menu. */
 "downloader_delete_map" = "刪除地圖";
 
@@ -1342,10 +1332,6 @@
 
 "whats_new_next_button" = "下一頁";
 
-"whats_new_night_caption" = "夜間模式導航";
-
-"whats_new_night_body" = "為了便於天黑行駛時使用MAPS.ME，我們增加了夜間模式。該模式在日落之後會自動開啟。";
-
 "editor_time_add" = "新增排程";
 
 "editor_time_delete" = "刪除排程";
@@ -1375,11 +1361,6 @@
 
 "migrate_title" = "重要！";
 
-/* Used in 2 places: What's new and Delete All maps dialog. */
-"migrate_and_split_mwms_message" = "我們已將地圖分為若干部分。現在，您可下載各個地區，而非整個國家的地圖。您在開始下載新地圖前，請刪除老地圖。";
-
-"youve_been_asking" = "您一直在尋求，而我們已經完成";
-
 /* Android uses image instead of text. */
 "download_all" = "全部下載。";
 
@@ -1501,6 +1482,98 @@
 
 "phone" = "電話";
 
-"whats_new_editor_caption" = "直接從MAPS.ME編輯地圖";
+"please_note" = "請註意";
 
-"whats_new_editor_message" = "您的修改將幫助上百萬用戶。讓我們一起讓世界變好！";
+"common_no_wifi_dialog" = "無WiFi連接。您想繼續使用移動數據進行連接嗎？";
+
+"downloader_delete_map_dialog" = "所有對地圖的修改都將與地圖一起被刪除。";
+
+"downloader_update_maps" = "更新地圖";
+
+"downloader_mwm_migration_dialog" = "為了創建路線，您需要更新全部地圖並重新規劃路線。";
+
+"downloader_search_field_hint" = "找到地圖";
+
+"migration_update_all_button" = "更新全部地圖";
+
+"migration_delete_all_download_current_button" = "下載當前地圖並刪除舊地圖";
+
+"migration_prefetch_status" = "正在準備地圖更新…";
+
+"migration_download_error_dialog" = "下載錯誤";
+
+"common_check_internet_connection_dialog" = "請檢查您的設置並確保您的設備已連接至網絡。";
+
+"downloader_no_space_title" = "無足夠的空間";
+
+"downloader_no_space_message" = "請刪除不必要的數據";
+
+"editor_general_auth_error_dialog" = "一般登錄錯誤。";
+
+"editor_login_error_dialog" = "登錄錯誤。";
+
+"editor_login_failed_dialog" = "登錄失敗";
+
+"editor_username_error_dialog" = "用戶名不存在";
+
+"editor_place_edited_dialog" = "您已編輯了一個對象！";
+
+"editor_login_with_osm" = "使用OpenStreetMap進行登錄";
+
+"editor_profile_changes" = "更改：";
+
+"editor_profile_unsent_changes" = "未發送";
+
+"editor_focus_map_on_location" = "拖動地圖以選擇此對象的正確位置。";
+
+"editor_add_select_category" = "選擇類別";
+
+"editor_add_select_category_popular_subtitle" = "受歡迎的";
+
+"editor_add_select_category_all_subtitle" = "所有類別";
+
+"editor_edit_place_title" = "編輯中";
+
+"editor_add_place_title" = "添加中";
+
+"editor_edit_place_name_hint" = "該地點的名稱";
+
+"editor_edit_place_category_title" = "類別";
+
+"placepage_add_place_button" = "添加一個地點";
+
+"placepage_report_problem_button" = "報告一個問題";
+
+"whatsnew_smallmwm_header" = "您一直在尋求，而我們已經完成";
+
+"whatsnew_smallmwm_message" = "我們已將地圖分為若干部分。現在，您可下載各個地區，而非整個國家的地圖。";
+
+"whatsnew_search_header" = "New search!";
+
+"whatsnew_search_message" = "我們已明顯改進了按地址的搜索。親自看看。";
+
+"whatsnew_editor_title" = "編輯此地圖*";
+
+"whatsnew_editor_message_1" = "添加新地點到該地圖，並直接通過此應用編輯已存在的地點。";
+
+"whatsnew_editor_message_2" = "* MAPS.ME使用OpenStreetMap社區的數據。";
+
+"onboarding_offline_navigation_title" = "您將不再迷路";
+
+"onboarding_offline_navigation_message" = "規劃最佳的駕車和步行路線，即使在沒有網絡連接的情況下！";
+
+"onboarding_offline_navigation_title_2" = "離線導航";
+
+"onboarding_offline_navigation_message_2" = "規劃最佳的駕車和步行路線。";
+
+"onboarding_offline_maps_title" = "MAPS.ME - 離線地圖";
+
+"onboarding_offline_maps_message" = "一次下載所需地區的地圖，無需網絡連接就能使用導航和搜索功能。";
+
+"onboarding_notifications_message" = "為了接收最新的地圖，請獲取更新通知";
+
+"onboarding_notifications_title" = "啟用更新通知";
+
+"onboarding_location_title" = "幫我們找到您";
+
+"onboarding_location_message" = "如要使用導航和其他功能，我們需要能獲取您的地理位置.";