diff --git a/briar-android/src/main/res/values-bg/strings.xml b/briar-android/src/main/res/values-bg/strings.xml
index 4058b2798..6ac7b3797 100644
--- a/briar-android/src/main/res/values-bg/strings.xml
+++ b/briar-android/src/main/res/values-bg/strings.xml
@@ -165,15 +165,6 @@
   <string name="set_contact_alias">Преименуване</string>
   <string name="set_contact_alias_hint">Име на контакта</string>
   <string name="menu_item_disappearing_messages">Изчезващи съобщения</string>
-  <string name="menu_item_connect_via_bluetooth">Свързване чрез Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Свързване чрез Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">За да сработи този метод, контактът трябва да бъде близо до вас.\n\nДвамата трябва да натиснете „Старт“ едновременно.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Има започнат опит за връзка чрез Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Не може да продължи без Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Не може да продължи без разрешение за местоположение</string>
-  <string name="toast_connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Успешно свързване чрез Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Не може да се установи връзка чрез Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Съобщението ще изчезне след %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -322,6 +313,12 @@
   <string name="introduction_response_accepted_received">%1$s приема запознанство с/ъс %2$s.</string>
   <string name="introduction_response_declined_received">%1$s отказа запознанство с/ъс %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s казва, че %2$s отказва запознанство.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Свързване чрез Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Свързване чрез Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Не може да продължи без разрешение за местоположение</string>
+  <string name="connect_via_bluetooth_start">Свързване чрез Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Успешно свързване чрез Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Няма групи</string>
   <string name="groups_list_empty_action">Докоснете иконата с +, за да създадете своя или поискайте от контактите си да споделят група с вас</string>
@@ -656,8 +653,6 @@
   <string name="website_troubleshooting_title">Отстраняване на неизправности</string>
   <!--error handling-->
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Прехвърляне на данни</string>
-  <string name="removable_drive_intro">Можете да изпращате шифровани съобщения до контактите си посредством преносима памет или карти на SD.\n\nАко контакт ви изпрати преносима памет с криптирани съобщения можете да ги внесете в Briar, посредством бутона за получаване по-долу.</string>
   <string name="removable_drive_title_send">Изпращане на сведения</string>
   <string name="removable_drive_title_receive">Получаване на сведения</string>
   <string name="removable_drive_send_intro">Докоснете бутона по-долу, за да бъде създаден файл, който ще съдържа шифрованите съобщения. Можете да изберете къде да бъде запазен този файл.\n\nАко желаете да го запазите на преносим диск го включете сега.</string>
diff --git a/briar-android/src/main/res/values-ca/strings.xml b/briar-android/src/main/res/values-ca/strings.xml
index ec02ac820..20c927d58 100644
--- a/briar-android/src/main/res/values-ca/strings.xml
+++ b/briar-android/src/main/res/values-ca/strings.xml
@@ -160,15 +160,6 @@
   <string name="set_contact_alias">Canvia el nom del contacte</string>
   <string name="set_contact_alias_hint">Nom del contacte</string>
   <string name="menu_item_disappearing_messages">Missatges fonedissos</string>
-  <string name="menu_item_connect_via_bluetooth">Connecta via bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Connecta via bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">El vostre contacte ha de ser a prop per a que vagi bé.\n\nVós i el vostre contacte heu de prémer «Engega» simultàniament.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Ja està mirant de connectar-se amb Bluetooth.</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">No es pot continuar sense Bluetooth.</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">No es pot continuar sense permís per obtenir la posició.</string>
-  <string name="toast_connect_via_bluetooth_start">Connectant-se via Bluetooth...</string>
-  <string name="toast_connect_via_bluetooth_success">S\'ha connectat via Bluetooth.</string>
-  <string name="toast_connect_via_bluetooth_error">No ha pogut connectar-se amb Bluetooth.</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Els vostres missatges es faran fonedissos en %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -318,6 +309,12 @@ Així que l\'actualitzi li veureu una icona diferent .</string>
   <string name="introduction_response_accepted_received">%1$s ha acceptat conèixer a %2$s.</string>
   <string name="introduction_response_declined_received">%1$s ha refusat conèixer a %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s diu que %2$s ha refusat conèixer-lo.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Connecta via bluetooth</string>
+  <string name="connect_via_bluetooth_title">Connecta via bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">No es pot continuar sense permís per obtenir la posició.</string>
+  <string name="connect_via_bluetooth_start">Connectant-se via Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">S\'ha connectat via Bluetooth.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">No hi ha cap grup per mostrar</string>
   <string name="groups_list_empty_action">Toqueu la icona + per crear un grup o demaneu als vostres contactes que us afegeixin als seus grups</string>
diff --git a/briar-android/src/main/res/values-de/strings.xml b/briar-android/src/main/res/values-de/strings.xml
index 9868a48f3..f6ed2e184 100644
--- a/briar-android/src/main/res/values-de/strings.xml
+++ b/briar-android/src/main/res/values-de/strings.xml
@@ -165,15 +165,6 @@
   <string name="set_contact_alias">Kontaktnamen ändern</string>
   <string name="set_contact_alias_hint">Name des Kontakts</string>
   <string name="menu_item_disappearing_messages">Selbstlöschende Nachrichten</string>
-  <string name="menu_item_connect_via_bluetooth">Über Bluetooth verbinden</string>
-  <string name="dialog_title_connect_via_bluetooth">Über Bluetooth verbinden</string>
-  <string name="dialog_message_connect_via_bluetooth">Dein Kontakt muss in der Nähe sein, damit dies funktioniert.\n\nDu und dein Kontakt sollten beide gleichzeitig \"Start\" drücken.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Versucht bereits, eine Verbindung über Bluetooth herzustellen</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Kann ohne Bluetooth nicht fortgesetzt werden</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Kann ohne Standortberechtigung nicht fortgesetzt werden</string>
-  <string name="toast_connect_via_bluetooth_start">Verbinde über Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Erfolgsreich über Bluetooth verbunden</string>
-  <string name="toast_connect_via_bluetooth_error">Konnte keine Verbindung über Bluetooth herstellen</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Deine Nachrichten werden nach %1$sgelöscht. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -322,6 +313,16 @@
   <string name="introduction_response_accepted_received">%1$s hat die Kontaktempfehlung für %2$s angenommen.</string>
   <string name="introduction_response_declined_received">%1$s hat die Kontaktempfehlung von %2$s abgelehnt.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s meldet, dass %2$s die Kontaktempfehlung abgelehnt hat.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Über Bluetooth verbinden</string>
+  <string name="connect_via_bluetooth_title">Über Bluetooth verbinden</string>
+  <string name="connect_via_bluetooth_intro">Falls Verbindungen über Bluetooth nicht automatisch funktionieren, kannst du über diesen Bildschirm eine manuelle Verbindung herstellen.\n\nDein Kontakt muss sich in der Nähe befinden, damit dies funktioniert. Du und dein Kontakt sollten gleichzeitig auf \"Start\" drücken.</string>
+  <string name="connect_via_bluetooth_already_discovering">Es wird bereits versucht, eine Verbindung über Bluetooth herzustellen. Bitte probiere es in Kürze erneut.</string>
+  <string name="connect_via_bluetooth_no_location_permission">Kann ohne Standortberechtigung nicht fortgesetzt werden</string>
+  <string name="connect_via_bluetooth_start">Verbinde über Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Erfolgsreich über Bluetooth verbunden</string>
+  <string name="connect_via_bluetooth_error">Konnte keine Verbindung über Bluetooth herstellen.</string>
+  <string name="connect_via_bluetooth_error_not_supported">Bluetooth wird vom Gerät nicht unterstützt.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Keine Gruppen vorhanden</string>
   <string name="groups_list_empty_action">Tippe auf das + Symbol, um eine Gruppe anzulegen oder frage deine Kontakte, Gruppen mit dir zu teilen</string>
@@ -662,7 +663,6 @@
   <string name="permission_hotspot_location_denied_body">Du hast den Zugriff auf deinen Standort verweigert, aber Briar benötigt diese Berechtigung, um einen WLAN-Hotspot zu erstellen.\n\nBitte gewähre den Zugriff.</string>
   <string name="wifi_settings_title">WLAN-Einstellungen</string>
   <string name="wifi_settings_request_enable_body">Um einen WLAN-Hotspot zu erstellen, benötigt Briar das WLAN. Bitte aktiviere es.</string>
