diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e6487c895b..77f770e360 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -137,16 +137,11 @@
   <string name="DateUtils_now">الآن</string>
   <string name="DateUtils_minutes_ago">%d دقيقة</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">قطع اتصال \'%s\'؟</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">الجهاز لن يتمكن من إرسال أو استقبال رسائل بعد قطع الاتصال.</string>
   <string name="DeviceListActivity_network_connection_failed">فشل في اتصال الشبكة...</string>
   <string name="DeviceListActivity_try_again">حاول مجددا</string>
-  <string name="DeviceListActivity_disconnecting_device">جارٍ فصل الجهاز...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">جارٍ فصل الجهاز</string>
   <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
-  <string name="DeviceListItem_created_s">أُنُشِئْتُ %s</string>
   <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
@@ -234,13 +229,9 @@
   <string name="DeviceProvisioningActivity_content_bullets">
 قراءة كل رسائلك.
 \n- استخدام أسمك للإرسال</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">إضافة جهاز</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">جارٍ إضافة جهاز جديد...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">تم إضافة الجهاز!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">لم يتم العثور على جهاز.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطأ في الشبكة.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">الرمز غير سليم.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">نأسف، لديك العديد من الأجهزة المسجلة مسبقا. حاول فصل بعضهم...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة تيكست سيكيور</string>
@@ -434,7 +425,6 @@
   <string name="country_selection_fragment__loading_countries">تحميل البلدان جارٍ ...</string>
   <string name="country_selection_fragment__search">بحث</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">لا يوجد أجهزة مقترنة...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
   <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
@@ -568,7 +558,6 @@
   <string name="AndroidManifest__media_overview">جميع الصور</string>
   <string name="AndroidManifest__media_overview_named">جميع الصور مع %1$s</string>
   <string name="AndroidManifest__message_details">تفاصيل الرسالة</string>
-  <string name="AndroidManifest_manage_paired_devices">إدارة الأجهزة المقترنة</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد \ تصدير</string>
   <string name="arrays__my_identity_key">مفتاح هويتي</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index eafbe71e0f..bcb0c127ba 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -215,8 +215,6 @@
         - Прачытаць усе вашыя паведамленні
         \n- Даслаць паведамленне на Ваша імя
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Дабаўленне новага дэвайса...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Дэвайс дададзены!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ня знойдзена дэвайсаў.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Памылка сеткі.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Няправільны QR код.</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index dd12b34ccb..54635fbd0c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -143,16 +143,11 @@
   <string name="DateUtils_now">Сега</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Прекрати връзка с \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
   <string name="DeviceListActivity_network_connection_failed">Неуспешна връзка с интернет...</string>
   <string name="DeviceListActivity_try_again">Опитай отново</string>
-  <string name="DeviceListActivity_disconnecting_device">Прекратяване на връзката с устройството</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекратяване на връзката с устройството</string>
   <string name="DeviceListActivity_network_failed">Грешка в мрежата!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
-  <string name="DeviceListItem_created_s">Създанено %s</string>
   <string name="DeviceListItem_last_active_s">Последна активност %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
@@ -247,13 +242,9 @@ SMS съобщенията от системната базата данни в
   <string name="DeviceProvisioningActivity_content_bullets">
 Чете всичките ти съобщения
 \n - Изпраща съобщения от твое име</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Добавяне на устройство</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Добавяне на ново устройство...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Устройството добавено!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Не е открито устройство.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Проблем с мобилната мрежа.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Невалиден QR код.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</string>
@@ -457,7 +448,6 @@ SMS съобщенията от системната базата данни в
   <string name="country_selection_fragment__loading_countries">Зареждане на държавите...</string>
   <string name="country_selection_fragment__search">Търси</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Няма свързани устройства...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
@@ -612,7 +602,6 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Информаця за съобщението</string>
-  <string name="AndroidManifest_manage_paired_devices">Управление на свързани устройства</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1fef40b1d4..87861e2a14 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -148,16 +148,11 @@ kontakt</string>
   <string name="DateUtils_now">Teď</string>
   <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odpojit \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Po odpojení toho zařízení již nebude možno přijímat nebo odesílat zprávy.</string>
   <string name="DeviceListActivity_network_connection_failed">Síťové spojení slehalo...</string>
   <string name="DeviceListActivity_try_again">Zkusit znovu</string>
-  <string name="DeviceListActivity_disconnecting_device">Odpojuji zařízení...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odpojuji zařízení</string>
   <string name="DeviceListActivity_network_failed">Síť selhala</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nepojmenované zřízení</string>
-  <string name="DeviceListItem_created_s">Vytvořeno %s</string>
   <string name="DeviceListItem_last_active_s">Naposled aktivní %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Sdílet s</string>
@@ -247,13 +242,9 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <string name="DeviceProvisioningActivity_content_bullets">
 Přečíst všechny zprávy
 Poslat zprávy Vaším jménem.</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Přidat zařízení</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Přidává se nové zařízení</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Zařízení přidáno.</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenalezeno žádné zařízení.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba sítě.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Omlouváme se, ale máte zaregistrováno příliš mnoho zařízení, pokuste se některé odebrat...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -451,7 +442,6 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="country_selection_fragment__loading_countries">Načítám země...</string>
   <string name="country_selection_fragment__search">Hledat</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Žádné zařízení není spárováno</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nepodařilo se zaznamenat logy z vašeho zařízení. Jěště můžete zkusit použít pro získání debug logů nástroj ADB.</string>
   <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
@@ -604,7 +594,6 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="AndroidManifest__media_overview">Všechny obrázky</string>
   <string name="AndroidManifest__media_overview_named">Všechny obrázky s %1$s</string>
   <string name="AndroidManifest__message_details">Podrobnosti zprávy</string>
