diff --git a/library/ui-strings/src/main/res/values-ar/strings.xml b/library/ui-strings/src/main/res/values-ar/strings.xml
index 073f961cb6..70b9a33ab5 100644
--- a/library/ui-strings/src/main/res/values-ar/strings.xml
+++ b/library/ui-strings/src/main/res/values-ar/strings.xml
@@ -320,7 +320,7 @@
     <string name="settings_theme">السمة</string>
     <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
     <string name="encryption_information_device_name">اسم الجهاز</string>
-    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="device_manager_session_details_session_id">معرّف الجهاز</string>
     <string name="encryption_information_device_key">مفتاح الجهاز</string>
     <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
     <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>
diff --git a/library/ui-strings/src/main/res/values-bg/strings.xml b/library/ui-strings/src/main/res/values-bg/strings.xml
index b29823040f..d3e9e599bc 100644
--- a/library/ui-strings/src/main/res/values-bg/strings.xml
+++ b/library/ui-strings/src/main/res/values-bg/strings.xml
@@ -396,7 +396,7 @@
     <string name="settings_theme">Тема</string>
     <string name="encryption_information_decryption_error">Грешка при разшифроване</string>
     <string name="encryption_information_device_name">Публично име</string>
-    <string name="encryption_information_device_id">Сесийно ID</string>
+    <string name="device_manager_session_details_session_id">Сесийно ID</string>
     <string name="encryption_information_device_key">Ключ на устройство</string>
     <string name="encryption_export_e2e_room_keys">Експортирай E2E ключове за стая</string>
     <string name="encryption_export_room_keys">Експортиране на ключове за стая</string>
diff --git a/library/ui-strings/src/main/res/values-bn-rBD/strings.xml b/library/ui-strings/src/main/res/values-bn-rBD/strings.xml
index 2f068f1bf8..7897da934e 100644
--- a/library/ui-strings/src/main/res/values-bn-rBD/strings.xml
+++ b/library/ui-strings/src/main/res/values-bn-rBD/strings.xml
@@ -789,7 +789,7 @@
     <string name="encryption_export_room_keys">রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
     <string name="settings_theme">থিম</string>
diff --git a/library/ui-strings/src/main/res/values-bn-rIN/strings.xml b/library/ui-strings/src/main/res/values-bn-rIN/strings.xml
index 828bc3bd34..56bde36977 100644
--- a/library/ui-strings/src/main/res/values-bn-rIN/strings.xml
+++ b/library/ui-strings/src/main/res/values-bn-rIN/strings.xml
@@ -693,7 +693,7 @@
     <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
 
     <string name="encryption_information_device_name">সর্বজনীন নাম</string>
-    <string name="encryption_information_device_id">আইডি</string>
+    <string name="device_manager_session_details_session_id">আইডি</string>
     <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>
 
     <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
diff --git a/library/ui-strings/src/main/res/values-ca/strings.xml b/library/ui-strings/src/main/res/values-ca/strings.xml
index 5c036a9e7e..4765eb11e5 100644
--- a/library/ui-strings/src/main/res/values-ca/strings.xml
+++ b/library/ui-strings/src/main/res/values-ca/strings.xml
@@ -448,7 +448,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Error al desxifrar</string>
     <string name="encryption_information_device_name">Nom públic</string>
-    <string name="encryption_information_device_id">ID de sessió</string>
+    <string name="device_manager_session_details_session_id">ID de sessió</string>
     <string name="encryption_information_device_key">Clau de sessió</string>
     <string name="encryption_export_e2e_room_keys">Exporta les claus de la sala E2E</string>
     <string name="encryption_export_room_keys">Exporta les claus de la sala</string>
@@ -2619,14 +2619,11 @@
     <string name="device_manager_settings_active_sessions_show_all">Mostra totes les sessions (V2, WIP)</string>
     <string name="create_room">Crea sala</string>
     <string name="start_chat">Inicia xat</string>