-  <string name="wifi_settings_request_denied_body">Du hast die Erlaubnis zur WLAN-Aktivierung verweigert, aber Briar benötigt das WLAN.\n\nBitte gewähre den Zugriff.</string>
   <string name="hotspot_tab_manual">Manuell</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">Scannen eines QR-Codes</string>
@@ -712,8 +712,6 @@
   <string name="hotspot_flag_test">Warnung: Diese App wurde mit Android Studio installiert und kann NICHT auf einem anderen Gerät installiert werden.</string>
   <string name="hotspot_error_framework_busy">Hotspot kann nicht gestartet werden.\n\nWenn du einen anderen Hotspot betreibst oder deine Internetverbindung über WLAN teilst, beende dies und versuche es danach erneut.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Daten übertragen</string>
-  <string name="removable_drive_intro">Du kannst deinem Kontakt verschlüsselte Nachrichten über Wechseldatenträger wie USB-Sticks oder SD-Karten schicken.\n\nWenn dein Kontakt dir einen Wechseldatenträger mit verschlüsselten Nachrichten geschickt hat, kannst du die Nachrichten in Briar importieren, indem du die Empfangsschaltfläche unten benutzt.</string>
   <string name="removable_drive_title_send">Daten senden</string>
   <string name="removable_drive_title_receive">Daten empfangen</string>
   <string name="removable_drive_send_intro">Tippe auf die Schaltfläche unten, um eine neue Datei mit den verschlüsselten Nachrichten zu erstellen. Du kannst wählen, wo die Datei gespeichert werden soll.\n\nWenn du die Datei auf einem Wechsellaufwerk speichern möchtest, lege das Laufwerk jetzt ein.</string>
diff --git a/briar-android/src/main/res/values-es/strings.xml b/briar-android/src/main/res/values-es/strings.xml
index 221302c93..dc22239c2 100644
--- a/briar-android/src/main/res/values-es/strings.xml
+++ b/briar-android/src/main/res/values-es/strings.xml
@@ -165,15 +165,6 @@
   <string name="set_contact_alias">Cambiar nombre del contacto</string>
   <string name="set_contact_alias_hint">Nombre del contacto</string>
   <string name="menu_item_disappearing_messages">Mensajes con caducidad</string>
-  <string name="menu_item_connect_via_bluetooth">Conectar mediante Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectar mediante Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Tu contacto necesita estar cerca para que esto funcione.\n\nTú y tu contacto deberían presionar \"Iniciar\" ambos al mismo tiempo.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Ya se está intentando conectar mediante Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">No se puede continuar sin Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">No se puede continuar sin permiso de ubicación</string>
-  <string name="toast_connect_via_bluetooth_start">Conectar mediante Bluetooth...</string>
-  <string name="toast_connect_via_bluetooth_success">Conectado exitosamente mediante Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">No se pudo conectar mediante Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Tus mensajes desaparecerán después de %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -322,6 +313,12 @@
   <string name="introduction_response_accepted_received">%1$s aceptó la presentación a %2$s.</string>
   <string name="introduction_response_declined_received">%1$s rechazó la presentación a %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s dice que %2$s rechazó la presentación.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectar mediante Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectar mediante Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">No se puede continuar sin permiso de ubicación</string>
+  <string name="connect_via_bluetooth_start">Conectar mediante Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Conectado exitosamente mediante Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">No hay grupos para mostrar</string>
   <string name="groups_list_empty_action">Golpea el icono + para crear un grupo, o pregunta a tus contactos si quieren compartir grupos contigo</string>
diff --git a/briar-android/src/main/res/values-fa/strings.xml b/briar-android/src/main/res/values-fa/strings.xml
index 5fa0da0fd..a0539942c 100644
--- a/briar-android/src/main/res/values-fa/strings.xml
+++ b/briar-android/src/main/res/values-fa/strings.xml
@@ -166,15 +166,6 @@
   <string name="set_contact_alias">تغییر نام مخاطب</string>
   <string name="set_contact_alias_hint">نام مخاطب</string>
   <string name="menu_item_disappearing_messages">پیام‌های ناپدید شونده</string>
-  <string name="menu_item_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
-  <string name="dialog_title_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
-  <string name="dialog_message_connect_via_bluetooth">برای امکان این عملکرد، مخاطب شما باید نزدیک باشد. \n\n شما و مخاطبتان باید همزمان گزینه‌ی \"شروع\" را بفشارید.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">در حال تلاش برای اتصال از طریق بلوتوث</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">امکان ادامه بدون بلوتوث وجود ندارد</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">امکان ادامه بدون اجازه مکان‌یابی وجود ندارد</string>
-  <string name="toast_connect_via_bluetooth_start">در حال اتصال از طریق بلوتوث</string>
-  <string name="toast_connect_via_bluetooth_success">ارتباط از طریق بلوتوث با موفقیت انجام شد</string>
-  <string name="toast_connect_via_bluetooth_error">اتصال از طریق بلوتوث برقرار نشد</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">پیام شما پس از %1$s ناپدید خواهد شد. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -335,6 +326,12 @@
   <string name="introduction_response_accepted_received">%1$s معرفی به %2$s را پذیرفت.</string>
   <string name="introduction_response_declined_received">%1$s معرفی به %2$s را رد کرد.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s می گوید که %2$s دعوت نامه  را رد کرد.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">اتصال از طریق بلوتوث</string>
+  <string name="connect_via_bluetooth_title">اتصال از طریق بلوتوث</string>
+  <string name="connect_via_bluetooth_no_location_permission">امکان ادامه بدون اجازه مکان‌یابی وجود ندارد</string>
+  <string name="connect_via_bluetooth_start">در حال اتصال از طریق بلوتوث</string>
+  <string name="connect_via_bluetooth_success">ارتباط از طریق بلوتوث با موفقیت انجام شد</string>
   <!--Private Groups-->
   <string name="groups_list_empty">هیچ گروهی برای نمایش وجود ندارد</string>
   <string name="groups_list_empty_action">برای ایجاد یک گروه روی آیکون + کلیک کنید، یا از مخاطبان خود بخواهید تا گروه های خود را با شما به اشتراک بگذارند</string>
diff --git a/briar-android/src/main/res/values-fr/strings.xml b/briar-android/src/main/res/values-fr/strings.xml
index 0f893bba0..b221280a6 100644
--- a/briar-android/src/main/res/values-fr/strings.xml
+++ b/briar-android/src/main/res/values-fr/strings.xml
@@ -160,15 +160,6 @@
   <string name="set_contact_alias">Changer le nom du contact</string>
   <string name="set_contact_alias_hint">Nom du contact</string>
   <string name="menu_item_disappearing_messages">Messages éphémères</string>
-  <string name="menu_item_connect_via_bluetooth">Se connecter par Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Se connecter par Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Afin que cela fonctionne, votre contact doit être à proximité.\n\nVotre contact et vous devriez appuyer ensemble sur « Commencer ».</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Tentative de connexion par Bluetooth déjà en cours</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Impossible de poursuivre sans le Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Impossible de poursuivre sans la permission de position</string>
-  <string name="toast_connect_via_bluetooth_start">Connexion par Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Connectée par Bluetooth avec succès</string>
-  <string name="toast_connect_via_bluetooth_error">Impossible de se connecter par Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Vos messages disparaîtront après %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -317,6 +308,12 @@
   <string name="introduction_response_accepted_received">%1$s a accepté d’être présenté à %2$s.</string>
   <string name="introduction_response_declined_received">%1$s a refusé d’être présenté à %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s annonce que %2$s a refusé la présentation.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Se connecter par Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Se connecter par Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Impossible de poursuivre sans la permission de position</string>
+  <string name="connect_via_bluetooth_start">Connexion par Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Connectée par Bluetooth avec succès</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Aucun groupe à afficher</string>
   <string name="groups_list_empty_action">Touchez l’icône + pour créer un groupe ou pour demander à vos contacts de partager des groupes avec vous</string>
diff --git a/briar-android/src/main/res/values-gl/strings.xml b/briar-android/src/main/res/values-gl/strings.xml
index 08178a05a..8015a8575 100644
--- a/briar-android/src/main/res/values-gl/strings.xml
+++ b/briar-android/src/main/res/values-gl/strings.xml
@@ -153,14 +153,6 @@
   <string name="set_contact_alias">Cambiar o nome do contacto</string>
   <string name="set_contact_alias_hint">Nome do contacto</string>
   <string name="menu_item_disappearing_messages">Mensaxes efémeras</string>