-  <string name="AndroidManifest_manage_paired_devices">Spravovat spárovaná zařízení</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Můj identifikační klíč</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 66edf6b84a..160195437d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -144,16 +144,11 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="DateUtils_now">Jetzt</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">\"%s\" trennen?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Durch Trennung dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
   <string name="DeviceListActivity_network_connection_failed">Keine Netzwerkverbindung …</string>
   <string name="DeviceListActivity_try_again">Erneut versuchen</string>
-  <string name="DeviceListActivity_disconnecting_device">Gerät wird getrennt …</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Trennen</string>
   <string name="DeviceListActivity_network_failed">Netzwerkfehler!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
-  <string name="DeviceListItem_created_s">Erstellt %s</string>
   <string name="DeviceListItem_last_active_s">Zuletzt aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
@@ -243,13 +238,9 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Alle Nachrichten lesen
 \n- Nachrichten in Ihrem Namen senden </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Gerät hinzufügen</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird hinzugefügt …</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Geräte wurde hinzugefügt!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Kein Gerät gefunden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Es sind bereits zu viele Geräte registriert. Versuchen Sie, mindestens eines zu entfernen …</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-Symbol</string>
@@ -446,7 +437,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
   <string name="country_selection_fragment__search">Suchen</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Keine Geräte verbunden …</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
@@ -579,7 +569,6 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__media_overview">Alle Bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle Bilder mit %1$s</string>
   <string name="AndroidManifest__message_details">Nachrichtendetails</string>
-  <string name="AndroidManifest_manage_paired_devices">Verbundene Geräte verwalten</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ce2a458841..933de68fd0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -238,8 +238,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="DeviceProvisioningActivity_content_bullets">
 Διαβάσει όλα τα μηνύματά σας
 \n- Στείλει μηνύματα με το όνομά σας</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Προσθήκη νέας συσκευής...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Η συσκευή προστεθηκε!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Δεν βρέθηκε συσκευή.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Σφάλμα δικτύου</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Άκυρος QR κωδικός.</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3fbfe3019d..5873e08711 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -153,16 +153,11 @@ Recibido:%4$s</string>
   <string name="DateUtils_now">Ahora</string>
   <string name="DateUtils_minutes_ago">%d mins</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">¿Desconectar \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desconectar este dispositivo, ya no podrá enviar y recibir mensajes.</string>
   <string name="DeviceListActivity_network_connection_failed">Fallo de conexión a la red...</string>
   <string name="DeviceListActivity_try_again">Intentar de nuevo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectando dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
-  <string name="DeviceListItem_created_s">Creado el %s</string>
   <string name="DeviceListItem_last_active_s">Activo por última vez el %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
@@ -264,13 +259,9 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
         - Leer todos sus mensajes
         \n- Enviar mensajes en su nombre
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Añadiendo dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Añadiendo nuevo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">¡Dispositivo añadido!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">No se encontró ningun dispositivo.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Error de red.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR no válido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Lo sentimos, tiene ya registrados demasiados dispositivos. Pruebe a eliminar algunos...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de TextSecure</string>
@@ -482,7 +473,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">No hay dispositivos emparejados...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">No se pudieron obtener los registros de actividad de su dispositivo. En su lugar, aún puede usar ADB para acceder a los registros de depuración.</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
@@ -655,7 +645,6 @@ por SMS.
   <string name="AndroidManifest__media_overview">Todas las imágenes</string>
   <string name="AndroidManifest__media_overview_named">Todas la imágenes con %1$s</string>
   <string name="AndroidManifest__message_details">Detalles del mensaje</string>
-  <string name="AndroidManifest_manage_paired_devices">Administrar dispositivos emparejados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar/exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2be367280f..0b62c2ea26 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -125,8 +125,6 @@
   <string name="DateUtils_now">اکنون</string>
   <!--DeviceListActivity-->
   <string name="DeviceListActivity_try_again">دوباره تلاش کن</string>
-  <string name="DeviceListActivity_disconnecting_device">قطع اتصال دستگاه ...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">قطع اتصال دستگاه</string>
   <string name="DeviceListActivity_network_failed">شکست خوردن در شبکه!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">دستگاهی که نامش ذکر نشده</string>
@@ -197,9 +195,6 @@
   <string name="DeviceProvisioningActivity_continue">ادامه</string>
   <string name="DeviceProvisioningActivity_title">پیوند این دستگاه؟</string>
   <string name="DeviceProvisioningActivity_content_intro">این قادر خواهد بود به</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">اضافه کردن دستگاه</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">اضافه کردن دستگاه جدید ...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">دستگاه اضافه شده است!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">دستگاه یافت نشد.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطای شبکه.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">کد QR نامعتبر است.</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ecd9414f7b..5fdff85adf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -152,16 +152,11 @@ Vastaanotettu: %4$s</string>
   <string name="DateUtils_now">Nyt</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Poista \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Jos poistat tämän laitteen, sillä ei voi enää lähettää eikä vastaanottaa viestejä.</string>
   <string name="DeviceListActivity_network_connection_failed">Verkkoyhteyden muodostus epäonnistui...</string>
   <string name="DeviceListActivity_try_again">Yritä uudelleen</string>
-  <string name="DeviceListActivity_disconnecting_device">Poistetaan laitetta...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Poistetaan laitetta</string>
   <string name="DeviceListActivity_network_failed">Verkkoyhteysvirhe!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nimeämätön laite</string>
-  <string name="DeviceListItem_created_s">Luotu %s</string>
   <string name="DeviceListItem_last_active_s">Viimeksi käytetty %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Jaa</string>
@@ -255,13 +250,9 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - lukea kaikki viestisi
 \n- lähettää viestejä sinun nimessäsi</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Lisätään laitetta</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Lisätään uutta laitetta...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Laite lisätty!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Laitetta ei löytynyt.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Verkkovirhe.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Virheellinen QR-koodi.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sinulla on liian monta laitetta rekisteröitynä. Kokeile poistaa joitakin.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Syötä salalause</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-kuvake</string>