-    <string name="device_manager_verification_status_detail_unverified">Verifica la teva sessió actual per a missatges segurs millorats.</string>
     <string name="device_manager_other_sessions_description_verified">Verificada · Última activitat %1$s</string>
     <string name="device_manager_other_sessions_description_unverified">No verificada · Última activitat %1$s</string>
     <string name="device_manager_other_sessions_view_all">Veure-ho tot (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Sessió actual</string>
     <string name="device_manager_view_details">Veure detalls</string>
     <string name="device_manager_verify_session">Verifica sessió</string>
-    <string name="device_manager_verification_status_detail_verified">La sessió actual està llesta per la missatgeria segura.</string>
     <string name="device_manager_verification_status_unverified">Sessió no verificada</string>
     <string name="device_manager_verification_status_verified">Sessió verificada</string>
     <string name="a11y_device_manager_device_type_unknown">Tipus de dispositiu desconegut</string>
diff --git a/library/ui-strings/src/main/res/values-cs/strings.xml b/library/ui-strings/src/main/res/values-cs/strings.xml
index 7c73303c69..79f8311159 100644
--- a/library/ui-strings/src/main/res/values-cs/strings.xml
+++ b/library/ui-strings/src/main/res/values-cs/strings.xml
@@ -635,7 +635,7 @@
     <string name="settings_theme">Motiv vzhledu</string>
     <string name="encryption_information_decryption_error">Chyba dešifrování</string>
     <string name="encryption_information_device_name">Veřejné jméno</string>
-    <string name="encryption_information_device_id">ID relace</string>
+    <string name="device_manager_session_details_session_id">ID relace</string>
     <string name="encryption_information_device_key">Klíč relace</string>
     <string name="encryption_export_e2e_room_keys">Export E2E klíčů místností</string>
     <string name="encryption_export_room_keys">Export klíčů místností</string>
@@ -2672,11 +2672,8 @@
     <string name="device_manager_other_sessions_description_unverified">Neověřeno · Poslední aktivita %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Ověřeno · Poslední aktivita %1$s</string>
     <string name="device_manager_other_sessions_view_all">Zobrazit všechny (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Aktuální relace</string>
     <string name="device_manager_view_details">Zobrazit podrobnosti</string>
     <string name="device_manager_verify_session">Ověřit relaci</string>
-    <string name="device_manager_verification_status_detail_unverified">Ověřte svou aktuální relaci pro vylepšené zabezpečené zasílání zpráv.</string>
-    <string name="device_manager_verification_status_detail_verified">Vaše aktuální relace je připravena pro bezpečné zasílání zpráv.</string>
     <string name="device_manager_verification_status_unverified">Neověřená relace</string>
     <string name="device_manager_verification_status_verified">Ověřená relace</string>
     <string name="a11y_device_manager_device_type_unknown">Neznámý typ zařízení</string>
diff --git a/library/ui-strings/src/main/res/values-de/strings.xml b/library/ui-strings/src/main/res/values-de/strings.xml
index e0bdc8c8d4..e01fc898a3 100644
--- a/library/ui-strings/src/main/res/values-de/strings.xml
+++ b/library/ui-strings/src/main/res/values-de/strings.xml
@@ -418,7 +418,7 @@
     <string name="room_settings_unset_main_address">Als Hauptadresse aufheben</string>
     <string name="encryption_information_decryption_error">Entschlüsselungsfehler</string>
     <string name="encryption_information_device_name">Öffentlicher Name</string>
-    <string name="encryption_information_device_id">Sitzungs-ID</string>
+    <string name="device_manager_session_details_session_id">Sitzungs-ID</string>
     <string name="encryption_information_device_key">Sitzungsschlüssel</string>
     <string name="encryption_export_e2e_room_keys">Ende-zu-Ende-Raumschlüssel exportieren</string>
     <string name="encryption_export_room_keys">Raumschlüssel exportieren</string>
@@ -2620,7 +2620,6 @@
 \nBitte versuche es später erneut.%s</string>
     <string name="invites_title">Einladungen</string>
     <string name="device_manager_other_sessions_description_unverified">Nicht verifiziert · Letzte Aktivität %1$s</string>
-    <string name="device_manager_verification_status_detail_unverified">Verifiziere deine aktuelle Sitzung für besonders sichere Nachrichtenübertragung.</string>
     <string name="device_manager_verification_status_unverified">Nicht verifizierte Sitzung</string>
     <string name="device_manager_unverified_sessions_title">Nicht verifizierte Sitzung</string>
     <string name="device_manager_header_section_security_recommendations_description">Verbessere deine Kontosicherheit, indem du diese Empfehlungen beherzigst.</string>
@@ -2630,7 +2629,6 @@
         <item quantity="other">Inaktiv seit %1$d+ Tagen (%2$s)</item>
     </plurals>
     <string name="device_manager_other_sessions_description_verified">Verifiziert · Letzte Aktivität %1$s</string>
-    <string name="device_manager_verification_status_detail_verified">Deine aktuelle Sitzung ist für sichere Kommunikation bereit.</string>
     <string name="device_manager_verification_status_verified">Verifizierte Sitzung</string>
     <string name="a11y_device_manager_device_type_unknown">Unbekannter Gerätetyp</string>
     <string name="invites_empty_title">Nichts Neues.</string>
diff --git a/library/ui-strings/src/main/res/values-el/strings.xml b/library/ui-strings/src/main/res/values-el/strings.xml
index 092a01bff4..f4973f4b95 100644
--- a/library/ui-strings/src/main/res/values-el/strings.xml
+++ b/library/ui-strings/src/main/res/values-el/strings.xml
@@ -172,7 +172,7 @@
     <string name="settings_theme">Θέμα</string>
     <string name="encryption_information_decryption_error">Σφάλμα αποκρυπτογράφησης</string>
     <string name="encryption_information_device_name">Όνομα συσκευής</string>
-    <string name="encryption_information_device_id">Αναγνωριστικό συσκευής</string>
+    <string name="device_manager_session_details_session_id">Αναγνωριστικό συσκευής</string>
     <string name="encryption_export_export">Εξαγωγή</string>
     <string name="encryption_import_import">Εισαγωγή</string>
     <string name="select_room_directory">Επιλέξτε ένα ευρετήριο δωματίων</string>
diff --git a/library/ui-strings/src/main/res/values-eo/strings.xml b/library/ui-strings/src/main/res/values-eo/strings.xml
index 7e1925f708..f536ca00f9 100644
--- a/library/ui-strings/src/main/res/values-eo/strings.xml
+++ b/library/ui-strings/src/main/res/values-eo/strings.xml
@@ -1084,7 +1084,7 @@
     <string name="encryption_export_room_keys">Elporti ŝlosilojn de ĉambroj</string>
     <string name="encryption_export_e2e_room_keys">Elporti tutvoje ĉifrajn ŝlosilojn de ĉambroj</string>
     <string name="encryption_information_device_key">Ŝlosilo de salutaĵo</string>
-    <string name="encryption_information_device_id">Identigilo de salutaĵo</string>
+    <string name="device_manager_session_details_session_id">Identigilo de salutaĵo</string>
     <string name="encryption_information_device_name">Publika nomo</string>
     <string name="encryption_information_decryption_error">Eraris malĉifrado</string>
     <string name="settings_theme">Haŭto</string>
diff --git a/library/ui-strings/src/main/res/values-es-rMX/strings.xml b/library/ui-strings/src/main/res/values-es-rMX/strings.xml
index 0b38fa6a19..c82f9aff61 100644
--- a/library/ui-strings/src/main/res/values-es-rMX/strings.xml
+++ b/library/ui-strings/src/main/res/values-es-rMX/strings.xml
@@ -249,7 +249,7 @@
     <string name="room_settings_unset_main_address">Desescojer como Dirección Principal</string>
     <string name="encryption_information_decryption_error">Error en descifrar</string>
     <string name="encryption_information_device_name">Nombre del dispositivo</string>
-    <string name="encryption_information_device_id">Identificación del dispositivo</string>
+    <string name="device_manager_session_details_session_id">Identificación del dispositivo</string>
     <string name="encryption_information_device_key">Clave del dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de cifrado de extremo-a-extremo de salas</string>
     <string name="encryption_export_room_keys">Exportar claves de salas</string>
diff --git a/library/ui-strings/src/main/res/values-es/strings.xml b/library/ui-strings/src/main/res/values-es/strings.xml
index a1f1a6e626..86143d9fa4 100644
--- a/library/ui-strings/src/main/res/values-es/strings.xml
+++ b/library/ui-strings/src/main/res/values-es/strings.xml
@@ -415,7 +415,7 @@
     <string name="room_settings_unset_main_address">Dejar de Establecer como dirección principal</string>
     <string name="encryption_information_decryption_error">Error de descifrado</string>
     <string name="encryption_information_device_name">Nombre público</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Clave de sesión</string>
     <string name="encryption_export_e2e_room_keys">Exportar claves de salas con cifrado Extremo-a-Extremo</string>
     <string name="encryption_export_room_keys">Exportar claves de sala</string>
@@ -2540,10 +2540,8 @@
     <string name="device_manager_other_sessions_description_unverified">Sin verificar · Última actividad %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Verificada · Última actividad %1$s</string>
     <string name="device_manager_other_sessions_view_all">Ver todos (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Sesión actual</string>
     <string name="device_manager_view_details">Ver detalles</string>
     <string name="device_manager_verify_session">Verificar sesión</string>
-    <string name="device_manager_verification_status_detail_verified">Esta sesión está lista para mensajería segura.</string>
     <string name="device_manager_verification_status_unverified">Sesión sin verificar</string>
     <string name="device_manager_verification_status_verified">Sesión verificada</string>
     <string name="a11y_device_manager_device_type_unknown">Tipo de dispositivo desconocido</string>
diff --git a/library/ui-strings/src/main/res/values-et/strings.xml b/library/ui-strings/src/main/res/values-et/strings.xml
index bf7c7653c8..9bd1dd23b7 100644
--- a/library/ui-strings/src/main/res/values-et/strings.xml
+++ b/library/ui-strings/src/main/res/values-et/strings.xml
@@ -612,7 +612,7 @@
     <string name="room_settings_labs_warning_message">Need on alles katsejärgus olevad funktsionaalsused. Ole kasutamisel ettevaatlik.</string>
     <string name="encryption_information_decryption_error">Dekrüptimise viga</string>
     <string name="encryption_information_device_name">Avalik nimi</string>
-    <string name="encryption_information_device_id">Sessiooni tunnus</string>
+    <string name="device_manager_session_details_session_id">Sessiooni tunnus</string>
     <string name="encryption_information_device_key">Sessiooni võti</string>
     <string name="encryption_export_e2e_room_keys">Ekspordi jututubade läbiva krüptimise võtmed</string>
     <string name="encryption_export_room_keys">Ekspordi jututoa võtmed</string>
@@ -2613,11 +2613,8 @@
     <string name="device_manager_other_sessions_description_unverified">Verifitseerimata · Viimati kasutusel %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Verifitseeritud · Viimati kasutusel %1$s</string>
     <string name="device_manager_other_sessions_view_all">Näita kõiki (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Praegune sessioon</string>
     <string name="device_manager_view_details">Vaata lisateavet</string>
     <string name="device_manager_verify_session">Verifitseeri sessioon</string>
-    <string name="device_manager_verification_status_detail_unverified">Turvalise sõnumivahetuse nimel palun verifitseeri oma praegune sessioon.</string>
-    <string name="device_manager_verification_status_detail_verified">Sinu praegune sessioon on valmis turvaliseks sõnumivahetuseks.</string>
     <string name="device_manager_verification_status_unverified">Verifitseerimata sessioon</string>
     <string name="device_manager_verification_status_verified">Verifitseeritud sessioon</string>
     <string name="a11y_device_manager_device_type_unknown">Tundmatu seadme tüüp</string>
diff --git a/library/ui-strings/src/main/res/values-eu/strings.xml b/library/ui-strings/src/main/res/values-eu/strings.xml
index 7b27d1cc1d..f1f834ee04 100644
--- a/library/ui-strings/src/main/res/values-eu/strings.xml
+++ b/library/ui-strings/src/main/res/values-eu/strings.xml
@@ -406,7 +406,7 @@ Kontuan izan ekintza honek aplikazioa berrabiaraziko duela eta denbora bat behar
     <string name="encryption_information_decryption_error">Deszifratze errorea</string>
 
     <string name="encryption_information_device_name">Izen publikoa</string>
-    <string name="encryption_information_device_id">IDa</string>
+    <string name="device_manager_session_details_session_id">IDa</string>
     <string name="encryption_information_device_key">Saioaren gakoa</string>
 
     <string name="encryption_export_e2e_room_keys">Esportatu E2E geletako gakoak</string>
diff --git a/library/ui-strings/src/main/res/values-fa/strings.xml b/library/ui-strings/src/main/res/values-fa/strings.xml
index 75b3ab128c..a3f1ea9a80 100644
--- a/library/ui-strings/src/main/res/values-fa/strings.xml
+++ b/library/ui-strings/src/main/res/values-fa/strings.xml
@@ -678,7 +678,7 @@
     <string name="room_settings_labs_warning_message">این‌ها ویژگی‌های آزمایشی‌ای هستند که ممکن است به روش‌های نامنتظره‌ای حراب شوندا. با احتیاط استفاده کنید.</string>
     <string name="room_settings_set_main_address">تنظیم به عنوان نشانی اصلی</string>
     <string name="encryption_information_device_name">نام عمومی</string>
-    <string name="encryption_information_device_id">شناسهٔ نشست</string>
+    <string name="device_manager_session_details_session_id">شناسهٔ نشست</string>
     <string name="encryption_information_device_key">کلید نشست</string>
     <string name="encryption_export_e2e_room_keys">برون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
     <string name="encryption_export_room_keys">برون‌ریزی کلید‌های اتاق‌ها</string>
@@ -2622,11 +2622,8 @@
     <string name="device_manager_other_sessions_description_unverified">تأیید نشده · آخرین فعّالیت %1$s</string>
     <string name="device_manager_other_sessions_description_verified">تأیید شده · آخرین فعّالیت %1$s</string>
     <string name="device_manager_other_sessions_view_all">دیدن همه (%1$d)</string>
-    <string name="device_manager_header_section_current_session">نشست کنونی</string>
     <string name="device_manager_view_details">دیدن جزییات</string>
     <string name="device_manager_verify_session">تأیید نشست</string>
-    <string name="device_manager_verification_status_detail_unverified">نشست کنونیتان را برای پیام‌رسانی امن بهبود یافته تأیید کنید.</string>
-    <string name="device_manager_verification_status_detail_verified">نشست کنونیتان برای پیام‌رسانی امن آماده است.</string>
     <string name="device_manager_verification_status_unverified">نشست تأیید نشده</string>
     <string name="device_manager_verification_status_verified">نشست تأیید شده</string>
     <string name="a11y_device_manager_device_type_unknown">گونهٔ افزاره ناشناخته</string>
diff --git a/library/ui-strings/src/main/res/values-fi/strings.xml b/library/ui-strings/src/main/res/values-fi/strings.xml
index fde2502ae0..a576e7f0dc 100644
--- a/library/ui-strings/src/main/res/values-fi/strings.xml
+++ b/library/ui-strings/src/main/res/values-fi/strings.xml
@@ -366,7 +366,7 @@
     <string name="room_settings_unset_main_address">Kumoa pääosoitteeksi asettaminen</string>
     <string name="encryption_information_decryption_error">Salauksenpurkuvirhe</string>
     <string name="encryption_information_device_name">Julkinen nimi</string>
-    <string name="encryption_information_device_id">Istunnon tunnus</string>
+    <string name="device_manager_session_details_session_id">Istunnon tunnus</string>
     <string name="encryption_information_device_key">Istunnon avain</string>
     <string name="encryption_export_e2e_room_keys">Vie salatun huoneen avaimet</string>
     <string name="encryption_export_room_keys">Vie huoneen avaimet</string>
diff --git a/library/ui-strings/src/main/res/values-fr-rCA/strings.xml b/library/ui-strings/src/main/res/values-fr-rCA/strings.xml
index 29a618f415..94db2935a7 100644
--- a/library/ui-strings/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr-rCA/strings.xml
@@ -778,7 +778,7 @@
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_information_device_key">Clé de la session</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_name">Nom public</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="settings_theme">Thème</string>
diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml
index 0df8272fe5..5a19ccf2da 100644
--- a/library/ui-strings/src/main/res/values-fr/strings.xml
+++ b/library/ui-strings/src/main/res/values-fr/strings.xml
@@ -346,7 +346,7 @@
     <string name="room_settings_unset_main_address">Désactiver comme adresse principale</string>
     <string name="encryption_information_decryption_error">Erreur de déchiffrement</string>
     <string name="encryption_information_device_name">Nom public</string>
-    <string name="encryption_information_device_id">Identifiant de session</string>
+    <string name="device_manager_session_details_session_id">Identifiant de session</string>
     <string name="encryption_information_device_key">Clé de la session</string>
     <string name="encryption_export_e2e_room_keys">Exporter les clés E2E des salons</string>
     <string name="encryption_export_room_keys">Exporter les clés des salons</string>
@@ -2622,11 +2622,8 @@
     <string name="device_manager_other_sessions_description_unverified">Non vérifiée · Dernière activité %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Vérifié · Dernière activité %1$s</string>
     <string name="device_manager_other_sessions_view_all">Tout voir (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Cette session</string>
     <string name="device_manager_view_details">Voir les détails</string>
     <string name="device_manager_verify_session">Vérifier la session</string>
-    <string name="device_manager_verification_status_detail_unverified">Vérifiez votre session pour une sécurité renforcée de votre messagerie.</string>
-    <string name="device_manager_verification_status_detail_verified">Votre session est prête pour l’envoi de messages sécurisés.</string>
     <string name="device_manager_verification_status_unverified">Session non vérifiée</string>
     <string name="device_manager_verification_status_verified">Session vérifiée</string>
     <string name="a11y_device_manager_device_type_unknown">Type de périphérique inconnu</string>
diff --git a/library/ui-strings/src/main/res/values-gl/strings.xml b/library/ui-strings/src/main/res/values-gl/strings.xml
index e6d26a63e5..c1e4e40a81 100644
--- a/library/ui-strings/src/main/res/values-gl/strings.xml
+++ b/library/ui-strings/src/main/res/values-gl/strings.xml
@@ -380,7 +380,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Fallo ao descifrar</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID de sesión</string>
+    <string name="device_manager_session_details_session_id">ID de sesión</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves da sala</string>
diff --git a/library/ui-strings/src/main/res/values-hr/strings.xml b/library/ui-strings/src/main/res/values-hr/strings.xml
index dc5930b933..6d52e5cd96 100644
--- a/library/ui-strings/src/main/res/values-hr/strings.xml
+++ b/library/ui-strings/src/main/res/values-hr/strings.xml
@@ -572,7 +572,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Greška u dešifriranju</string>
     <string name="encryption_information_device_name">Javni naziv</string>
-    <string name="encryption_information_device_id">Identitet</string>
+    <string name="device_manager_session_details_session_id">Identitet</string>
     <string name="encryption_information_device_key">Ključ sesije</string>
     <string name="encryption_export_e2e_room_keys">Izvezi sobne ključeve za E2E</string>
     <string name="encryption_export_room_keys">Izvezi sobne ključeve</string>
diff --git a/library/ui-strings/src/main/res/values-hu/strings.xml b/library/ui-strings/src/main/res/values-hu/strings.xml
index d8bdbb09fd..8fcea0caef 100644
--- a/library/ui-strings/src/main/res/values-hu/strings.xml
+++ b/library/ui-strings/src/main/res/values-hu/strings.xml
@@ -351,7 +351,7 @@
     <string name="room_settings_unset_main_address">Kiszedés fő címek közül</string>
     <string name="encryption_information_decryption_error">Visszafejtés hiba</string>
     <string name="encryption_information_device_name">Nyilvános név</string>
-    <string name="encryption_information_device_id">Munkamenet-azonosító</string>
+    <string name="device_manager_session_details_session_id">Munkamenet-azonosító</string>
     <string name="encryption_information_device_key">Munkamenet kulcs</string>
     <string name="encryption_export_e2e_room_keys">E2E szoba kulcsok exportálása</string>
     <string name="encryption_export_room_keys">Szoba kulcsok exportálása</string>
@@ -2603,11 +2603,8 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="device_manager_other_sessions_description_unverified">Nem ellenőrzött - Utolsó aktivitás %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Ellenőrzött - Utolsó tevékenység %1$s</string>
     <string name="device_manager_other_sessions_view_all">Összes megtekintése (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Jelenlegi munkamenet</string>
     <string name="device_manager_view_details">Részletek megtekintése</string>
     <string name="device_manager_verify_session">Munkamenet hitelesítése</string>
-    <string name="device_manager_verification_status_detail_unverified">Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.</string>
-    <string name="device_manager_verification_status_detail_verified">Az aktuális munkamenet készen áll a biztonságos üzenetküldésre.</string>
     <string name="device_manager_verification_status_unverified">Ellenőrizetlen munkamenet</string>
     <string name="device_manager_verification_status_verified">Ellenőrzött munkamenet</string>
     <string name="a11y_device_manager_device_type_unknown">Ismeretlen eszköztípus</string>
diff --git a/library/ui-strings/src/main/res/values-in/strings.xml b/library/ui-strings/src/main/res/values-in/strings.xml
index 3cec03dc75..3b30950bd1 100644
--- a/library/ui-strings/src/main/res/values-in/strings.xml
+++ b/library/ui-strings/src/main/res/values-in/strings.xml
@@ -301,7 +301,7 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Kesalahan dekripsi</string>
     <string name="encryption_information_device_name">Nama perangkat</string>
-    <string name="encryption_information_device_id">ID Sesi</string>
+    <string name="device_manager_session_details_session_id">ID Sesi</string>
     <string name="encryption_information_device_key">Kunci perangkat</string>
     <string name="encryption_export_e2e_room_keys">Ekspor kunci ruangan terenkripsi</string>
     <string name="encryption_export_room_keys">Ekspor ruangan kunci</string>
@@ -2576,11 +2576,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
     <string name="device_manager_other_sessions_description_unverified">Belum diverifikasi · Aktivitas terakhir %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Terverifikasi · Aktivitas terakhir %1$s</string>
     <string name="device_manager_other_sessions_view_all">Tampilkan Semua (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Sesi Saat Ini</string>
     <string name="device_manager_view_details">Tampilkan Detail</string>
     <string name="device_manager_verify_session">Verifikasi Sesi</string>
-    <string name="device_manager_verification_status_detail_unverified">Verifikasi sesi Anda saat ini untuk perpesanan yang aman.</string>
-    <string name="device_manager_verification_status_detail_verified">Sesi Anda saat ini siap untuk perpesanan yang aman.</string>
     <string name="device_manager_verification_status_unverified">Sesi belum diverifikasi</string>
     <string name="device_manager_verification_status_verified">Sesi terverifikasi</string>
     <string name="a11y_device_manager_device_type_unknown">Tipe perangkat tidak diketahui</string>
diff --git a/library/ui-strings/src/main/res/values-is/strings.xml b/library/ui-strings/src/main/res/values-is/strings.xml
index 7818761145..d25d66bfba 100644
--- a/library/ui-strings/src/main/res/values-is/strings.xml
+++ b/library/ui-strings/src/main/res/values-is/strings.xml
@@ -193,7 +193,7 @@
     <string name="settings_theme">Þema</string>
     <string name="encryption_information_decryption_error">Afkóðunarvilla</string>
     <string name="encryption_information_device_name">Heiti tækis</string>
-    <string name="encryption_information_device_id">Auðkenni setu</string>
+    <string name="device_manager_session_details_session_id">Auðkenni setu</string>
     <string name="encryption_information_device_key">Dulritunarlykill setu</string>
     <string name="encryption_export_export">Flytja út</string>
     <string name="passphrase_enter_passphrase">Settu inn lykilsetningu</string>
diff --git a/library/ui-strings/src/main/res/values-it/strings.xml b/library/ui-strings/src/main/res/values-it/strings.xml
index 422dfc2a3a..b7b0fe91af 100644
--- a/library/ui-strings/src/main/res/values-it/strings.xml
+++ b/library/ui-strings/src/main/res/values-it/strings.xml
@@ -430,7 +430,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Errore di decriptazione</string>
     <string name="encryption_information_device_name">Nome pubblico</string>
-    <string name="encryption_information_device_id">ID sessione</string>
+    <string name="device_manager_session_details_session_id">ID sessione</string>
     <string name="encryption_information_device_key">Chiave sessione</string>
     <string name="encryption_export_e2e_room_keys">Esporta le chiavi di crittografia E2E delle stanze</string>
     <string name="encryption_export_room_keys">Esporta le chiavi delle stanze</string>
@@ -2613,11 +2613,8 @@
     <string name="device_manager_other_sessions_description_unverified">Non verificata · Ultima attività %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Verificata · Ultima attività %1$s</string>
     <string name="device_manager_other_sessions_view_all">Vedi tutte (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Sessione attuale</string>
     <string name="device_manager_view_details">Vedi dettagli</string>
     <string name="device_manager_verify_session">Verifica la sessione</string>
-    <string name="device_manager_verification_status_detail_unverified">Verifica la tua sessione attuale per messaggi più sicuri.</string>
-    <string name="device_manager_verification_status_detail_verified">La tua sessione attuale è pronta per i messaggi sicuri.</string>
     <string name="device_manager_verification_status_unverified">Sessione non verificata</string>
     <string name="device_manager_verification_status_verified">Sessione verificata</string>
     <string name="a11y_device_manager_device_type_unknown">Tipo di dispositivo sconosciuto</string>
diff --git a/library/ui-strings/src/main/res/values-iw/strings.xml b/library/ui-strings/src/main/res/values-iw/strings.xml
index 6d9533852b..ff19310c8e 100644
--- a/library/ui-strings/src/main/res/values-iw/strings.xml
+++ b/library/ui-strings/src/main/res/values-iw/strings.xml
@@ -542,7 +542,7 @@
     <string name="encryption_export_room_keys">יצא מפתחות חדר</string>
     <string name="encryption_export_e2e_room_keys">ייצא מפתחות חדר E2E</string>
     <string name="encryption_information_device_key">מזהה מפתח</string>
-    <string name="encryption_information_device_id">מזהה מושב</string>
+    <string name="device_manager_session_details_session_id">מזהה מושב</string>
     <string name="encryption_information_device_name">שם ציבורי</string>
     <string name="encryption_information_decryption_error">שגיאת פענוח</string>
     <string name="settings_theme">ערכת נושא</string>
diff --git a/library/ui-strings/src/main/res/values-ja/strings.xml b/library/ui-strings/src/main/res/values-ja/strings.xml
index b781e4d7f0..3e817e398c 100644
--- a/library/ui-strings/src/main/res/values-ja/strings.xml
+++ b/library/ui-strings/src/main/res/values-ja/strings.xml
@@ -197,7 +197,7 @@
     <string name="room_settings_labs_warning_message">これらは予期しない不具合が生じるかもしれない実験的機能です。慎重に使用してください。</string>
     <string name="room_settings_set_main_address">メインアドレスとして設定</string>
     <string name="room_settings_unset_main_address">メインアドレスとしての設定を解除</string>
-    <string name="encryption_information_device_id">セッションID</string>
+    <string name="device_manager_session_details_session_id">セッションID</string>
     <string name="font_size">文字の大きさ</string>
     <string name="tiny">とても小さい</string>
     <string name="small">小さい</string>
diff --git a/library/ui-strings/src/main/res/values-kab/strings.xml b/library/ui-strings/src/main/res/values-kab/strings.xml
index a79b72efde..353fb99f53 100644
--- a/library/ui-strings/src/main/res/values-kab/strings.xml
+++ b/library/ui-strings/src/main/res/values-kab/strings.xml
@@ -291,7 +291,7 @@
     <string name="room_settings_category_advanced_title">Talqayt</string>
     <string name="room_settings_labs_pref_title">Tinarimin</string>
     <string name="settings_theme">Asentel</string>
-    <string name="encryption_information_device_id">Asulay n tqimit</string>
+    <string name="device_manager_session_details_session_id">Asulay n tqimit</string>
     <string name="encryption_information_device_key">Tasarut n tɣimit</string>
     <string name="encryption_export_e2e_room_keys">Sifeḍ tisura n texxamt E2E</string>
     <string name="encryption_export_room_keys">Sifeḍ tisura n texxamt</string>
diff --git a/library/ui-strings/src/main/res/values-ko/strings.xml b/library/ui-strings/src/main/res/values-ko/strings.xml
index ba0cbe5abd..37e8849fa8 100644
--- a/library/ui-strings/src/main/res/values-ko/strings.xml
+++ b/library/ui-strings/src/main/res/values-ko/strings.xml
@@ -431,7 +431,7 @@
     <string name="settings_theme">테마</string>
     <string name="encryption_information_decryption_error">암호 복호화 오류</string>
     <string name="encryption_information_device_name">공개 이름</string>
-    <string name="encryption_information_device_id">ID</string>
+    <string name="device_manager_session_details_session_id">ID</string>
     <string name="encryption_information_device_key">기기 키</string>
     <string name="encryption_export_e2e_room_keys">종단간 암호화 방 키 내보내기</string>
     <string name="encryption_export_room_keys">방 키 내보내기</string>
diff --git a/library/ui-strings/src/main/res/values-lo/strings.xml b/library/ui-strings/src/main/res/values-lo/strings.xml
index 1a9a2820b8..a92adb0225 100644
--- a/library/ui-strings/src/main/res/values-lo/strings.xml
+++ b/library/ui-strings/src/main/res/values-lo/strings.xml
@@ -909,7 +909,7 @@
     <string name="encryption_export_room_keys">ສົ່ງອອກກະແຈຫ້ອງ</string>
     <string name="encryption_export_e2e_room_keys">ສົ່ງອອກກະແຈຫ້ອງ E2E</string>
     <string name="encryption_information_device_key">ລະຫັດລະບົບ</string>
-    <string name="encryption_information_device_id">ID ລະບົບ</string>
+    <string name="device_manager_session_details_session_id">ID ລະບົບ</string>
     <string name="encryption_information_device_name">ຊື່ສາທາລະນະ</string>
     <string name="encryption_information_decryption_error">ການຖອດລະຫັດຜິດພາດ</string>
     <string name="settings_theme">ຫົວຂໍ້</string>
diff --git a/library/ui-strings/src/main/res/values-lt/strings.xml b/library/ui-strings/src/main/res/values-lt/strings.xml
index 12e0c9d67d..adfc70c36e 100644
--- a/library/ui-strings/src/main/res/values-lt/strings.xml
+++ b/library/ui-strings/src/main/res/values-lt/strings.xml
@@ -770,11 +770,8 @@
     <string name="device_manager_other_sessions_description_unverified">Nepatvirtinta · Paskutinė veikla %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Patvirtinta · Paskutinė veikla %1$s</string>
     <string name="device_manager_other_sessions_view_all">Peržiūrėti visas (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Dabartinė sesija</string>
     <string name="device_manager_view_details">Peržiūrėti detales</string>
     <string name="device_manager_verify_session">Patvirtinti sesiją</string>
-    <string name="device_manager_verification_status_detail_unverified">Patvirtinkite dabartinę sesiją, kad galėtumėte naudotis patobulintu saugumu pokalbiams.</string>
-    <string name="device_manager_verification_status_detail_verified">Dabartinė sesija paruošta saugiems pokalbiams.</string>
     <string name="device_manager_verification_status_unverified">Nepatvirtinta sesija</string>
     <string name="device_manager_verification_status_verified">Patvirtinta sesija</string>
     <string name="a11y_device_manager_device_type_unknown">Nežinomas įrenginio tipas</string>
@@ -1409,4 +1406,4 @@
     <string name="room_permissions_change_room_name">Keisti kambario pavadinimą</string>
     <string name="room_permissions_change_history_visibility">Keisti istorijos matomumą</string>
     <string name="notice_direct_room_update">%s atnaujino čia.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-strings/src/main/res/values-lv/strings.xml b/library/ui-strings/src/main/res/values-lv/strings.xml
index f1fa1502c1..1787653fae 100644
--- a/library/ui-strings/src/main/res/values-lv/strings.xml
+++ b/library/ui-strings/src/main/res/values-lv/strings.xml
@@ -469,7 +469,7 @@
     <string name="settings_theme">Tēma</string>
     <string name="encryption_information_decryption_error">Atšifrēšanas kļūda</string>
     <string name="encryption_information_device_name">Ierīces nosaukums</string>
-    <string name="encryption_information_device_id">Sesijas ID</string>
+    <string name="device_manager_session_details_session_id">Sesijas ID</string>
     <string name="encryption_information_device_key">Sesijas atslēga</string>
     <string name="encryption_export_e2e_room_keys">Eksportēt istabas šifrēšanas atslēgas</string>
     <string name="encryption_export_room_keys">Eksportēt istabas atslēgas</string>
diff --git a/library/ui-strings/src/main/res/values-nb-rNO/strings.xml b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
index 031b380c7e..7af718d920 100644
--- a/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
+++ b/library/ui-strings/src/main/res/values-nb-rNO/strings.xml
@@ -119,7 +119,7 @@
     <string name="room_settings_banned_users_title">Bannlyste brukere</string>
     <string name="room_settings_category_advanced_title">Avansert</string>
     <string name="settings_theme">Tema</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Øktnøkkel</string>
     <string name="encryption_export_export">Eksporter</string>
     <string name="encryption_import_import">Importer</string>
diff --git a/library/ui-strings/src/main/res/values-nl/strings.xml b/library/ui-strings/src/main/res/values-nl/strings.xml
index d9f36739d3..ce122b0646 100644
--- a/library/ui-strings/src/main/res/values-nl/strings.xml
+++ b/library/ui-strings/src/main/res/values-nl/strings.xml
@@ -275,7 +275,7 @@
     <string name="room_settings_unset_main_address">Niet instellen als hoofdadres</string>
     <string name="encryption_information_decryption_error">Ontsleutelingsfout</string>
     <string name="encryption_information_device_name">Publieke naam</string>
-    <string name="encryption_information_device_id">Sessie-ID</string>
+    <string name="device_manager_session_details_session_id">Sessie-ID</string>
     <string name="encryption_information_device_key">Sessiesleutel</string>
     <string name="encryption_export_e2e_room_keys">E2E-gesprekssleutels exporteren</string>
     <string name="encryption_export_room_keys">Gesprekssleutels exporteren</string>
@@ -2635,7 +2635,6 @@
         <item quantity="one">Al %1$d+ dag inactief (%2$s)</item>
         <item quantity="other">Al %1$d+ dagen inactief (%2$s)</item>
     </plurals>
-    <string name="device_manager_verification_status_detail_unverified">Verifieer uw huidige sessie voor verbeterde beveiligde berichten.</string>
     <string name="device_manager_header_section_security_recommendations_title">Beveiligingsaanbevelingen</string>
     <string name="device_manager_unverified_sessions_title">Niet-geverifieerde sessies</string>
     <string name="device_manager_inactive_sessions_title">Inactieve sessies</string>
@@ -2651,10 +2650,8 @@
     <string name="device_manager_other_sessions_description_unverified">Niet-geverifieerd · Laatste activiteit %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Geverifieerd · Laatste activiteit %1$s</string>
     <string name="device_manager_other_sessions_view_all">Alle bekijken (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Huidige sessie</string>
     <string name="device_manager_view_details">Details bekijken</string>
     <string name="device_manager_verify_session">Sessie verifiëren</string>
-    <string name="device_manager_verification_status_detail_verified">Uw huidige sessie is klaar voor beveiligde berichten.</string>
     <string name="timeline_error_room_not_found">Sorry, deze kamer kon niet worden gevonden.
 \nProbeer het later opnieuw. %s</string>
     <string name="invites_empty_message">Dit is waar uw nieuwe verzoeken en uitnodigingen zullen verschijnen.</string>
diff --git a/library/ui-strings/src/main/res/values-nn/strings.xml b/library/ui-strings/src/main/res/values-nn/strings.xml
index a56ba0ac30..45c8679736 100644
--- a/library/ui-strings/src/main/res/values-nn/strings.xml
+++ b/library/ui-strings/src/main/res/values-nn/strings.xml
@@ -310,7 +310,7 @@
     <string name="settings_theme">Preg</string>
     <string name="encryption_information_decryption_error">Noko gjekk gale med dekrypteringa</string>
     <string name="encryption_information_device_name">Offentleg namn</string>
-    <string name="encryption_information_device_id">Økt-ID</string>
+    <string name="device_manager_session_details_session_id">Økt-ID</string>
     <string name="encryption_information_device_key">Sesjonsnøkkel</string>
     <string name="encryption_export_e2e_room_keys">Eksporter E2E-romnøkklar</string>
     <string name="encryption_export_room_keys">Eksporter romnøkklar</string>
diff --git a/library/ui-strings/src/main/res/values-pl/strings.xml b/library/ui-strings/src/main/res/values-pl/strings.xml
index 5959abc804..b7b73eb9e6 100644
--- a/library/ui-strings/src/main/res/values-pl/strings.xml
+++ b/library/ui-strings/src/main/res/values-pl/strings.xml
@@ -231,7 +231,7 @@
     <string name="room_settings_set_main_address">Ustaw jako główny adres</string>
     <string name="settings_theme">Motyw</string>
     <string name="encryption_information_device_name">Nazwa publiczna</string>
-    <string name="encryption_information_device_id">ID sesji</string>
+    <string name="device_manager_session_details_session_id">ID sesji</string>
     <string name="encryption_export_export">Eksportuj</string>
     <string name="passphrase_enter_passphrase">Wprowadź hasło</string>
     <string name="passphrase_confirm_passphrase">Potwierdź hasło</string>
@@ -2721,10 +2721,8 @@
     <string name="device_manager_other_sessions_description_unverified">Nie zweryfikowano · Ostatnia aktywność %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Zweryfikowano · Ostatnia aktywność %1$s</string>
     <string name="device_manager_other_sessions_view_all">Pokaż wszystkie (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Obecna sesja</string>
     <string name="device_manager_view_details">Pokaż szczegóły</string>
     <string name="device_manager_verify_session">Zweryfikuj sesję</string>
-    <string name="device_manager_verification_status_detail_verified">Twoja obecna sesja jest przygotowana do bezpiecznej komunikacji.</string>
     <string name="device_manager_verification_status_unverified">Niezweryfikowana sesja</string>
     <string name="device_manager_verification_status_verified">Zweryfikowana sesja</string>
     <string name="a11y_device_manager_device_type_unknown">Nieznany typ urządzenia</string>
diff --git a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
index c17f9c0b57..7e2fcb10e8 100644
--- a/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt-rBR/strings.xml
@@ -418,7 +418,7 @@
     <string name="room_settings_unset_main_address">Des-definir como endereço principal</string>
     <string name="encryption_information_decryption_error">Erro de decriptação</string>
     <string name="encryption_information_device_name">Nome público</string>
-    <string name="encryption_information_device_id">ID de sessão</string>
+    <string name="device_manager_session_details_session_id">ID de sessão</string>
     <string name="encryption_information_device_key">Chave de sessão</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves de sala E2E</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
@@ -2622,11 +2622,8 @@
     <string name="device_manager_other_sessions_description_unverified">Não-verificada · Última atividade %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Verificada · Última atividade %1$s</string>
     <string name="device_manager_other_sessions_view_all">Ver Todas (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Sessão Atual</string>
     <string name="device_manager_view_details">Visualizar Detalhes</string>
     <string name="device_manager_verify_session">Verificar Sessão</string>
-    <string name="device_manager_verification_status_detail_unverified">Verifique sua sessão atual para mensageria segura melhorada.</string>
-    <string name="device_manager_verification_status_detail_verified">Sua sessão atual está pronta para mensageria segura.</string>
     <string name="device_manager_verification_status_unverified">Sessão não-verificada</string>
     <string name="device_manager_verification_status_verified">Sessão verificada</string>
     <string name="a11y_device_manager_device_type_unknown">Tipo de dispositivo desconhecido</string>
diff --git a/library/ui-strings/src/main/res/values-pt/strings.xml b/library/ui-strings/src/main/res/values-pt/strings.xml
index 4daaef83b0..87b6297b2b 100644
--- a/library/ui-strings/src/main/res/values-pt/strings.xml
+++ b/library/ui-strings/src/main/res/values-pt/strings.xml
@@ -246,7 +246,7 @@ Note que esta acção irá reiniciar a aplicação e poderá levar algum tempo.<
 
     <string name="encryption_information_decryption_error">Erro de decifragem</string>
     <string name="encryption_information_device_name">Nome do dispositivo</string>
-    <string name="encryption_information_device_id">ID do dispositivo</string>
+    <string name="device_manager_session_details_session_id">ID do dispositivo</string>
     <string name="encryption_information_device_key">Chave do dispositivo</string>
     <string name="encryption_export_e2e_room_keys">Exportar chaves E2E da sala</string>
     <string name="encryption_export_room_keys">Exportar chaves de sala</string>
diff --git a/library/ui-strings/src/main/res/values-ru/strings.xml b/library/ui-strings/src/main/res/values-ru/strings.xml
index 39795ef99a..7c9d073035 100644
--- a/library/ui-strings/src/main/res/values-ru/strings.xml
+++ b/library/ui-strings/src/main/res/values-ru/strings.xml
@@ -432,7 +432,7 @@
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
     <string name="encryption_information_decryption_error">Ошибка дешифровки</string>
     <string name="encryption_information_device_name">Публичное имя</string>
-    <string name="encryption_information_device_id">ID сессии</string>
+    <string name="device_manager_session_details_session_id">ID сессии</string>
     <string name="encryption_information_device_key">Ключ сессии</string>
     <string name="encryption_export_e2e_room_keys">Экспорт E2E ключей комнаты</string>
     <string name="encryption_export_room_keys">Экспорт ключей комнаты</string>
@@ -2681,7 +2681,6 @@
     <string name="device_manager_other_sessions_view_all">Посмотреть все (%1$d)</string>
     <string name="device_manager_header_section_security_recommendations_description">Повысьте безопасность учётной записи, следуя этим рекомендациям.</string>
     <string name="device_manager_other_sessions_description_verified">Заверенная · Последняя активность %1$s</string>
-    <string name="device_manager_header_section_current_session">Текущая сессия</string>
     <string name="device_manager_verification_status_unverified">Незаверенная сессия</string>
     <string name="device_manager_verification_status_verified">Заверенная сессия</string>
     <string name="a11y_device_manager_device_type_unknown">Неизвестный тип устройства</string>
@@ -2694,5 +2693,4 @@
     <string name="home_empty_no_rooms_title">Добро пожаловать в ${app_name},
 \n%s.</string>
     <string name="onboarding_new_app_layout_feedback_title">Оставить отзыв</string>
-    <string name="device_manager_verification_status_detail_verified">Текущая сессия готова к безопасному обмену сообщениями.</string>
 </resources>
diff --git a/library/ui-strings/src/main/res/values-sk/strings.xml b/library/ui-strings/src/main/res/values-sk/strings.xml
index 19058ac656..9eb22e3ae3 100644
--- a/library/ui-strings/src/main/res/values-sk/strings.xml
+++ b/library/ui-strings/src/main/res/values-sk/strings.xml
@@ -388,7 +388,7 @@
     <string name="settings_theme">Vzhľad</string>
     <string name="encryption_information_decryption_error">Chyba dešifrovania</string>
     <string name="encryption_information_device_name">Verejné meno</string>
-    <string name="encryption_information_device_id">ID relácie</string>
+    <string name="device_manager_session_details_session_id">ID relácie</string>
     <string name="encryption_information_device_key">Kľúč relácie</string>
     <string name="encryption_export_e2e_room_keys">Exportovať šifrovacie kľúče miestnosti</string>
     <string name="encryption_export_room_keys">Exportovať kľúče miestnosti</string>
@@ -2672,11 +2672,8 @@
     <string name="device_manager_other_sessions_description_unverified">Neoverené - Posledná aktivita %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Overené - Posledná aktivita %1$s</string>
     <string name="device_manager_other_sessions_view_all">Zobraziť všetky (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Aktuálna relácia</string>
     <string name="device_manager_view_details">Zobraziť podrobnosti</string>
     <string name="device_manager_verify_session">Overiť reláciu</string>
-    <string name="device_manager_verification_status_detail_unverified">Overte svoju aktuálnu reláciu pre vylepšené bezpečné zasielanie správ.</string>
-    <string name="device_manager_verification_status_detail_verified">Vaša aktuálna relácia je pripravená na bezpečné zasielanie správ.</string>
     <string name="device_manager_verification_status_unverified">Neoverená relácia</string>
     <string name="device_manager_verification_status_verified">Overená relácia</string>
     <string name="a11y_device_manager_device_type_unknown">Neznámy typ zariadenia</string>
diff --git a/library/ui-strings/src/main/res/values-sq/strings.xml b/library/ui-strings/src/main/res/values-sq/strings.xml
index 8fdf4ee310..a6af0a4921 100644
--- a/library/ui-strings/src/main/res/values-sq/strings.xml
+++ b/library/ui-strings/src/main/res/values-sq/strings.xml
@@ -431,7 +431,7 @@
     <string name="settings_theme">Temë</string>
     <string name="encryption_information_decryption_error">Gabim shfshehtëzimi</string>
     <string name="encryption_information_device_name">Emër publik</string>
-    <string name="encryption_information_device_id">ID Sesioni</string>
+    <string name="device_manager_session_details_session_id">ID Sesioni</string>
     <string name="encryption_information_device_key">Kyç sesioni</string>
     <string name="encryption_export_e2e_room_keys">Eksporto kyçe dhome E2E</string>
     <string name="encryption_export_room_keys">Eksporto kyçe dhome</string>
diff --git a/library/ui-strings/src/main/res/values-sv/strings.xml b/library/ui-strings/src/main/res/values-sv/strings.xml
index 025713272c..30b63c213c 100644
--- a/library/ui-strings/src/main/res/values-sv/strings.xml
+++ b/library/ui-strings/src/main/res/values-sv/strings.xml
@@ -918,7 +918,7 @@
     <string name="settings_secure_backup_enter_to_setup">Sätt upp på den här enheten</string>
     <string name="reset_secure_backup_title">Generera en ny säkerhetskopia eller sätt en ny lösenfras för din existerande säkerhetskopia.</string>
     <string name="room_settings_labs_warning_message">Detta är experimentella funktioner som kan gå sönder på oväntade sätt. Använd varsamt.</string>
-    <string name="encryption_information_device_id">Sessions-ID</string>
+    <string name="device_manager_session_details_session_id">Sessions-ID</string>
     <string name="encryption_information_device_key">Sessionsnyckel</string>
     <string name="encryption_export_e2e_room_keys">Exportera krypteringsnycklar</string>
     <string name="encryption_export_room_keys">Exportera rumsnycklar</string>
diff --git a/library/ui-strings/src/main/res/values-te/strings.xml b/library/ui-strings/src/main/res/values-te/strings.xml
index 5ed2462ce8..0154d54c2e 100644
--- a/library/ui-strings/src/main/res/values-te/strings.xml
+++ b/library/ui-strings/src/main/res/values-te/strings.xml
@@ -260,7 +260,7 @@
     <string name="room_settings_set_main_address">ప్రధాన చిరునామాగా సెట్ చేయండి</string>
 
     <string name="encryption_information_device_name">పరికరం పేరు</string>
-    <string name="encryption_information_device_id">పరికరం ID</string>
+    <string name="device_manager_session_details_session_id">పరికరం ID</string>
     <string name="encryption_information_device_key">పరికరం కీ</string>
 
     <string name="encryption_export_e2e_room_keys">E2E గది కీలను ఎగుమతి చేయండి</string>
diff --git a/library/ui-strings/src/main/res/values-tr/strings.xml b/library/ui-strings/src/main/res/values-tr/strings.xml
index c097bfce6a..1f0e5be153 100644
--- a/library/ui-strings/src/main/res/values-tr/strings.xml
+++ b/library/ui-strings/src/main/res/values-tr/strings.xml
@@ -376,7 +376,7 @@
     <string name="settings_theme">Tema</string>
     <string name="encryption_information_decryption_error">Çözme hatası</string>
     <string name="encryption_information_device_name">Görünür Ad</string>
-    <string name="encryption_information_device_id">Oturum kimliği</string>
+    <string name="device_manager_session_details_session_id">Oturum kimliği</string>
     <string name="encryption_information_device_key">Oturum anahtarı</string>
     <string name="encryption_export_e2e_room_keys">E2E Oda anahtarlarını dışa aktar</string>
     <string name="encryption_export_room_keys">Oda anahtarlarını dışa aktar</string>
diff --git a/library/ui-strings/src/main/res/values-uk/strings.xml b/library/ui-strings/src/main/res/values-uk/strings.xml
index 3ba8f96674..3e511f8459 100644
--- a/library/ui-strings/src/main/res/values-uk/strings.xml
+++ b/library/ui-strings/src/main/res/values-uk/strings.xml
@@ -354,7 +354,7 @@
     <string name="room_settings_unset_main_address">Зробити не основною адресою</string>
     <string name="encryption_information_decryption_error">Помилка розшифрування</string>
     <string name="encryption_information_device_name">Загальнодоступна назва</string>
-    <string name="encryption_information_device_id">ID сеансу</string>
+    <string name="device_manager_session_details_session_id">ID сеансу</string>
     <string name="encryption_information_device_key">Ключ сеансу</string>
     <string name="encryption_export_e2e_room_keys">Експортувати E2E ключі кімнати</string>
     <string name="encryption_export_room_keys">Експортувати ключі кімнати</string>
@@ -2722,11 +2722,8 @@
     <string name="device_manager_other_sessions_description_unverified">Не звірений · Остання активність %1$s</string>
     <string name="device_manager_other_sessions_description_verified">Звірений · Остання активність %1$s</string>
     <string name="device_manager_other_sessions_view_all">Переглянути всі (%1$d)</string>
-    <string name="device_manager_header_section_current_session">Поточний сеанс</string>
     <string name="device_manager_view_details">Переглянути подробиці</string>
     <string name="device_manager_verify_session">Звірити сеанс</string>
-    <string name="device_manager_verification_status_detail_unverified">Звірте свій поточний сеанс для безпечнішого обміну повідомленнями.</string>
-    <string name="device_manager_verification_status_detail_verified">Ваш поточний сеанс готовий для безпечного обміну повідомленнями.</string>
     <string name="device_manager_verification_status_unverified">Не звірений сеанс</string>
     <string name="device_manager_verification_status_verified">Звірений сеанс</string>
     <string name="a11y_device_manager_device_type_unknown">Невідомий тип пристрою</string>
diff --git a/library/ui-strings/src/main/res/values-vi/strings.xml b/library/ui-strings/src/main/res/values-vi/strings.xml
index 2803128843..c6dc97f782 100644
--- a/library/ui-strings/src/main/res/values-vi/strings.xml
+++ b/library/ui-strings/src/main/res/values-vi/strings.xml
@@ -594,7 +594,7 @@
     <string name="deactivate_account_title">Hủy tài khoản</string>
     <string name="dialog_user_consent_submit">Xem lại ngay</string>
     <string name="encryption_information_device_key">Chìa khóa phiên</string>
-    <string name="encryption_information_device_id">Mã phiên</string>
+    <string name="device_manager_session_details_session_id">Mã phiên</string>
     <string name="encryption_information_device_name">Tên công khai</string>
     <string name="encryption_information_decryption_error">Lỗi giải mã</string>
     <string name="room_settings_labs_warning_message">Những chức năng này mang tính thí nghiệm có thể còn nhiều lỗi. Lưu ý khi dùng.</string>
diff --git a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
index 2a99ad240b..db1dab92e2 100644
--- a/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rCN/strings.xml
@@ -242,7 +242,7 @@
     <string name="settings_password_updated">你的密码已更新</string>
     <string name="encryption_information_decryption_error">解密错误</string>
     <string name="encryption_information_device_name">公开名称</string>
-    <string name="encryption_information_device_id">会话 ID</string>
+    <string name="device_manager_session_details_session_id">会话 ID</string>
     <string name="encryption_information_device_key">会话密钥</string>
     <string name="encryption_import_import">导入</string>
     <string name="encryption_information_verified">已验证</string>
@@ -2574,11 +2574,8 @@
     <string name="device_manager_other_sessions_description_unverified">未验证 · 上次活跃 %1$s</string>
     <string name="device_manager_other_sessions_description_verified">已验证 · 上次活跃 %1$s</string>
     <string name="device_manager_other_sessions_view_all">查看全部（%1$d）</string>
-    <string name="device_manager_header_section_current_session">当前会话</string>
     <string name="device_manager_view_details">查看详情</string>
     <string name="device_manager_verify_session">验证会话</string>
-    <string name="device_manager_verification_status_detail_unverified">为了获得增强的安全的消息传送，请验证你当前的会话。</string>
-    <string name="device_manager_verification_status_detail_verified">你的当前会话已准备好安全地收发消息。</string>
     <string name="device_manager_verification_status_unverified">未验证的会话</string>
     <string name="device_manager_verification_status_verified">已验证的会话</string>
     <string name="a11y_device_manager_device_type_unknown">未知的设备类型</string>
diff --git a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
index 8a07ae94f9..78caa2cc2e 100644
--- a/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui-strings/src/main/res/values-zh-rTW/strings.xml
@@ -469,7 +469,7 @@
     <string name="settings_theme">主題</string>
     <string name="encryption_information_decryption_error">解密錯誤</string>
     <string name="encryption_information_device_name">公開名稱</string>
-    <string name="encryption_information_device_id">工作階段 ID</string>
+    <string name="device_manager_session_details_session_id">工作階段 ID</string>
     <string name="encryption_information_device_key">工作階段金鑰</string>
     <string name="encryption_export_e2e_room_keys">匯出聊天室的端到端加密金鑰</string>
     <string name="encryption_export_room_keys">匯出聊天室的加密金鑰</string>
@@ -2572,11 +2572,8 @@
     <string name="device_manager_other_sessions_description_unverified">未驗證 · 最後活動 %1$s</string>
     <string name="device_manager_other_sessions_description_verified">已驗證 · 最後活動 %1$s</string>
     <string name="device_manager_other_sessions_view_all">檢視全部 (%1$d)</string>
-    <string name="device_manager_header_section_current_session">目前工作階段</string>
     <string name="device_manager_view_details">檢視詳細資訊</string>
     <string name="device_manager_verify_session">驗證工作階段</string>
-    <string name="device_manager_verification_status_detail_unverified">驗證您目前的工作階段以強化安全通訊。</string>
-    <string name="device_manager_verification_status_detail_verified">您目前的工作階段已準備好進行安全通訊。</string>
     <string name="device_manager_verification_status_unverified">未驗證的工作階段</string>
     <string name="device_manager_verification_status_verified">已驗證的工作階段</string>
     <string name="a11y_device_manager_device_type_unknown">未知的裝置類型</string>
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
index e6b6a6acc1..dec46159dd 100644
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@@ -3232,18 +3232,12 @@
     <string name="a11y_device_manager_device_type_unknown">Unknown device type</string>
     <string name="device_manager_verification_status_verified">Verified session</string>
     <string name="device_manager_verification_status_unverified">Unverified session</string>
-    <!-- TODO TO BE REMOVED: replaced by device_manager_verification_status_detail_current_session_verified -->
-    <string name="device_manager_verification_status_detail_verified" tools:ignore="UnusedResources">Your current session is ready for secure messaging.</string>
-    <!-- TODO TO BE REMOVED: replaced by device_manager_verification_status_detail_current_session_unverified -->
-    <string name="device_manager_verification_status_detail_unverified" tools:ignore="UnusedResources">Verify your current session for enhanced secure messaging.</string>
     <string name="device_manager_verification_status_detail_current_session_verified">Your current session is ready for secure messaging.</string>
     <string name="device_manager_verification_status_detail_other_session_verified">This session is ready for secure messaging.</string>
     <string name="device_manager_verification_status_detail_current_session_unverified">Verify your current session for enhanced secure messaging.</string>
     <string name="device_manager_verification_status_detail_other_session_unverified">Verify or sign out from this session for best security and reliability.</string>
     <string name="device_manager_verify_session">Verify Session</string>
     <string name="device_manager_view_details">View Details</string>
-    <!-- TODO TO BE REMOVED: replaced by device_manager_current_session_title -->
-    <string name="device_manager_header_section_current_session" tools:ignore="UnusedResources">Current Session</string>
     <string name="device_manager_other_sessions_view_all">View All (%1$d)</string>
     <!--  Examples: Verified · Last activity Yesterday at 6PM, Verified · Last activity Aug 31 at 5:47PM -->
     <string name="device_manager_other_sessions_description_verified">Verified · Last activity %1$s</string>
@@ -3296,8 +3290,7 @@
     <string name="device_manager_session_details_title">Session details</string>
     <string name="device_manager_session_details_description">Application, device, and activity information.</string>
     <string name="device_manager_session_details_session_name">Session name</string>
-    <!-- TODO rename to device_manager_session_details_session_id -->
-    <string name="encryption_information_device_id">Session ID</string>
+    <string name="device_manager_session_details_session_id">Session ID</string>
     <string name="device_manager_session_details_session_last_activity">Last activity</string>
     <string name="device_manager_session_details_device_ip_address">IP address</string>
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt
index 3d3b6dfdcb..1fb5be4d78 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/details/SessionDetailsController.kt
@@ -95,7 +95,7 @@ class SessionDetailsController @Inject constructor(
         }
         sessionId?.let {
             val hasDivider = sessionLastSeenTs != null
-            buildContentItem(R.string.encryption_information_device_id, it, hasDivider)
+            buildContentItem(R.string.device_manager_session_details_session_id, it, hasDivider)
         }
         sessionLastSeenTs?.let {
             val formattedDate = dateFormatter.format(it, DateFormatKind.MESSAGE_DETAIL)
diff --git a/vector/src/main/res/layout/dialog_device_verify.xml b/vector/src/main/res/layout/dialog_device_verify.xml
index 82432a892a..475ffc69af 100644
--- a/vector/src/main/res/layout/dialog_device_verify.xml
+++ b/vector/src/main/res/layout/dialog_device_verify.xml
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="6dp"
-            android:text="@string/encryption_information_device_id"
+            android:text="@string/device_manager_session_details_session_id"
             android:textStyle="bold" />
 
         <TextView
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index c246a40f71..1e8997e9c8 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -35,7 +35,7 @@
         <im.vector.app.core.preference.VectorPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
             android:persistent="false"
-            android:title="@string/encryption_information_device_id"
+            android:title="@string/device_manager_session_details_session_id"
             tools:summary="VZRHETBEER" />
 
         <im.vector.app.core.preference.VectorPreference