-  <string name="menu_item_connect_via_bluetooth">Conectar vía Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectar vía Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">O teu contacto ten que estar preto para que isto funcione.\n\nTi e o teu contacto tedes que premer en \"Iniciar\" ao mesmo tempo.</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Non se pode continuar sen o Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Non se pode continuar sen o permiso de localización</string>
-  <string name="toast_connect_via_bluetooth_start">Conectando vía Bluetooth...</string>
-  <string name="toast_connect_via_bluetooth_success">Conectouse correctamente vía Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Non se puido conectar vía Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">As túas mensaxes desaparecerán após %1$s . %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -309,6 +301,12 @@
   <string name="introduction_response_accepted_received">%1$s aceptou a presentación a %2$s.</string>
   <string name="introduction_response_declined_received">%1$s rexeitou a presentación a %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s di que %2$srexeitou a presentación.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectar vía Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectar vía Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Non se pode continuar sen o permiso de localización</string>
+  <string name="connect_via_bluetooth_start">Conectando vía Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Conectouse correctamente vía Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Sen grupos que amosar</string>
   <string name="groups_list_empty_action">Toca a icona + para crear un grupo, ou solicita aos contactos que compartan grupos contigo</string>
diff --git a/briar-android/src/main/res/values-he/strings.xml b/briar-android/src/main/res/values-he/strings.xml
index d3c3383b6..8107be08b 100644
--- a/briar-android/src/main/res/values-he/strings.xml
+++ b/briar-android/src/main/res/values-he/strings.xml
@@ -160,8 +160,6 @@
   <string name="image_attach_error_invalid_mime_type">תסדיר תמונה בלתי נתמך: %s</string>
   <string name="set_contact_alias">שַׁנֵּה שם איש קשר</string>
   <string name="set_contact_alias_hint">שם איש הקשר</string>
-  <string name="menu_item_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
-  <string name="dialog_title_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <!--The placeholder at the end will add "Tap to learn more."-->
   <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -290,6 +288,9 @@
   <string name="introduction_response_accepted_received">%1$s הסכים אל ההיכרות בפני %2$s.</string>
   <string name="introduction_response_declined_received">%1$s סירב אל ההיכרות בפני %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s אומר כי %2$s סירב אל ההיכרות.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">התחבר באמצעות שן כחולה</string>
+  <string name="connect_via_bluetooth_title">התחבר באמצעות שן כחולה</string>
   <!--Private Groups-->
   <string name="groups_list_empty">אין קבוצות להראות</string>
   <string name="groups_list_empty_action">הקש על הצלמית + כדי ליצור קבוצה, או בקש מאנשי הקשר שלך לשתף איתך קבוצות</string>
diff --git a/briar-android/src/main/res/values-hu/strings.xml b/briar-android/src/main/res/values-hu/strings.xml
index 732472a90..5c6f4c06c 100644
--- a/briar-android/src/main/res/values-hu/strings.xml
+++ b/briar-android/src/main/res/values-hu/strings.xml
@@ -160,15 +160,6 @@
   <string name="set_contact_alias">Kapcsolat nevének megváltoztatása</string>
   <string name="set_contact_alias_hint">Kapcsolat neve</string>
   <string name="menu_item_disappearing_messages">Eltűnő üzenetek</string>
-  <string name="menu_item_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
-  <string name="dialog_title_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
-  <string name="dialog_message_connect_via_bluetooth">A kapcsolatai közel kell legyenek, hogy ez működjön.\n\n Ön és a kapcsolata egyaránt meg kell nyomja a \"Start\" gombot egyidőben.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Már próbálkozik csatlakozni Bluetooth-on</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Nem folytatható Bluetooth nélkül</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Nem folytatható hely engedélyek nélkül</string>
-  <string name="toast_connect_via_bluetooth_start">Csatlakozás Bluetooth-on...</string>
-  <string name="toast_connect_via_bluetooth_success">Sikeres csatlakozás Bluetooth-on.</string>
-  <string name="toast_connect_via_bluetooth_error">Nem sikerült csatlakozni Bluetooth-on</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Az üzenetei eltűnnek %1$s. %2$s múlva</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -320,6 +311,12 @@ Kérjük frissítsen a legutolsó verzióra és próbálja újra.</string>
   <string name="introduction_response_accepted_received">%1$s elfogadta a bemutatkozást %2$s számára.</string>
   <string name="introduction_response_declined_received">%1$s elutasította a bemutatkozást %2$s számára.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s alapján %2$s elutasította a bemutatkozást.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Csatlakozás bluetooth-on keresztül</string>
+  <string name="connect_via_bluetooth_title">Csatlakozás bluetooth-on keresztül</string>
+  <string name="connect_via_bluetooth_no_location_permission">Nem folytatható hely engedélyek nélkül</string>
+  <string name="connect_via_bluetooth_start">Csatlakozás Bluetooth-on...</string>
+  <string name="connect_via_bluetooth_success">Sikeres csatlakozás Bluetooth-on.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nincs megjeleníthető csoport</string>
   <string name="groups_list_empty_action">Koppintson a + ikonra csoport létrehozásához, vagy kérje meg kapcsolatait, hogy osszanak meg csoportokat Önnel</string>
diff --git a/briar-android/src/main/res/values-is/strings.xml b/briar-android/src/main/res/values-is/strings.xml
index 8f290510c..546d2b4db 100644
--- a/briar-android/src/main/res/values-is/strings.xml
+++ b/briar-android/src/main/res/values-is/strings.xml
@@ -156,15 +156,6 @@
   <string name="set_contact_alias">Breyta nafni tengiliðar</string>
   <string name="set_contact_alias_hint">Nafn tengiliðar</string>
   <string name="menu_item_disappearing_messages">Sjálfeyðandi skilaboð</string>
-  <string name="menu_item_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Tengiliðurinn þinn þarf að vera nálægt til að þetta virki.\n\nÞú og tengiliðurinn ættuð bæði að ýta á \"Byrja\" á sama tíma.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Þegar að reyna að tengjast í gegnum Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Get ekki haldið áfram án Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Get ekki haldið áfram án heimildar til að nota staðsetningu</string>
-  <string name="toast_connect_via_bluetooth_start">Tengist í gegnum Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Tókst að tengjast í gegnum Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Gat ekki tengst í gegnum Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Skilaboðin þín munu hverfa eftir %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -313,6 +304,12 @@
   <string name="introduction_response_accepted_received">%1$s samþykkti kynningu við %2$s.</string>
   <string name="introduction_response_declined_received">%1$s hafnaði kynningu við %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s segir að %2$s hafi hafnað kynningunni.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Tengjast í gegnum Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Tengjast í gegnum Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Get ekki haldið áfram án heimildar til að nota staðsetningu</string>
+  <string name="connect_via_bluetooth_start">Tengist í gegnum Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Tókst að tengjast í gegnum Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Engir hópar sem hægt er að birta</string>
   <string name="groups_list_empty_action">Ýttu á + táknið til að útbúa hóp, eða biddu tengiliðina þína um að deila hópi með þér</string>
diff --git a/briar-android/src/main/res/values-it/strings.xml b/briar-android/src/main/res/values-it/strings.xml
index 9a84d9308..463a15c00 100644
--- a/briar-android/src/main/res/values-it/strings.xml
+++ b/briar-android/src/main/res/values-it/strings.xml
@@ -165,15 +165,6 @@
   <string name="set_contact_alias">Cambia il nome del contatto</string>
   <string name="set_contact_alias_hint">Nome contatto</string>
   <string name="menu_item_disappearing_messages">Messaggi dissolventi</string>
-  <string name="menu_item_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Per funzionare, il tuo contatto deve essere nelle vicinanze.\n\nDovreste entrambi premere \"Inizia\" nello stesso momento.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Si sta già tentanto di connettersi via Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Impossibile continuare senza Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Impossibile continuare senza l\'autorizzazione per la geolocalizzazione</string>
-  <string name="toast_connect_via_bluetooth_start">Connessione via Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Connessione via Bluetooth riuscita</string>
-  <string name="toast_connect_via_bluetooth_error">Connessione via Bluetooth fallita</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">I tuoi messaggi spariranno dopo %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -322,6 +313,16 @@
   <string name="introduction_response_accepted_received">%1$s ha accettato l\'introduzione a %2$s.</string>
   <string name="introduction_response_declined_received">%1$s ha declinato l\'introduzione a %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s dice che %2$s ha declinato l\'introduzione.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Connessione attraverso Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Connessione attraverso Bluetooth</string>