@@ -466,7 +457,6 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
   <string name="country_selection_fragment__search">Hae</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ei yhdistettyjä laitteita...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Lokien hakeminen laitteesta epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokien noutamiseen.</string>
   <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
@@ -609,7 +599,6 @@ epäonnistui.</string>
   <string name="AndroidManifest__media_overview">Kaikki kuvat</string>
   <string name="AndroidManifest__media_overview_named">%1$s: kaikki kuvat</string>
   <string name="AndroidManifest__message_details">Viestin tiedot</string>
-  <string name="AndroidManifest_manage_paired_devices">Hallitse yhdistettyjä laitteita</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Varmuuskopiot</string>
   <string name="arrays__my_identity_key">Oma identiteettiavaimeni</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d25adfe797..6010c7f763 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -148,16 +148,11 @@ vérifier ce contact.</string>
   <string name="DateUtils_now">À l\'instant</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Déconnecter \'%s\' ?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous déconnectez cet appareil, il ne sera plus capable d\'envoyer ou recevoir des messages.</string>
   <string name="DeviceListActivity_network_connection_failed">Erreur de connexion réseau...</string>
   <string name="DeviceListActivity_try_again">Essayer à nouveau</string>
-  <string name="DeviceListActivity_disconnecting_device">Déconnexion de l\'appareil...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Déconnexion de l\'appareil</string>
   <string name="DeviceListActivity_network_failed">Erreur réseau !</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
-  <string name="DeviceListItem_created_s">%s créé</string>
   <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
@@ -253,13 +248,9 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
         - Lire tous vos messages
         \n- Envoyer des messages en votre nom
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Ajout de l\'appareil</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Ajout du nouvel appareil...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Appareil ajouté</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Pas d\'appareil trouvé.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erreur réseau.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR code invalide.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Désolé, vous avez trop d\'appareils déjà enregistrés, essayez d\'en enlever quelques-uns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Entrez la phrase de passe</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icône TextSecure</string>
@@ -464,7 +455,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
   <string name="country_selection_fragment__search">Chercher</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Aucun appareil appairé...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">TextSecure n\'a pas pu obtenir les logs de votre téléphone. Vous pouvez utiliser ADB pour récupérer les logs de debug.</string>
   <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
@@ -611,7 +601,6 @@ par SMS.</string>
   <string name="AndroidManifest__media_overview">Toutes les images</string>
   <string name="AndroidManifest__media_overview_named">Toutes les images avec %1$s</string>
   <string name="AndroidManifest__message_details">Détails du message</string>
-  <string name="AndroidManifest_manage_paired_devices">Gérer les appareils appairés</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 05b673f465..cfcfa71b51 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -144,16 +144,11 @@ ovaj kontakt.</string>
   <string name="DateUtils_now">Sada</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odspoji \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Odspajanjem ovog uređaja više nećete moći slati ili primati poruke.</string>
   <string name="DeviceListActivity_network_connection_failed">Povezivanje na mrežu nije uspjelo...</string>
   <string name="DeviceListActivity_try_again">Pokušajte ponovno</string>
-  <string name="DeviceListActivity_disconnecting_device">Odspajanje uređaja...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odspajanje uređaja</string>
   <string name="DeviceListActivity_network_failed">Greška mreže!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Neimenovani uređaj</string>
-  <string name="DeviceListItem_created_s">Stvoreno %s</string>
   <string name="DeviceListItem_last_active_s">Zadnje aktivno %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podijeli s</string>
@@ -247,13 +242,9 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Čitati sve vaše poruke
 \n- Slati poruke u vaše ime</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodavanje uređaja</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodavanje novog uređaja...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Uređaj dodan!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Uređaj nije pronađen.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Mrežna greška.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neispravan QR kod.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Imate previše registriranih uređaja, pokušajte ukloniti neke...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Unesite lozinku</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
@@ -457,7 +448,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="country_selection_fragment__loading_countries">Učitavanje zemalja...</string>
   <string name="country_selection_fragment__search">Traži</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nema uparenih uređaja...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nije moguće dohvatiti zapise sa vašeg uređaja. Još uvijek možete koristiti ADB kako biste dohvatili debug zapise.</string>
   <string name="log_submit_activity__thanks">Hvala na pomoći!</string>
@@ -604,7 +594,6 @@ neuspješno.</string>
   <string name="AndroidManifest__media_overview">Sve slike</string>
   <string name="AndroidManifest__media_overview_named">Sve slike sa %1$s</string>
   <string name="AndroidManifest__message_details">Detalji poruke</string>
-  <string name="AndroidManifest_manage_paired_devices">Upravljanje uparenim uređajima</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz / izvoz</string>
   <string name="arrays__my_identity_key">Moj ključ identiteta</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 13b65e37d4..80b4a3b1cc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -149,16 +149,11 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="DateUtils_now">Most</string>
   <string name="DateUtils_minutes_ago">%d perc</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Lecsatlakoztatod \'%s\'-t?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ennek az eszköznek a lecsatlakoztatásával többé nem lesz alkalmas üzenetek küldésére vagy fogadására.</string>
   <string name="DeviceListActivity_network_connection_failed">Hálózati csatlakozás sikertelen...</string>
   <string name="DeviceListActivity_try_again">Újrapróbálkozás</string>
-  <string name="DeviceListActivity_disconnecting_device">Eszköz leválasztása...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Eszköz lecsatlakoztatása</string>
   <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Megnevezetlen eszköz</string>
-  <string name="DeviceListItem_created_s">Készítve %s</string>
   <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Megosztás...</string>
@@ -256,13 +251,9 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Az összes üzenet olvasása
 \n- Üzenetek küldése a nevedben</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Eszköz hozzáadása</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Új eszköz hozzáadása...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Eszköz hozzáadása megtörtént!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nem található eszköz</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Hálózati hiba</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Érvénytelen QR kód</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sajnálom, túl sok eszközöd van jelenleg regisztrálva, próbálj eltávolítani néhányat...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Jelszó megadása</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@@ -474,7 +465,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="country_selection_fragment__loading_countries">Országok betöltése...</string>
   <string name="country_selection_fragment__search">Keresés</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nincsenek eszközök párosítva...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
@@ -641,7 +631,6 @@ sikertelen.
   <string name="AndroidManifest__media_overview">Minden fénykép</string>
   <string name="AndroidManifest__media_overview_named">Minden fénykép vele: %1$s</string>
   <string name="AndroidManifest__message_details">Üzenet részletei</string>
-  <string name="AndroidManifest_manage_paired_devices">Párosított eszközök kezelése</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c45f87bf8b..d82ffd57aa 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -142,16 +142,11 @@ questo contatto.</string>
   <string name="DateUtils_now">Adesso</string>
   <string name="DateUtils_minutes_ago">%d minuto</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Disconnettere \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Disconnettendo questo dispositivo, esso non sarà più in grado di ricevere nè inviare messaggi.</string>
   <string name="DeviceListActivity_network_connection_failed">Connessione di rete fallita....</string>
   <string name="DeviceListActivity_try_again">Riprova</string>
-  <string name="DeviceListActivity_disconnecting_device">Disconnessione dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Scollegamento dispositivo</string>
   <string name="DeviceListActivity_network_failed">Errore di rete!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo senza nome</string>
-  <string name="DeviceListItem_created_s">Creato %s</string>
   <string name="DeviceListItem_last_active_s">Ultima attività %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Condividi con</string>
@@ -247,13 +242,9 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Leggere tutti i tuoi messaggi
 \n- Inviare messaggi col tuo nome</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Aggiunta dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Aggiunta nuovo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo aggiunto!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nessun dispositivo trovato.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Errore di rete.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Codice QR non valido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Ci spiace, hai già troppi dispositivi registrati, prova a rimuoverne alcuni...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Inserire la password</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icona TextSecure</string>
@@ -458,7 +449,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
   <string name="country_selection_fragment__search">Cerca</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nessun dispositivo collegato...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Non riesco a recuperare i log dal tuo dispositivo. Puoi sempre utilizzare ADB per ottenere i log di debug.</string>
   <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
@@ -619,7 +609,6 @@ non riuscita.
   <string name="AndroidManifest__media_overview">Tutte le immagini</string>
   <string name="AndroidManifest__media_overview_named">Tutte le immagini con %1$s</string>
   <string name="AndroidManifest__message_details">Dettagli messaggio</string>
-  <string name="AndroidManifest_manage_paired_devices">Gestisci dispositivi collegati</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa / Esporta</string>
   <string name="arrays__my_identity_key">La chiave della mia identità</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 5ec130b899..8b2be0b3f4 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -143,16 +143,11 @@
   <string name="DateUtils_now">今</string>
   <string name="DateUtils_minutes_ago">%d 分</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">\'%s\' を切断しますか?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">このデバイスを切断すると、メッセージを送信/受信することはできなくなります。</string>
   <string name="DeviceListActivity_network_connection_failed">ネットワーク接続が失敗...</string>
   <string name="DeviceListActivity_try_again">再試行</string>
-  <string name="DeviceListActivity_disconnecting_device">デバイスの切断...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">デバイスの切断</string>
   <string name="DeviceListActivity_network_failed">ネットワークが失敗!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">無名のデバイス</string>
-  <string name="DeviceListItem_created_s">%s を生成</string>
   <string name="DeviceListItem_last_active_s">最後にアクティブ %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共有</string>
@@ -241,13 +236,9 @@
         - あなたへのすべてのメッセージを読むこと
         \n- あなたの名前でメッセージを送ること
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">デバイスの追加</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">新規デバイスの追加...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">デバイスを追加!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">デバイスがありません。</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">ネットワークエラー。</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QRコードが無効。</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">すみません、あなたはすでにとても多数のデバイスを登録しています、なんらかを削除してみてください...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">パスワード入力</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecureアイコン</string>
@@ -444,7 +435,6 @@
   <string name="country_selection_fragment__loading_countries">国名を読み込み中...</string>
   <string name="country_selection_fragment__search">検索</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">ペアリングしたデバイスはありません...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">デバッグログの入手に失敗しました。ADBを使ってログの入手は、可能です。</string>
   <string name="log_submit_activity__thanks">提出どうもありがとうございます！</string>
@@ -582,7 +572,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="AndroidManifest__media_overview">すべての画像</string>
   <string name="AndroidManifest__media_overview_named">%1$s とすべての画像</string>
   <string name="AndroidManifest__message_details">メッセージの詳細</string>
-  <string name="AndroidManifest_manage_paired_devices">ペアリングデバイスの管理</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">インポート／エクスポート</string>
   <string name="arrays__my_identity_key">自分の認証キー</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 7f7f62fa6c..2ce4b5b7a7 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -218,8 +218,6 @@
         - ನಿಮ್ಮ ಎಲ್ಲಾ ಸಂದೇಶಗಳನ್ನು ಓದಿ
         \n- ನಿಮ್ಮ ಹೆಸರಿನಲ್ಲಿ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಿ
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">ಹೋಸ ಸಾಧನವನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ ...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">ಸಾಧನವನ್ನು ಸೇರಿಸಲಾಯಿತು!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">ಯಾವುದೇ ಸಾಧನವನ್ನು ಕಂಡುಹಿಡಿಯಲಾಗಿಲ್ಲ.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">ನೆಟ್ವರ್ಕ್ ದೋಷ.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">ಮಾನ್ಯವಲ್ಲದ QR ಕೋಡ್.</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e4f83bc134..180102b63d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -141,16 +141,11 @@
   <string name="DateUtils_now">방금 전</string>
   <string name="DateUtils_minutes_ago">%d분 전</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">%s을(를) 등록 해제하시겠습니까?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">등록 해제를 통해 메시지를 보내거나 받지 못할 수 있습니다.</string>
   <string name="DeviceListActivity_network_connection_failed">네트워크에 연결되지 않습니다.</string>
   <string name="DeviceListActivity_try_again">다시 시도</string>