+  <string name="connect_via_bluetooth_intro">Nel caso le connessioni Bluetooth non funzionino automaticamente, puoi usare questa schermata per connetterti a mano.\n\nIl tuo contatto deve essere nelle vicinanze affinché funzioni.\n\nDovete premere entrambi \"Avvia\" nello stesso momento.</string>
+  <string name="connect_via_bluetooth_already_discovering">Si sta già tentando di connettersi via Bluetooth. Riprova fra poco.</string>
+  <string name="connect_via_bluetooth_no_location_permission">Impossibile continuare senza l\'autorizzazione per la geolocalizzazione</string>
+  <string name="connect_via_bluetooth_start">Connessione via Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Connessione via Bluetooth riuscita</string>
+  <string name="connect_via_bluetooth_error">Connessione via Bluetooth fallita.</string>
+  <string name="connect_via_bluetooth_error_not_supported">Il Bluetooth non è supportato dal dispositivo.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nessun gruppo da mostrare</string>
   <string name="groups_list_empty_action">Tocca l\'icona + per creare un gruppo, o chiedi ai tuoi contatti di condividerne con te</string>
@@ -662,7 +663,6 @@
   <string name="permission_hotspot_location_denied_body">Hai negato l\'accesso alla tua posizione, ma Briar ha bisogno di questa autorizzazione per creare un hotspot Wi-Fi.\n\nPrendi in considerazione di consentirla.</string>
   <string name="wifi_settings_title">Impostazione Wi-Fi</string>
   <string name="wifi_settings_request_enable_body">Per creare un hotspot Wi-Fi, Briar deve usare il Wi-Fi. Prima attivalo.</string>
-  <string name="wifi_settings_request_denied_body">Hai negato l\'autorizzazione per attivare il Wi-Fi, ma Briar deve usarlo.\n\nPrendi in considerazione di attivarlo.</string>
   <string name="hotspot_tab_manual">Manuale</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">scansionando un codice QR</string>
@@ -712,8 +712,6 @@
   <string name="hotspot_flag_test">Attenzione: questa app è stata installata con Android Studio e NON può essere installata su un altro dispositivo.</string>
   <string name="hotspot_error_framework_busy">Impossibile avviare l\'hotspot.\n\nSe ne hai un altro in esecuzione o se stai condividendo la connessione internet via Wi-Fi, fermalo e poi riprova.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Trasferisci dati</string>
-  <string name="removable_drive_intro">Puoi inviare messaggi cifrati al tuo contatto usando supporti rimovibili come chiavette USB o schede SD.\n\nSe il contatto ti ha inviato un supporto rimovibile contenente messaggi cifrati, puoi importarli in Briar usando il pulsante di ricezione sottostante.</string>
   <string name="removable_drive_title_send">Invia dati</string>
   <string name="removable_drive_title_receive">Ricevi dati</string>
   <string name="removable_drive_send_intro">Tocca il pulsante sottostante per creare un nuovo file contenente i messaggi cifrati. Puoi scegliere dove verrà salvato il file.\n\nSe vuoi salvarlo in un supporto rimovibile, inseriscilo ora.</string>
diff --git a/briar-android/src/main/res/values-ja/strings.xml b/briar-android/src/main/res/values-ja/strings.xml
index 07aec0098..d159d3c30 100644
--- a/briar-android/src/main/res/values-ja/strings.xml
+++ b/briar-android/src/main/res/values-ja/strings.xml
@@ -149,15 +149,6 @@
   <string name="set_contact_alias">連絡先を変更</string>
   <string name="set_contact_alias_hint">連絡先名</string>
   <string name="menu_item_disappearing_messages">消えたメッセージ</string>
-  <string name="menu_item_connect_via_bluetooth">Bluetooth経由で接続する</string>
-  <string name="dialog_title_connect_via_bluetooth">Bluetooth経由で接続する</string>
-  <string name="dialog_message_connect_via_bluetooth">この機能を利用するには、あなたの連絡先が近くにある必要があります。\n\nあなたとあなたの連絡先が同時に\"開始\"を押してください。</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Bluetooth経由の接続を既に試行中です</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Bluetoothなくして続行不可能</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">位置情報の権限なくして続行不可能</string>
-  <string name="toast_connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
-  <string name="toast_connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
-  <string name="toast_connect_via_bluetooth_error">Bluetooth経由で接続不可能</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <!--The placeholder at the end will add "Tap to learn more."-->
   <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -295,6 +286,12 @@
   <string name="introduction_response_accepted_received">%1$sは%2$sの紹介を受け入れました。</string>
   <string name="introduction_response_declined_received">%1$sは%2$sへの紹介を辞退しました。</string>
   <string name="introduction_response_declined_received_by_introducee">%1$sによると、%2$sが紹介を辞退しました。</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Bluetooth経由で接続する</string>
+  <string name="connect_via_bluetooth_title">Bluetooth経由で接続する</string>
+  <string name="connect_via_bluetooth_no_location_permission">位置情報の権限なくして続行不可能</string>
+  <string name="connect_via_bluetooth_start">Bluetooth経由で接続中…</string>
+  <string name="connect_via_bluetooth_success">Bluetooth経由で接続に成功</string>
   <!--Private Groups-->
   <string name="groups_list_empty">表示するグループがありません</string>
   <string name="groups_list_empty_action">「＋」アイコンをタップしてグループを作成するか、連絡先に登録している誰かにグループを共有してもらう</string>
@@ -618,7 +615,6 @@
   <string name="permission_hotspot_location_denied_body">あなたの位置情報にアクセスすることを拒否しましたが、BriarはWi-Fiホットスポットを作るのに、この権限が必要です。\n\nアクセス権を付与することを考慮願います。</string>
   <string name="wifi_settings_title">Wi-Fi設定</string>
   <string name="wifi_settings_request_enable_body">Wi-Fiホットスポットを作るには、BriarWi-Fiの使用が必要です。有効にしてください。</string>
-  <string name="wifi_settings_request_denied_body">Wi-Fiを有効化する権限を拒否しましたが、BriarはWi-Fiの使用が必要です。\n\n有効にすることを考慮願います。</string>
   <string name="hotspot_tab_manual">手動</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">QRコードをスキャン</string>
diff --git a/briar-android/src/main/res/values-lt/strings.xml b/briar-android/src/main/res/values-lt/strings.xml
index 8486fd53e..cc746be6c 100644
--- a/briar-android/src/main/res/values-lt/strings.xml
+++ b/briar-android/src/main/res/values-lt/strings.xml
@@ -175,15 +175,6 @@
   <string name="set_contact_alias">Pakeisti adresato vardą</string>
   <string name="set_contact_alias_hint">Adresato vardas</string>
   <string name="menu_item_disappearing_messages">Išnykstančios žinutės</string>
-  <string name="menu_item_connect_via_bluetooth">Prisijungti per Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Prisijungti per Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Norint, kad tai suveiktų, jūsų adresatas privalo būti šalia jūsų.\n\nJūs ir jūsų adresatas abu vienu metu turėtumėte paspausti „Pradėti“.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Jau bandoma prisijungti per Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Nepavyksta tęsti be Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Nepavyksta tęsti be įrenginio vietovės leidimo</string>
-  <string name="toast_connect_via_bluetooth_start">Jungiamasi per Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">Sėkmingai prisijungta per Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Nepavyko prisijungti per Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Jūsų žinutės išnyks po %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -340,6 +331,12 @@
   <string name="introduction_response_accepted_received">%1$s priėmė supažindinimą su %2$s.</string>
   <string name="introduction_response_declined_received">%1$s atmetė supažindinimą su %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s sako, kad %2$s atmetė supažindinimą.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Prisijungti per Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Prisijungti per Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Nepavyksta tęsti be įrenginio vietovės leidimo</string>
+  <string name="connect_via_bluetooth_start">Jungiamasi per Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">Sėkmingai prisijungta per Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nėra rodytinų grupių</string>
   <string name="groups_list_empty_action">Norėdami sukurti grupę ar paprašyti savo adresatų pradėti su jumis bendrinti grupes, bakstelėkite + piktogramą</string>
@@ -688,7 +685,6 @@
   <string name="permission_hotspot_location_denied_body">Jūs uždraudėte prieigą prie įrenginio vietovės, tačiau norint sukurti belaidį (Wi-Fi) prieigos tašką, Briar reikia šio leidimo.\n\nApsvarstykite galimybę sutekti prieigą prie įrenginio vietovės.</string>
   <string name="wifi_settings_title">Belaidžio (Wi-Fi) nustatymas</string>
   <string name="wifi_settings_request_enable_body">Tam, kad sukurtų belaidį (Wi-Fi) prieigos tašką, Briar turi naudoti belaidį (Wi-Fi) ryšį. Įjunkite jį.</string>