-  <string name="DeviceListActivity_disconnecting_device">기기 등록 해제 중…</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">기기 등록 해제</string>
   <string name="DeviceListActivity_network_failed">네트워크에 연결되지 않음</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">이름이 없는 기기</string>
-  <string name="DeviceListItem_created_s">등록: %s</string>
   <string name="DeviceListItem_last_active_s">최근 사용: %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">공유 대상</string>
@@ -236,13 +231,9 @@
   <string name="DeviceProvisioningActivity_content_intro">액세스 권한</string>
   <string name="DeviceProvisioningActivity_content_bullets">- 내 메시지 읽기
 \n- 내 이름으로 메시지 보내기</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">기기 추가</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 추가 중…</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">기기 추가 완료</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">기기 없음</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">네트워크 오류</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR코드가 잘못됨</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">기기 등록 가능 갯수 초과하여 기존의 기기 중 하나 등록 해제 필요</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 아이콘</string>
@@ -436,7 +427,6 @@
   <string name="country_selection_fragment__loading_countries">국가 로드 중…</string>
   <string name="country_selection_fragment__search">검색</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">등록된 기기 없음</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">기기에서 로그 가져올 수 없지만 ADB로 수동 가져올 수 있음</string>
   <string name="log_submit_activity__thanks">도와주셔서 감사합니다.</string>
@@ -557,7 +547,6 @@
   <string name="AndroidManifest__media_overview">전체 이미지</string>
   <string name="AndroidManifest__media_overview_named">%1$s님이랑 대화의 전체 이미지</string>
   <string name="AndroidManifest__message_details">메시지 세부정보</string>
-  <string name="AndroidManifest_manage_paired_devices">등록된 기기 관리</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">가져오기 / 내보내기</string>
   <string name="arrays__my_identity_key">내 인증 키</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 23e18acbaf..5a27739e7a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -236,9 +236,6 @@
         - Чита сите ваши пораки
         \n- Праќа пораки во ваше име
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Додавам уред</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Додавање нов уред...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Уредот е додаден!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Уредот не е пронајден.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Мрежна грешка.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Погрешен QR код.</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6764a37282..2b6ce051bc 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -145,16 +145,11 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="DateUtils_now">Nu</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">\'%s\' ontkoppelen?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Door dit apparaat te ontkoppelen zal het niet langer berichten kunnen verzenden en ontvangen.</string>
   <string name="DeviceListActivity_network_connection_failed">Netwerkverbinding mislukt..</string>
   <string name="DeviceListActivity_try_again">Probeer opnieuw</string>
-  <string name="DeviceListActivity_disconnecting_device">Toestel aan het loskoppelen...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Apparaat aan het loskoppelen</string>
   <string name="DeviceListActivity_network_failed">Netwerkfout!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Naamloos apparaat</string>
-  <string name="DeviceListItem_created_s">Aangemaakt %s</string>
   <string name="DeviceListItem_last_active_s">Laatst actief %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Delen met</string>
@@ -243,13 +238,9 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
         - Al je berichten lezen
         \n- Berichten versturen namens jou
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Apparaat aan het toevoegen...</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Nieuw apparaat aan het toevoegen...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Apparaat toegevoegd!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Geen apparaat gevonden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netwerkfout!</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ongeldige QR code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sorry, je hebt te veel apparaten geregistreerd, probeer er enkele te verwijderen...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure icoon</string>
@@ -451,7 +442,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="country_selection_fragment__loading_countries">Landen laden...</string>
   <string name="country_selection_fragment__search">Zoeken</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Geen apparaten gekoppeld...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kan geen logs van je apparaat verzamelen. Je kan nog steeds ADB gebruiken om debug logs te verzamelen.</string>
   <string name="log_submit_activity__thanks">Bedankt voor uw hulp!</string>
@@ -595,7 +585,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="AndroidManifest__media_overview">Alle afbeeldingen</string>
   <string name="AndroidManifest__media_overview_named">Alle afbeeldingen met %1$s</string>
   <string name="AndroidManifest__message_details">Bericht Details</string>
-  <string name="AndroidManifest_manage_paired_devices">Gekoppelde apparaten beheren</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importeren / exporteren</string>
   <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 2cbebe7a6c..3829fd1749 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -145,16 +145,11 @@ denne kontakten.</string>
   <string name="DateUtils_now">Nå</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Frakoble «%s»?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ved å frakoble denne enheten vil den ikke lenger være i stand til å sende eller motta meldinger.</string>
   <string name="DeviceListActivity_network_connection_failed">Nettverksforbindelse feilet...</string>
   <string name="DeviceListActivity_try_again">Prøv igjen</string>
-  <string name="DeviceListActivity_disconnecting_device">Frakobler enhet...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Frakobler enhet</string>
   <string name="DeviceListActivity_network_failed">Nettverk feilet!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Ikke navngitt enhet</string>
-  <string name="DeviceListItem_created_s">Opprettet %s</string>
   <string name="DeviceListItem_last_active_s">Sist aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
@@ -243,13 +238,9 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
 - Lese alle meldingene dine
 \n- Sende meldinger i ditt navn
  </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Legger til enhet</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Legger til ny enhet...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Enhet lagt til!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet funnet.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nettverksfeil.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ugyldig QR-kode.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Beklager, du har for mange enheter registrert allerede, forsøk å fjerne noen...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Tast inn passord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@@ -450,7 +441,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="country_selection_fragment__loading_countries">Laster land...</string>
   <string name="country_selection_fragment__search">Søk</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ingen sammenkoblede enheter...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhet. Du kan fremdeles benytte ADB for å hente debug logger.</string>
   <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