-  <string name="wifi_settings_request_denied_body">Jūs uždraudėte leidimą įjungti belaidį (Wi-Fi) ryšį, tačiau norint naudotis belaidžiu (Wi-Fi), Briar reikia šio leidimo.\n\nApsvarstykite galimybę įjungti belaidį ryšį.</string>
   <string name="hotspot_tab_manual">Rankinis</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">skenuodami QR kodą</string>
@@ -740,8 +736,6 @@
   <string name="hotspot_flag_test">Įspėjimas: Ši programėlė buvo įdiegta naudojant „Android Studio“ ir NEGALI būti įdiegta kitame įrenginyje.</string>
   <string name="hotspot_error_framework_busy">Nepavyko įjungti prieigos taško.\n\nJei turite veikiantį kitą prieigos tašką arba, jei bendrinate interneto ryšį per belaidį (Wi-Fi) ryšį, pabandykite to nebedaryti ir po to, bandykite dar kartą.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Perkelti duomenis</string>
-  <string name="removable_drive_intro">Jūs galite siųsti savo adresatams šifruotas žinutes naudodami keičiamuosius atminties įtaisus, tokius kaip USB atmintukai ar SD kortelės.\n\nJeigu jūsų adresatas atsiuntė jums keičiamąjį diską su šifruotomis žinutėmis, tuomet naudodamiesi žemiau esančiu gavimo mygtuku, galite importuoti žinutes į Briar.</string>
   <string name="removable_drive_title_send">Siųsti duomenis</string>
   <string name="removable_drive_title_receive">Gauti duomenis</string>
   <string name="removable_drive_send_intro">Bakstelėkite mygtuką žemiau, kad sukurtumėte naują failą su šifruotomis žinutėmis. Galite pasirinkti, kur failą įrašyti.\n\nJei norite įrašyti failą į keičiamąjį diską, tuomet įdėkite diską dabar.</string>
diff --git a/briar-android/src/main/res/values-my/strings.xml b/briar-android/src/main/res/values-my/strings.xml
index 2a9404384..ae67288c8 100644
--- a/briar-android/src/main/res/values-my/strings.xml
+++ b/briar-android/src/main/res/values-my/strings.xml
@@ -154,15 +154,6 @@
   <string name="set_contact_alias">အဆက်အသွယ်အမည်အား ပြောင်းမယ်</string>
   <string name="set_contact_alias_hint">အဆက်အသွယ်အမည်</string>
   <string name="menu_item_disappearing_messages">ပျောက်ကွယ် မက်ဆေ့ချ်များ</string>
-  <string name="menu_item_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
-  <string name="dialog_title_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
-  <string name="dialog_message_connect_via_bluetooth">လုပ်ဆောင်ချက် အောင်မြင်နိုင်ရန် သင်၏ အဆက်အသွယ်သည် အနီးအနားတွင်ရှိရပါမည်။ \n\n သင် နှင့် သင်၏ အဆက်အသွယ် နှစ်ဦးစလုံးသည် \"စတင်ရန်\" ကို တစ်ပြိုင်တည်း နှိပ်ရပါမည်။</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">ဘလူးတုသ် နှင့် ချိတ်ဆက်ရန် ကြိုးစားနေပါသည်</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">ဘလူးတုသ် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">တည်နေရာသုံးခွင့် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
-  <string name="toast_connect_via_bluetooth_start">ဘလူးတုသ် နှင့် ချိတ်ဆက်နေသည်...</string>
-  <string name="toast_connect_via_bluetooth_success">ဘလူးတုသ် နှင့် အောင်မြင်စွာ ချိတ်ဆက်ပြီး</string>
-  <string name="toast_connect_via_bluetooth_error">ဘလူးတုသ် နှင့် ချိတ်ဆက်၍မရပါ</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">သင်၏မက်ဆေ့ချ်များသည် %1$s အကြာတွင် ပျောက်ကွယ်သွားပါမည်။ %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -307,6 +298,12 @@
   <string name="introduction_response_accepted_received">%2$s နှင့် မိတ်ဆက်ခြင်းကို %1$s က လက်ခံခဲ့ပါသည်။</string>
   <string name="introduction_response_declined_received">%2$s နှင့် မိတ်ဆက်ခြင်းကို %1$s က ငြင်းဆိုခဲ့ပါသည်။</string>
   <string name="introduction_response_declined_received_by_introducee">%2$s မှ မိတ်ဆက်ခြင်းအား ငြင်းဆိုခဲ့သည်ကို %1$s မှ ပြောပါသည်။</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
+  <string name="connect_via_bluetooth_title">ဘလူးတုသ် နှင့် ချိတ်မယ်</string>
+  <string name="connect_via_bluetooth_no_location_permission">တည်နေရာသုံးခွင့် မပါဘဲ ဆက်လက်မလုပ်ဆောင်နိုင်ပါ</string>
+  <string name="connect_via_bluetooth_start">ဘလူးတုသ် နှင့် ချိတ်ဆက်နေသည်...</string>
+  <string name="connect_via_bluetooth_success">ဘလူးတုသ် နှင့် အောင်မြင်စွာ ချိတ်ဆက်ပြီး</string>
   <!--Private Groups-->
   <string name="groups_list_empty">ပြသစရာအဖွဲ့များမရှိ</string>
   <string name="groups_list_empty_action">+ (အပေါင်းအိုင်ကွန်) အား နှိပ်၍ အဖွဲ့ဖန်တီးပါ သို့မဟုတ် သင့် အဆက်အသွယ်များကို သင့်စီသို့ အဖွဲ့များ ဝေမျှရန် တောင်းဆိုပါ</string>
diff --git a/briar-android/src/main/res/values-nl/strings.xml b/briar-android/src/main/res/values-nl/strings.xml
index 6ad487d92..1deea34df 100644
--- a/briar-android/src/main/res/values-nl/strings.xml
+++ b/briar-android/src/main/res/values-nl/strings.xml
@@ -150,8 +150,6 @@
   <string name="image_attach_error_invalid_mime_type">Bestandsformaat wordt niet ondersteund: %s</string>
   <string name="set_contact_alias">Verander naam van contact</string>
   <string name="set_contact_alias_hint">Contactnaam</string>
-  <string name="menu_item_connect_via_bluetooth">Verbind via Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Verbind via Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <!--The placeholder at the end will add "Tap to learn more."-->
   <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -278,6 +276,9 @@
   <string name="introduction_response_accepted_received">%1$s heeft de introductie aan %2$sgeaccepteerd.</string>
   <string name="introduction_response_declined_received">%1$s heeft de introductie aan %2$s afgewezen.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s zegt dat %2$s je introductie heeft afgewezen.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Verbind via Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Verbind via Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Er zijn geen groepen om te tonen</string>
   <string name="groups_list_empty_action">Tik op het +-icoon om een groep aan te maken of vraag een van je contacten om een groep met je te delen</string>
diff --git a/briar-android/src/main/res/values-pt-rBR/strings.xml b/briar-android/src/main/res/values-pt-rBR/strings.xml
index be4eff1b8..f074f3a2a 100644
--- a/briar-android/src/main/res/values-pt-rBR/strings.xml
+++ b/briar-android/src/main/res/values-pt-rBR/strings.xml
@@ -150,8 +150,6 @@
   <string name="image_attach_error_invalid_mime_type">Formato da imagem não suportado: %s</string>
   <string name="set_contact_alias">Alterar nome do contato</string>
   <string name="set_contact_alias_hint">Nome de contato</string>
-  <string name="menu_item_connect_via_bluetooth">Conectar via Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectar via Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <!--The placeholder at the end will add "Tap to learn more."-->
   <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -278,6 +276,9 @@
   <string name="introduction_response_accepted_received">%1$s aceitou ser apresentado a %2$s.</string>
   <string name="introduction_response_declined_received">%1$s recusou ser apresentado a %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s disse que %2$s recusou a apresentação.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectar via Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectar via Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Sem grupos para exibir</string>
   <string name="groups_list_empty_action">Toque no ícone + para criar um grupo, ou peça a seus contatos para compartilhar grupos com você</string>
diff --git a/briar-android/src/main/res/values-ro/strings.xml b/briar-android/src/main/res/values-ro/strings.xml
index a2d54d483..f7e5d21c5 100644
--- a/briar-android/src/main/res/values-ro/strings.xml
+++ b/briar-android/src/main/res/values-ro/strings.xml
@@ -170,15 +170,6 @@
   <string name="set_contact_alias">Schimbă nume contact</string>
   <string name="set_contact_alias_hint">Nume contact</string>
   <string name="menu_item_disappearing_messages">Mesaje ce dispar</string>
-  <string name="menu_item_connect_via_bluetooth">Conectare prin Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Conectare prin Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Persoana de contact trebuie să fie în apropiere pentru ca acest lucru să funcționeze.\n\nVoi și persoana de contact trebuie să apăsați amândoi \"Start\" în același timp.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Încercați deja să vă conectați prin Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Nu se poate continua fără Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Nu se poate continua fără permisiunea locației</string>
-  <string name="toast_connect_via_bluetooth_start">Conectarea prin Bluetooth...</string>
-  <string name="toast_connect_via_bluetooth_success">Conectat cu succes prin Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Nu s-a putut conecta prin Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Mesajele dvs. vor dispărea după %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -331,6 +322,12 @@
   <string name="introduction_response_accepted_received">%1$s a acceptat recomandarea pentru %2$s.</string>
   <string name="introduction_response_declined_received">%1$s a refuzat recomandarea pentru %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s spune că %2$s a refuzat recomandarea.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Conectare prin Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Conectare prin Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Nu se poate continua fără permisiunea locației</string>
+  <string name="connect_via_bluetooth_start">Conectarea prin Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Conectat cu succes prin Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Nici un grup de arătat</string>
   <string name="groups_list_empty_action">Atingeți iconița + pentru a crea un grup sau rugați-vă contactele să partajele grupuri cu dumneavoastră</string>
@@ -675,7 +672,6 @@ De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</str
   <string name="permission_hotspot_location_denied_body">Ați refuzat accesul la locație, dar Briar are nevoie de această permisiune pentru a creat un hotspot Wi-Fi.\n\nVă rugăm să luați în considerare acordarea accesului.</string>
   <string name="wifi_settings_title">Setări Wi-Fi</string>
   <string name="wifi_settings_request_enable_body">Pentru a crea un hotspot Wi-Fi, Briar are nevoie să folosească Wi-Fi. Vă rugăm să-l activați.</string>
-  <string name="wifi_settings_request_denied_body">Ați refuzat permisiunea de a activa Wi-Fi, dar Briar are nevoie să folosească Wi-Fi.\n\nVă rugăm să luați în considerare acordarea permisiunii.</string>
   <string name="hotspot_tab_manual">Manual</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">scanează cod QR</string>
@@ -726,8 +722,6 @@ De asemenea, contactul dvs. poate modifica această setare pentru amândoi.</str
   <string name="hotspot_flag_test">Atenție: Această aplicație a fost instalată din Android Studio și NU poate fi instalată pe un alt dispozitiv.</string>
   <string name="hotspot_error_framework_busy">Nu s-a putut porni hotspotul.\n\nDacă aveți alt hotspot pornit sau dacă partajați conexiunea la Internet prin Wi-Fi, încercați să opriți asta și să reîncercați apoi.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Transfer de date</string>
-  <string name="removable_drive_intro">Puteți trimite mesaje criptate contactului dvs. folosind un dispozitiv de stocare detașabil, cum ar fi unitățile flash USB sau cardurile SD.\n\nDacă contactul dvs. v-a trimis o unitate detașabilă care conține mesaje criptate, puteți importa mesajele în Briar folosind butonul de primire de mai jos.</string>
   <string name="removable_drive_title_send">Trimiteți date</string>
   <string name="removable_drive_title_receive">Primiți date</string>
   <string name="removable_drive_send_intro">Atingeți butonul de mai jos pentru a crea un nou fișier care conține mesajele criptate. Puteți alege unde va fi salvat fișierul.\n\nDacă doriți să salvați fișierul pe o unitate detașabilă, introduceți unitatea acum.</string>
diff --git a/briar-android/src/main/res/values-ru/strings.xml b/briar-android/src/main/res/values-ru/strings.xml
index daeef6e73..89af7bbba 100644
--- a/briar-android/src/main/res/values-ru/strings.xml
+++ b/briar-android/src/main/res/values-ru/strings.xml
@@ -175,15 +175,6 @@
   <string name="set_contact_alias">Изменить имя контакта</string>
   <string name="set_contact_alias_hint">Имя контакта</string>
   <string name="menu_item_disappearing_messages">Исчезающие сообщения</string>
-  <string name="menu_item_connect_via_bluetooth">Подключение через Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Подключение через Bluetooth</string>
-  <string name="dialog_message_connect_via_bluetooth">Чтобы это сработало, ваш контакт должен находиться поблизости.\n\nВы и ваш собеседник должны одновременно нажать кнопку \"Начать\".</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Пробуем подключиться через Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Невозможно продолжить без Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Невозможно продолжить без доступа к местоположению</string>
-  <string name="toast_connect_via_bluetooth_start">Подключение через Bluetooth...</string>
-  <string name="toast_connect_via_bluetooth_success">Успешное подключение через Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_error">Не удалось подключиться через Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Ваши сообщения исчезнут спустя %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -340,6 +331,12 @@
   <string name="introduction_response_accepted_received">%1$s принял(-а) знакомство с %2$s.</string>
   <string name="introduction_response_declined_received">%1$s отказался от знакомства с %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s сообщает, что %2$s отказался от знакомства.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Подключение через Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Подключение через Bluetooth</string>
+  <string name="connect_via_bluetooth_no_location_permission">Невозможно продолжить без доступа к местоположению</string>
+  <string name="connect_via_bluetooth_start">Подключение через Bluetooth...</string>
+  <string name="connect_via_bluetooth_success">Успешное подключение через Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Нет групп для отображения</string>
   <string name="groups_list_empty_action">Для создания группы нажмите значок + или попросите ваши контакты поделиться с вами группами</string>
@@ -688,7 +685,6 @@
   <string name="permission_hotspot_location_denied_body">Доступ к местоположению запрещен, но Briar необходимо это разрешение для создания точки доступа Wi-Fi.\n\nРассмотрите возможность предоставления доступа.</string>
   <string name="wifi_settings_title">Настройка Wi-Fi</string>
   <string name="wifi_settings_request_enable_body">Чтобы создать точку доступа Wi-Fi, Briar должен использовать Wi-Fi. Пожалуйста, включите его.</string>
-  <string name="wifi_settings_request_denied_body">Вы не дали разрешения на включение Wi-Fi, но Briar нуждается в использовании Wi-Fi.\n\nПожалуйста, рассмотрите возможность его включения.</string>
   <string name="hotspot_tab_manual">Вручную</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">сканировать QR-код</string>
@@ -740,8 +736,6 @@
   <string name="hotspot_flag_test">Предупреждение: Это приложение было установлено с помощью Android Studio и НЕ может быть установлено на другое устройство.</string>
   <string name="hotspot_error_framework_busy">Невозможно запустить точку доступа.\n\nЕсли у вас запущена другая точка доступа или вы используете подключение к интернету через Wi-Fi, попробуйте отключить его, а затем повторить попытку.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Передача данных</string>
-  <string name="removable_drive_intro">Вы можете отправлять зашифрованные сообщения своему контакту, используя съемные носители, такие как USB-накопители или SD-карты.\n\nЕсли ваш контакт отправил вам съемный носитель с зашифрованными сообщениями, вы можете импортировать эти сообщения в Briar, используя кнопку получения ниже.</string>
   <string name="removable_drive_title_send">Отправить данные</string>
   <string name="removable_drive_title_receive">Принять данные</string>
   <string name="removable_drive_send_intro">Нажмите кнопку ниже, чтобы создать новый файл, содержащий зашифрованные сообщения. Вы сможете выбрать, где будет сохранен этот файл.\n\nЕсли вы хотите сохранить файл на съемном диске, вставьте диск сейчас.</string>
diff --git a/briar-android/src/main/res/values-sq/strings.xml b/briar-android/src/main/res/values-sq/strings.xml
index 58dc5ac0a..be0781f5c 100644
--- a/briar-android/src/main/res/values-sq/strings.xml
+++ b/briar-android/src/main/res/values-sq/strings.xml
@@ -167,15 +167,6 @@ dhe s’mund të hapet me këtë version.\n\nJu lutemi, përmirësojeni me versi
   <string name="set_contact_alias">Ndryshoni emër kontakti</string>
   <string name="set_contact_alias_hint">Emër kontakti</string>
   <string name="menu_item_disappearing_messages">Mesazhe që treten</string>