@@ -589,7 +579,6 @@ feilet.</string>
   <string name="AndroidManifest__media_overview">Alle bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle bilder med %1$s</string>
   <string name="AndroidManifest__message_details">Meldingsdetaljer</string>
-  <string name="AndroidManifest_manage_paired_devices">Administrer sammenkoblede enheter</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importere / eksportere</string>
   <string name="arrays__my_identity_key">Min ID-nøkkel</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 911a92d0d1..b5ad8541e2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -140,15 +140,11 @@ ten kontakt.
   <string name="DateUtils_now">Teraz</string>
   <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Rozłączyć \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Poprzez odłączenie tego urządzenia, nie będzie ono otrzymywać wiadomości.</string>
   <string name="DeviceListActivity_network_connection_failed">Brak połączenia internetowego...</string>
   <string name="DeviceListActivity_try_again">Spróbuj ponownie</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Rozłączanie urządzenia</string>
   <string name="DeviceListActivity_network_failed">Błąd sieci!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nieznane urządzenie</string>
-  <string name="DeviceListItem_created_s">Utworzono %s</string>
   <string name="DeviceListItem_last_active_s">Ostatnio aktywny %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
@@ -238,13 +234,9 @@ Przywracanie szyfrowanej kopii zapasowej TextSecure spowoduje nadpisanie Twoich
 \n- Wysyłać wiadomości w Twoim imieniu
 
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodawanie urządzenia</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodawanie nowego urządzenia...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Urządzenie zostało dodane!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nie znaleziono żadnych urządzeń.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Błąd sieci.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Niepoprawny kod QR.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Niestety masz już zbyt wiele zarejestrowanych urządzeń, usuń któryś, aby dodać nowy...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -441,7 +433,6 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Brak połączonych urządzeń...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nie udało się odczytać logów z Twojego urządzenia. W dalszym ciągu możesz użyć ADB, aby pobrać logi debugowania.</string>
   <string name="log_submit_activity__thanks">Dziękujemy za Twoją pomoc!</string>
@@ -573,7 +564,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="AndroidManifest__media_overview">Wszystkie obrazy</string>
   <string name="AndroidManifest__media_overview_named">Wszystkie obrazy z %1$s</string>
   <string name="AndroidManifest__message_details">Szczegóły wiadomości</string>
-  <string name="AndroidManifest_manage_paired_devices">Zarządzaj połączonymi urządzeniami</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / eksport</string>
   <string name="arrays__my_identity_key">Mój klucz tożsamości</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 0f8fb8a211..6386229885 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -151,16 +151,11 @@ Tem certeza que deseja fazer isto?</string>
   <string name="DateUtils_now">Agora</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Desconectar \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desconectar este dispositivo, ele não poderá mais enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">Conexão de rede falhou...</string>
   <string name="DeviceListActivity_try_again">Tentar de novo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectando dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">Rede falhou!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
-  <string name="DeviceListItem_created_s">Criado %s</string>
   <string name="DeviceListItem_last_active_s">Último ativo %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartilhar com</string>
@@ -260,13 +255,9 @@ Tem certeza que deseja fazer isto?</string>
         - Ler todas as suas mensagens
         \n- Enviar mensagens em seu nome
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Adicionando dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Adicionando novo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo adicionado!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenhum dispositivo encontrado.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erro de rede.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Desculpe, você já possui muitos dispositivos registrados, tente remover alguns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Inserir frase-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ícone do TextSecure</string>
@@ -478,7 +469,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="country_selection_fragment__loading_countries">Carregando países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nenhum dispositivo pareado...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível captar logs do seu dispositivo. É possível usar como alternativa o ADB para captar logs de debug.</string>
   <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
@@ -640,7 +630,6 @@ falhou.</string>
   <string name="AndroidManifest__media_overview">Todas as imagens</string>
   <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
   <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
-  <string name="AndroidManifest_manage_paired_devices">Gerenciar dispositivos pareados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Minha chave de identidade</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9d8f41786d..8916e0c6b4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -150,16 +150,11 @@ que %2$s reinstalou TextSecure e tem agora uma nova chave de identidade.
   <string name="DateUtils_now">Agora</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Desligar \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desligar este dispositivo, vai deixar de enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">A ligação à rede falhou!</string>
   <string name="DeviceListActivity_try_again">Tente novamente</string>
-  <string name="DeviceListActivity_disconnecting_device">A desligar dispositivo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">A desligar dispositivo</string>
   <string name="DeviceListActivity_network_failed">A rede falhou!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
-  <string name="DeviceListItem_created_s">Criado %s</string>
   <string name="DeviceListItem_last_active_s">Activo pela última vez %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partilhar com</string>
@@ -257,13 +252,9 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
 - Ler todas as suas mensagens
 \n- Enviar mensagens em seu nome
 </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">A adicionar dispositivo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">A adicionar um novo dispositivo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo adicionado!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nenhum dispositivo encontrado.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erro de rede.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Lamentamos mas tem demasiados dispositivos registados, tente remover alguns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduza palavra-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icon TextSecure</string>
@@ -469,7 +460,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="country_selection_fragment__loading_countries">A carregar lista de países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Nenhum dispositivo emparelhado...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível obter os registos do seu dispositivo. Alternativamente, pode utilizar o ADB para os obter.</string>
   <string name="log_submit_activity__thanks">Obrigado pela sua ajuda!</string>
@@ -622,7 +612,6 @@ falhou.
   <string name="AndroidManifest__media_overview">Todas as imagens</string>
   <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
   <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
-  <string name="AndroidManifest_manage_paired_devices">Gerir dispositivos emparelhados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8996d60198..5592fe85e5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -132,11 +132,9 @@
   <string name="DateUtils_now">Acum</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Deconectez \'%s\'?</string>
   <string name="DeviceListActivity_try_again">Încearcă din nou</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispozitiv fără nume</string>