-  <string name="menu_item_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
-  <string name="dialog_title_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
-  <string name="dialog_message_connect_via_bluetooth">Është e nevojshme që kontakti juaj të jetë atypari, që kjo të funksionojë.\n\nJu dhe kontakti juaj duhet që të shtypin “Fillo” në të njëjtën kohë.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Po provohet tashmë të lidhet përmes Bluetooth-i</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">S’mund të vazhdohet pa Bluetooth</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">S’mund të vazhdohet pa leje vendore</string>
-  <string name="toast_connect_via_bluetooth_start">Po lidhet me Bluetooth…</string>
-  <string name="toast_connect_via_bluetooth_success">U lidh me sukses përmes Bluetooth-i</string>
-  <string name="toast_connect_via_bluetooth_error">S’u lidh dot përmes Bluetooth-i</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">Mesazhet tuaja do të treten pas %1$s. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -324,6 +315,16 @@ dhe s’mund të hapet me këtë version.\n\nJu lutemi, përmirësojeni me versi
   <string name="introduction_response_accepted_received">%1$s pranoi prezantimin te %2$s.</string>
   <string name="introduction_response_declined_received">%1$s hodhi poshtë prezantimin te %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s thotë se %2$s hodhi poshtë prezantimin.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Lidhu përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_title">Lidhu përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_intro">Në rast se lidhjet me Bluetooth s’funksionojnë automatikisht, mund të përdorni këtë skenë që të bëni lidhjen dorazi.\n\nQë kjo të funksionojë, kontakti juaj duhet të jetë atypari.\n\nJu dhe kontakti juaj duhet të shtypni që të dy “Fillo” në të njëjtën kohë.</string>
+  <string name="connect_via_bluetooth_already_discovering">Po provohet tashmë të bëhet lidhje përmes Bluetooth-i. Ju lutemi, riprovoni pas pak.</string>
+  <string name="connect_via_bluetooth_no_location_permission">S’mund të vazhdohet pa leje vendore</string>
+  <string name="connect_via_bluetooth_start">Po lidhet me Bluetooth…</string>
+  <string name="connect_via_bluetooth_success">U lidh me sukses përmes Bluetooth-i</string>
+  <string name="connect_via_bluetooth_error">S’u bë dot lidhja me Bluetooth.</string>
+  <string name="connect_via_bluetooth_error_not_supported">Bluetooth-i nuk mbulohet nga pajisja.</string>
   <!--Private Groups-->
   <string name="groups_list_empty">S’ka grupe për shfaqje</string>
   <string name="groups_list_empty_action">Prekni ikonën + që të krijoni një grup, ose kërkojuni kontakteve tuaj të ndajnë grupe me ju</string>
@@ -666,7 +667,6 @@ Briar-i i përdor ato paralelisht.</string>
   <string name="permission_hotspot_location_denied_body">Keni mohuar njohjen e vendndodhjes tuaj, ndërkohë që Briar-it i duhet kjo leje për të krijuar një hotspot Wi-Fi.\n\nJu lutemi, shihni mundësinë e akordimit të kësaj lejeje.</string>
   <string name="wifi_settings_title">Rregullim Wi-Fi-i</string>
   <string name="wifi_settings_request_enable_body">Që të krijohet një hotspot Wi-Fi, Briar-it i duhet të përdorë Wi-Fi-n. Ju lutemi, aktivizojeni.</string>
-  <string name="wifi_settings_request_denied_body">Keni mohuar lejen për aktivizim të Wi-Fi-t, por Briar-it i duhet të përdorë Wi-Fi-n.\n\nJu lutemi, shihni mundësinë e aktivizimit të tij.</string>
   <string name="hotspot_tab_manual">Dorazi</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">duke skanuar një kod QR</string>
@@ -716,8 +716,6 @@ Briar-i i përdor ato paralelisht.</string>
   <string name="hotspot_flag_test">Kujdes: Ky aplikacion qe instaluar me Android Studio dhe NUK mund të instalohet në një pajisje tjetër.</string>
   <string name="hotspot_error_framework_busy">S’arrihet të niset hotspot-i.\n\nNëse keni një tjetër hotspot në punë, ose e jepni lidhjen tuaj Internet përmes Wi-Fi, provoni ta ndalni dhe të riprovoni pas kësaj.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Shpërngulni të dhëna</string>
-  <string name="removable_drive_intro">Mundeni të dërgoni mesazhe të fshehtëzuar te kontakti juaj duke përdorur depozitë të heqshme, bie fjala disqthe USB, ose karta SD.\n\nNëse kontakti juaj ju ka dërguar një disk të heqshëm që përmban mesazhe të fshehtëzuar, mund t’i importoni mesazhet në Briar duke përdorur butonin e marrjes më poshtë.</string>
   <string name="removable_drive_title_send">Dërgoni të dhëna</string>
   <string name="removable_drive_title_receive">Merrni të dhëna</string>
   <string name="removable_drive_send_intro">Prekni butonin më poshtë që të krijoni një kartelë të re që përmban mesazhe të fshehtëzuar. Mund të zgjidhni ku të ruhen kartelat.\n\nNëse doni të ruhet kartela në një disk të heqshëm, futeni diskun tani.</string>
diff --git a/briar-android/src/main/res/values-sv/strings.xml b/briar-android/src/main/res/values-sv/strings.xml
index 0164968c2..7d57ab21b 100644
--- a/briar-android/src/main/res/values-sv/strings.xml
+++ b/briar-android/src/main/res/values-sv/strings.xml
@@ -150,8 +150,6 @@
   <string name="image_attach_error_invalid_mime_type">Bildformatet stöds ej: %s</string>
   <string name="set_contact_alias">Ändra namn på kontakt</string>
   <string name="set_contact_alias_hint">Kontaktnamn</string>
-  <string name="menu_item_connect_via_bluetooth">Anslut via Bluetooth</string>
-  <string name="dialog_title_connect_via_bluetooth">Anslut via Bluetooth</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <!--The placeholder at the end will add "Tap to learn more."-->
   <!--The first placeholder will show a contact's name. The second placeholder will show a duration like "7 days". The third placeholder at the end will add "Tap to learn more."-->
@@ -278,6 +276,9 @@
   <string name="introduction_response_accepted_received">%1$s godkände att bli presenterad för %2$s.</string>
   <string name="introduction_response_declined_received">%1$s avvisade presentation för %2$s.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s säger att %2$s avvisade presentation.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Anslut via Bluetooth</string>
+  <string name="connect_via_bluetooth_title">Anslut via Bluetooth</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Inga grupper</string>
   <string name="groups_list_empty_action">Tryck på plus-ikonen (+) för att skapa en grupp. Du kan också fråga en kontakt om att bli inbjuden till en grupp.</string>
diff --git a/briar-android/src/main/res/values-tr/strings.xml b/briar-android/src/main/res/values-tr/strings.xml
index 0e56bae29..d12c20199 100644
--- a/briar-android/src/main/res/values-tr/strings.xml
+++ b/briar-android/src/main/res/values-tr/strings.xml
@@ -165,15 +165,6 @@
   <string name="set_contact_alias">Kişi adını değiştir</string>
   <string name="set_contact_alias_hint">Ad</string>
   <string name="menu_item_disappearing_messages">Kaybolan iletiler</string>
-  <string name="menu_item_connect_via_bluetooth">Bluetooth ile Bağlan</string>
-  <string name="dialog_title_connect_via_bluetooth">Bluetooth ile Bağlan</string>
-  <string name="dialog_message_connect_via_bluetooth">Bunun çalışması için kişinin yakınlarda olması gerekiyor.\n\nSizin ve kişinin \"Başlat\" düğmesine aynı anda basması gerekiyor.</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">Zaten Bluetooth\'a bağlanmaya çalışıyor</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">Bluetooth olmadan devam edilemez</string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">Konum izni olmadan devam edilemez</string>
-  <string name="toast_connect_via_bluetooth_start">Bluetooth ile bağlanılıyor…</string>
-  <string name="toast_connect_via_bluetooth_success">Bluetooth ile başarılı bir şekilde bağlandı</string>
-  <string name="toast_connect_via_bluetooth_error">Bluetooth ile bağlanamıyor</string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">İletileriniz %1$s sonra kaybolacak. %2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -322,6 +313,12 @@
   <string name="introduction_response_accepted_received">%1$s, %2$s ile tanışmayı kabul etti.</string>
   <string name="introduction_response_declined_received">%1$s, %2$s ile tanışmayı reddetti.</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s, %2$s kişisinin tanışmayı reddettiğini söyledi.</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">Bluetooth ile Bağlan</string>