-  <string name="DeviceListItem_created_s">S-a creat %s</string>
   <string name="DeviceListItem_last_active_s">Ultima oară activ %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
@@ -220,9 +218,6 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
         - Citirea tuturor mesajelor
         \n- Trimiterea mesajelor în numele tău
     </string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Se adaugă dispozitivul</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Se adaugă un dispozitiv nou...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Dispozitiv adăugat!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nu a fost gasit niciun dispozitiv.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Eroare reţea.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Cod QR invalid.</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f13e1a2b1a..e40999bfd4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -139,16 +139,11 @@
   <string name="DateUtils_now">Только что</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Отключить «%s»?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">После отключения это устройство больше не сможет отправлять или принимать сообщения.</string>
   <string name="DeviceListActivity_network_connection_failed">Ошибка соединения...</string>
   <string name="DeviceListActivity_try_again">Повторить</string>
-  <string name="DeviceListActivity_disconnecting_device">Отключаем устройство...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Отключение устройства</string>
   <string name="DeviceListActivity_network_failed">Ошибка сети!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Устройство без названия</string>
-  <string name="DeviceListItem_created_s">Создано %s</string>
   <string name="DeviceListItem_last_active_s">Было онлайн %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
@@ -236,13 +231,9 @@
   <string name="DeviceProvisioningActivity_content_bullets">
 - читать все ваши сообщения
 \n - отправлять сообщения от вашего имени</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Добавление устройства</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Добавляем нового устройства...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Устройство добавлено!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Устройство не найдено.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Ошибка сети.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Неверный QR-код.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Извините, у вас зарегистрировано слишком много устройств. Попробуйте отключить некоторые из них.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Иконка TextSecure</string>
@@ -440,7 +431,6 @@
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
   <string name="country_selection_fragment__search">Поиск</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Нет привязанных устройств...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не удается получить лог с вашего устройства. Вы можете воспользоваться для этого ADB.</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
@@ -588,7 +578,6 @@ SMS-подтверждения...
   <string name="AndroidManifest__media_overview">Все изображения</string>
   <string name="AndroidManifest__media_overview_named">Все изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Подробности</string>
-  <string name="AndroidManifest_manage_paired_devices">Управление привязанными устройствами</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импорт / экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3da9a015c2..e9017f5f6f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -229,8 +229,6 @@ opätovným importom zduplikujete správy.
 - Čítať všetky Vaše správy\n
 - Odosielať správy vo Vašom mene
 </string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Pridáva sa nové zariadenie...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Zariadenie bolo pridané!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nebolo nájdené žiadne zariadenie!</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba siete.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 80a77b6a10..1eead8971f 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -145,16 +145,11 @@ preveriti ta stik.</string>
   <string name="DateUtils_now">Ravnokar</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Odstranim \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Z odstranitvijo naprave ta ne bo več mogla pošiljati ali prejemati sporočil.</string>
   <string name="DeviceListActivity_network_connection_failed">Omrežno povezovanje ni bilo uspešno...</string>
   <string name="DeviceListActivity_try_again">Poskusite znova</string>
-  <string name="DeviceListActivity_disconnecting_device">Odstranjujem napravo...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odklapljam napravo...</string>
   <string name="DeviceListActivity_network_failed">Povezovanje ni uspelo!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Nepoimenovana naprava</string>
-  <string name="DeviceListItem_created_s">Ustvarjena %s</string>
   <string name="DeviceListItem_last_active_s">Zadnja aktivna %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Deli z</string>
@@ -241,13 +236,9 @@ preveriti ta stik.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - prebirala vsa vaša sporočila
 \n- pošiljala sporočila v vašem imenu</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Dodajam napravo</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Dodajam novo napravo...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Naprava dodana!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nobena naprava ni bila najdena.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Napaka omrežja.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neveljavna koda QR.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Imate preveč registriranih naprav, poskusite kakšno odstraniti...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Vnesite geslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -445,7 +436,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
   <string name="country_selection_fragment__search">Poišči</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Ni povezanih naprav...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Ne morem zajeti podatkov iz vaše naprave. Sistemsko zabeležbo lahko zajamete tudi sami preko ADB.</string>
   <string name="log_submit_activity__thanks">Hvala za pomoč!</string>
@@ -586,7 +576,6 @@ bila uspešna.</string>
   <string name="AndroidManifest__media_overview">Vse slike</string>
   <string name="AndroidManifest__media_overview_named">Vse slike z %1$s</string>
   <string name="AndroidManifest__message_details">Podrobnosti sporočila</string>
-  <string name="AndroidManifest_manage_paired_devices">Upravljanje povezanih naprav</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz/izvoz</string>
   <string name="arrays__my_identity_key">Moja identifikacija</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a26ae575d0..593aa3fe10 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -148,16 +148,11 @@
   <string name="DateUtils_now">Сад</string>
   <string name="DateUtils_minutes_ago">%d минута</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Да прекинем везу са „%s“?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Овај уређај више неће моћи да шаље или прима поруке ако му прекинете везу:</string>
   <string name="DeviceListActivity_network_connection_failed">Повезивање на мрежу није успело...</string>
   <string name="DeviceListActivity_try_again">Покушај поново</string>
-  <string name="DeviceListActivity_disconnecting_device">Прекидам везу са уређајем...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекидам везу са уређајем</string>
   <string name="DeviceListActivity_network_failed">Неуспех мреже!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Неименован уређај</string>
-  <string name="DeviceListItem_created_s">Направљено %s</string>
   <string name="DeviceListItem_last_active_s">Задња активност %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Подели са</string>
@@ -253,13 +248,9 @@
   <string name="DeviceProvisioningActivity_content_bullets">
 - чита све ваше поруке
 \n- шаље поруке у ваше име</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Додајем уређај</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Додајем нови уређај...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Уређај додат!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Није нађен уређај.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Грешка мреже.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Неисправан бар-кôд.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Већ имате превише пријављених уређаја, уклоните неке од њих...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Унесите лозинку</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона Сигурних порука</string>
@@ -463,7 +454,6 @@
   <string name="country_selection_fragment__loading_countries">Учитавам државе...</string>
   <string name="country_selection_fragment__search">Тражи</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Нема упарених уређаја...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не могу да дохватим дневник са вашег уређаја. Можете да искористите АДБ да бисте добавили дневник исправљања грешака.</string>
   <string name="log_submit_activity__thanks">Хвала вам на помоћи!</string>
@@ -611,7 +601,6 @@
   <string name="AndroidManifest__media_overview">Све слике</string>
   <string name="AndroidManifest__media_overview_named">Све слика са %1$s</string>
   <string name="AndroidManifest__message_details">Детаљи поруке</string>
-  <string name="AndroidManifest_manage_paired_devices">Управљај упареним уређајима</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Увоз/извоз</string>
   <string name="arrays__my_identity_key">Мој кључ идентитета</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ab3689f03a..248a50484a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -146,16 +146,11 @@ verifiera denna kontakt.</string>
   <string name="DateUtils_now">Nu</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Ta bort \'%s\'?</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att ta bort denna enhet kommer den inte längre kunna skicka eller få meddelanden.</string>
   <string name="DeviceListActivity_network_connection_failed">Nätverksuppkoppling misslyckades...</string>
   <string name="DeviceListActivity_try_again">Försök igen</string>
-  <string name="DeviceListActivity_disconnecting_device">Tar bort enhet...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Tar bort enhet</string>
   <string name="DeviceListActivity_network_failed">Nätverket misslyckades</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Namnlös enhet</string>
-  <string name="DeviceListItem_created_s">Skapade %s</string>
   <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
@@ -248,13 +243,9 @@ som för närvarande finns i TextSecure.</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 - Läsa alla dina meddelanden
 \n- Skicka meddelanden i ditt namn</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Lägg till enhet</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Lägger till ny enhet...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Enhet tillagd!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet hittades.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nätverksfel.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ogiltig QR-kod.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Tyvärr har du redan för många registrerade enheter, försök ta bort några...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ikon</string>
@@ -452,7 +443,6 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
   <string name="country_selection_fragment__search">Sök</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">Inga enheter ihopkopplade</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunde inte plocka loggarna från din enhet, men du kan använda ADB för att hämta debugloggarna istället.</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
@@ -590,7 +580,6 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="AndroidManifest__media_overview">Alla bilder</string>
   <string name="AndroidManifest__media_overview_named">Alla bilder med %1$s</string>
   <string name="AndroidManifest__message_details">Meddelandedetaljer</string>
-  <string name="AndroidManifest_manage_paired_devices">Hantera ihopkopplade enheter</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__my_identity_key">Min identitetsnyckel</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1b516d08cd..f8ac83d1e6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -213,8 +213,6 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="DeviceProvisioningActivity_content_bullets">
 - அனைத்த்து குறுஞ்செய்திகளை படிக்கமுடியும்
 \n- உங்கள் பெயர்கொண்டு செய்திகளை அனுப்பமுடியும்</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">புதிய சாதனம் சேர்க்கப்படுகிறது...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">சாதனம் சேர்க்கப்பட்டது!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">எந்த சாதனமும் காணப்படவில்லை.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">இணையத்தில் பிழை.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR குறியீடு செல்லாது.</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1e1c2f1bd1..1272ca84db 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -224,8 +224,6 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <string name="DeviceProvisioningActivity_content_bullets">
 - Tüm mesajlarınızı okuyunuz
 \n-Mesajları adınızla gönderiniz</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Yeni cihaz ekleniyor...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Cihaz eklendi!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Hiç cihaz bulanamadı.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Ağ hatası.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Geçersiz QR kodu.</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cf3b313e01..976caeee7c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -143,16 +143,11 @@
   <string name="DateUtils_now">现在</string>
   <string name="DateUtils_minutes_ago">%d 分钟</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s"> 断开 \'%s\' ？</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">如果断开此设备的连接，它将不能再接受或发送信息。</string>
   <string name="DeviceListActivity_network_connection_failed">网络连接失败...</string>
   <string name="DeviceListActivity_try_again">再试一次</string>
-  <string name="DeviceListActivity_disconnecting_device">正在断开设备连接...</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">正在断开设备连接</string>
   <string name="DeviceListActivity_network_failed">网络失败！</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">未命名的设备</string>
-  <string name="DeviceListItem_created_s">已创建 %s</string>
   <string name="DeviceListItem_last_active_s">最后活动  %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共享给</string>
@@ -241,13 +236,9 @@
   <string name="DeviceProvisioningActivity_content_bullets">
 - 读取你所有的信息
 \n - 以你的名义发送信息</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">添加设备</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">正在添加新设备…</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">设备已添加！</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">没有找到设备。</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">网络错误。</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">无效的二维码。</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">抱歉，您已经注册了太多的设备，请先移除一些…</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">输入密钥</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 图标</string>
@@ -450,7 +441,6 @@
   <string name="country_selection_fragment__loading_countries">正在读取国家列表...</string>
   <string name="country_selection_fragment__search">搜索</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_paired">没有配对的设备…</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">无法获取您设备上的日志，不过您仍然可以以ADB方式来获得您的调试日志。</string>
   <string name="log_submit_activity__thanks">感谢！</string>
@@ -598,7 +588,6 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="AndroidManifest__media_overview">所有图片</string>
   <string name="AndroidManifest__media_overview_named">所有图片和%1$s</string>
   <string name="AndroidManifest__message_details">消息详情</string>
-  <string name="AndroidManifest_manage_paired_devices">管理已配对的设备</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">导入/导出</string>
   <string name="arrays__my_identity_key">我的身份密钥</string>