+  <string name="connect_via_bluetooth_title">Bluetooth ile Bağlan</string>
+  <string name="connect_via_bluetooth_no_location_permission">Konum izni olmadan devam edilemez</string>
+  <string name="connect_via_bluetooth_start">Bluetooth ile bağlanılıyor…</string>
+  <string name="connect_via_bluetooth_success">Bluetooth ile başarılı bir şekilde bağlandı</string>
   <!--Private Groups-->
   <string name="groups_list_empty">Gösterilecek grup yok</string>
   <string name="groups_list_empty_action">Bir grup oluşturmak için + simgesine dokunun veya kişilerinizden grupları sizinle paylaşmasını isteyin</string>
@@ -662,7 +659,6 @@
   <string name="permission_hotspot_location_denied_body">Konuma erişimi engellediniz, ancak Briar\'ın Wi-Fi erişim noktası oluşturmak için bu izne ihtiyacı var.\n\nLütfen erişim izni vermeyi düşünün.</string>
   <string name="wifi_settings_title">Kablosuz ağ ayarları</string>
   <string name="wifi_settings_request_enable_body">Bir kablosuz erişim noktası oluşturmak için Briar\'ın kablosuz ağı kullanması gerekiyor. Lütfen kablosuz ağı etkinleştirin.</string>
-  <string name="wifi_settings_request_denied_body">Kablosuz ağı etkinleştirmeyi engellediniz, ancak Briar\'ın kablosuz ağı kullanması gerekiyor.\n\nLütfen etkinleştirmeyi düşünün. </string>
   <string name="hotspot_tab_manual">El ile</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">QR kodu tarayarak</string>
@@ -712,8 +708,6 @@
   <string name="hotspot_flag_test">Uyarı: Bu uygulama Android Studio ile kurulduğu için başka bir aygıta kurulamaz.</string>
   <string name="hotspot_error_framework_busy">Erişim noktası başlatılamıyor.\n\nEğer başka bir erişim noktası çalışıyorsa veya İnternet bağlantınızı kablosuz üzerinden paylaşıyorsanız, lütfen önce onu durdurun ve sonra yeniden deneyin.</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">Veri aktar</string>
-  <string name="removable_drive_intro">Kişilerinize USB flash bellek veya SD kart gibi taşınabilir diskler yardımıyla şifreli ileti gönderebilirsiniz.\n\nEğer bir kişi size taşınabilir bir sürücüde şifreli iletiler gönderdiyse, aşağıdaki al düğmesini kullanarak iletileri Briar\'a yükleyebilirsiniz.</string>
   <string name="removable_drive_title_send">Veri gönder</string>
   <string name="removable_drive_title_receive">Veri al</string>
   <string name="removable_drive_send_intro">Şifreli iletileri içeren yeni bir dosya oluşturmak için aşağıdaki düğmeye dokunun. Dosyanın kaydedileceği yeri seçebilirsiniz.\n\nEğer dosyayı taşınabilir bir sürücüye saklamak istiyorsanız, sürücüyü şimdi takın.</string>
diff --git a/briar-android/src/main/res/values-zh-rCN/strings.xml b/briar-android/src/main/res/values-zh-rCN/strings.xml
index 9bf600217..85730ff37 100644
--- a/briar-android/src/main/res/values-zh-rCN/strings.xml
+++ b/briar-android/src/main/res/values-zh-rCN/strings.xml
@@ -160,15 +160,6 @@
   <string name="set_contact_alias">更改联系人姓名</string>
   <string name="set_contact_alias_hint">联系人姓名</string>
   <string name="menu_item_disappearing_messages">让消息自动消失 </string>
-  <string name="menu_item_connect_via_bluetooth">通过蓝牙连接</string>
-  <string name="dialog_title_connect_via_bluetooth">通过蓝牙连接</string>
-  <string name="dialog_message_connect_via_bluetooth">你的联络人必须在附近才能起作用。\n\n你和你的联系人应该同时按“开始”。</string>
-  <string name="toast_connect_via_bluetooth_already_discovering">已在尝试通过蓝牙进行连接</string>
-  <string name="toast_connect_via_bluetooth_not_discoverable">没有蓝牙无法继续 </string>
-  <string name="toast_connect_via_bluetooth_no_location_permission">没有位置权限不能继续 </string>
-  <string name="toast_connect_via_bluetooth_start">正通过蓝牙连接 …</string>
-  <string name="toast_connect_via_bluetooth_success">通过蓝牙连接成功</string>
-  <string name="toast_connect_via_bluetooth_error">无法通过蓝牙连接 </string>
   <!--The first placeholder will show a duration like "7 days". The second placeholder at the end will add "Tap to learn more."-->
   <string name="auto_delete_msg_you_enabled">你的消息将在 %1$s 后消失。%2$s</string>
   <!--The placeholder at the end will add "Tap to learn more."-->
@@ -313,6 +304,16 @@
   <string name="introduction_response_accepted_received">%1$s 已接受与 %2$s 建立联系。</string>
   <string name="introduction_response_declined_received">%1$s 已谢绝与 %2$s 建立联系。</string>
   <string name="introduction_response_declined_received_by_introducee">%1$s 表示 %2$s 谢绝了介绍。</string>
+  <!--Connect via Bluetooth-->
+  <string name="menu_item_connect_via_bluetooth">通过蓝牙连接</string>
+  <string name="connect_via_bluetooth_title">通过蓝牙连接</string>
+  <string name="connect_via_bluetooth_intro">如果蓝牙无法自动连接，您可以使用此界面进行手动连接。\n\n你的联系人需要在附近，这样才能工作。\n\n你和你的联系人应该同时按“开始。</string>
+  <string name="connect_via_bluetooth_already_discovering">已经在尝试通过蓝牙连接。请稍后再试</string>
+  <string name="connect_via_bluetooth_no_location_permission">没有位置权限不能继续 </string>
+  <string name="connect_via_bluetooth_start">正通过蓝牙连接 …</string>
+  <string name="connect_via_bluetooth_success">通过蓝牙连接成功</string>
+  <string name="connect_via_bluetooth_error">无法通过蓝牙连接。</string>
+  <string name="connect_via_bluetooth_error_not_supported">设备不支持蓝牙</string>
   <!--Private Groups-->
   <string name="groups_list_empty">尚无群聊可供展示</string>
   <string name="groups_list_empty_action">轻按 + 号创建群聊，或让您的联系人分享群聊给您</string>
@@ -649,7 +650,6 @@
   <string name="permission_hotspot_location_denied_body">你拒绝了访问你的位置，但 Briar 需要这个权限才能创建 Wi-Fi 热点。\n\n请考虑授予访问权限。</string>
   <string name="wifi_settings_title">Wi-Fi 设置</string>
   <string name="wifi_settings_request_enable_body">要创建 Wi-Fi 热点，Briar 需要使用 Wi-Fi。请允许它。</string>
-  <string name="wifi_settings_request_denied_body">您拒绝了启用 Wi-Fi 的权限，但 Briar 需要使用Wi-Fi。\n\n请考虑允许 Brair 使用它。</string>
   <string name="hotspot_tab_manual">手动</string>
   <!--The placeholder to be inserted into the string 'hotspot_manual_wifi': People can connect by %s-->
   <string name="hotspot_scanning_a_qr_code">扫描一个二维码</string>
@@ -700,8 +700,6 @@
   <string name="hotspot_flag_test">警告：此应用程序通过 Android Studio 安装，不能安装在其他设备上</string>
   <string name="hotspot_error_framework_busy">无法启动热点。\n\n如果您有另一个热点正在运行或通过 Wi-Fi 共享您的互联网连接，尝试停止它稍后再试一次。</string>
   <!--Transfer Data via Removable Drives-->
-  <string name="removable_drive_menu_title">传输数据</string>
-  <string name="removable_drive_intro">您可以使用USB闪存驱动器或SD卡等可移动存储设备向您的联系人发送加密信息。\n\n如果您的联系人发送给您一个包含加密信息的可移动驱动器，您可以使用下面的接收按钮将这些信息导入到Briar中。</string>
   <string name="removable_drive_title_send">发送数据</string>
   <string name="removable_drive_title_receive">接收数据</string>
   <string name="removable_drive_send_intro">轻按下面的按钮创建一个包含加密消息的新文件。您可以选择将文件保存在哪里。\n\n如果您想将文件保存在可移动驱动器上，请立即插入驱动器。</string>