Merge pull request #7196 from vector-im/feature/ons/revert_string_key_changes

Revert changes of string keys
2022-09-21 16:02:18 +02:00 · 2022-09-21 16:02:18 +02:00 · c05cbb4eed
parent d31d833959 793138bf1b
commit c05cbb4eed
51 changed files with 92 additions and 89 deletions
--- 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="device_manager_session_details_session_id">معرّف الجهاز</string>
+    <string name="encryption_information_device_id">معرّف الجهاز</string>
    <string name="encryption_information_device_key">مفتاح الجهاز</string>
    <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
    <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>
--- 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="device_manager_session_details_session_id">Сесийно ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">আইডি</string>
+    <string name="encryption_information_device_id">আইডি</string>
    <string name="encryption_information_device_name">সর্বজনীন নাম</string>
    <string name="encryption_information_decryption_error">ডিক্রিপশন সমস্যা</string>
    <string name="settings_theme">থিম</string>
--- 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="device_manager_session_details_session_id">আইডি</string>
+    <string name="encryption_information_device_id">আইডি</string>
    <string name="encryption_information_device_key">সেশানের কুঞ্জি</string>

    <string name="encryption_export_e2e_room_keys">শেষ থেকে শেষ রুমের কুঞ্জিগুলি এক্সপোর্ট করুন</string>
--- 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="device_manager_session_details_session_id">ID de sessió</string>
+    <string name="encryption_information_device_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>
@ -2602,8 +2602,8 @@
    <string name="all_chats">Tots els xats</string>
    <string name="home_layout_preferences">Preferències de disseny</string>
    <string name="explore_rooms">Explora sales</string>
-    <string name="device_manager_sessions_other_description">Per estar més segur, verifica les teves sessions i tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
-    <string name="device_manager_sessions_other_title">Altres sessions</string>
+    <string name="settings_sessions_other_description">Per estar més segur, verifica les teves sessions i tanca qualsevol sessió que no reconeguis o ja no utilitzis.</string>
+    <string name="settings_sessions_other_title">Altres sessions</string>
    <string name="settings_sessions_list">Sessions</string>
    <string name="a11y_open_spaces">Obre la llista d\'espais</string>
    <string name="a11y_create_message">Crea un nou xat o sala</string>
--- 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="device_manager_session_details_session_id">ID relace</string>
+    <string name="encryption_information_device_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>
@ -2651,8 +2651,8 @@
    <string name="a11y_open_settings">Otevřít nastavení</string>
    <string name="all_chats">Všechny konverzace</string>
    <string name="device_manager_settings_active_sessions_show_all">Zobrazit všechny relace (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">V zájmu co nejlepšího zabezpečení ověřujte své relace a odhlašujte se ze všech relací, které již nepoznáváte nebo nepoužíváte.</string>
-    <string name="device_manager_sessions_other_title">Ostatní relace</string>
+    <string name="settings_sessions_other_description">V zájmu co nejlepšího zabezpečení ověřujte své relace a odhlašujte se ze všech relací, které již nepoznáváte nebo nepoužíváte.</string>
+    <string name="settings_sessions_other_title">Ostatní relace</string>
    <string name="settings_sessions_list">Relace</string>
    <string name="a11y_open_spaces">Seznam otevřených prostorů</string>
    <string name="a11y_create_message">Vytvořit novou konverzaci nebo místnost</string>
--- 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="device_manager_session_details_session_id">Sitzungs-ID</string>
+    <string name="encryption_information_device_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>
@ -2587,8 +2587,8 @@
    <string name="room_list_filter_people">Personen</string>
    <string name="send_your_first_msg_to_invite">Schreibe deine erste Nachricht, um %s zur Konversation einzuladen</string>
    <string name="device_manager_settings_active_sessions_show_all">Alle Sitzungen anzeigen (V2, in Arbeit)</string>
-    <string name="device_manager_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
-    <string name="device_manager_sessions_other_title">Andere Sitzungen</string>
+    <string name="settings_sessions_other_description">Für bestmögliche Sicherheit verifiziere deine Sitzungen und melde dich von allen ab, die du nicht erkennst oder nutzt.</string>
+    <string name="settings_sessions_other_title">Andere Sitzungen</string>
    <string name="settings_sessions_list">Sitzungen</string>
    <string name="a11y_open_spaces">Space-Liste öffnen</string>
    <string name="a11y_create_message">Beginne ein Gespräch oder erstelle einen Raum</string>
--- 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="device_manager_session_details_session_id">Αναγνωριστικό συσκευής</string>
+    <string name="encryption_information_device_id">Αναγνωριστικό συσκευής</string>
    <string name="encryption_export_export">Εξαγωγή</string>
    <string name="encryption_import_import">Εισαγωγή</string>
    <string name="select_room_directory">Επιλέξτε ένα ευρετήριο δωματίων</string>
--- 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="device_manager_session_details_session_id">Identigilo de salutaĵo</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Identificación del dispositivo</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID de sesión</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Sessiooni tunnus</string>
+    <string name="encryption_information_device_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>
@ -2592,8 +2592,8 @@
    <string name="a11y_open_settings">Ava seadistused</string>
    <string name="all_chats">Kõik vestlused</string>
    <string name="device_manager_settings_active_sessions_show_all">Näita kõiki sessioone (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">Parima turvalisuse nimel verifitseeri kõik oma sessioonid ning logi välja neist, mida sa enam ei kasuta.</string>
-    <string name="device_manager_sessions_other_title">Muud sessioonid</string>
+    <string name="settings_sessions_other_description">Parima turvalisuse nimel verifitseeri kõik oma sessioonid ning logi välja neist, mida sa enam ei kasuta.</string>
+    <string name="settings_sessions_other_title">Muud sessioonid</string>
    <string name="settings_sessions_list">Sessionid</string>
    <string name="a11y_open_spaces">Ava kogukondade loend</string>
    <string name="a11y_create_message">Alusta uut vestlust või loo uus jututuba</string>
--- 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="device_manager_session_details_session_id">IDa</string>
+    <string name="encryption_information_device_id">IDa</string>
    <string name="encryption_information_device_key">Saioaren gakoa</string>

    <string name="encryption_export_e2e_room_keys">Esportatu E2E geletako gakoak</string>
--- 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="device_manager_session_details_session_id">شناسهٔ نشست</string>
+    <string name="encryption_information_device_id">شناسهٔ نشست</string>
    <string name="encryption_information_device_key">کلید نشست</string>
    <string name="encryption_export_e2e_room_keys">برون‌ریزی کلید‌های اتاق‌های سرتاسری</string>
    <string name="encryption_export_room_keys">برون‌ریزی کلید‌های اتاق‌ها</string>
@ -2601,8 +2601,8 @@
    <string name="a11y_open_settings">گشودن تنظیمات</string>
    <string name="all_chats">تمامی گپ‌ها</string>
    <string name="device_manager_settings_active_sessions_show_all">نمایش تمامی نشست‌ها (ن۲، دح‌ت)</string>
-    <string name="device_manager_sessions_other_description">برای امنیت بیش‌تر، نشست‌هایتان را تأیید و از هر نشستی که تشخیصش نمی‌دهید یا دیگر استفاده نمی‌کنید خارج شوید.</string>
-    <string name="device_manager_sessions_other_title">دیگر نشست‌ها</string>
+    <string name="settings_sessions_other_description">برای امنیت بیش‌تر، نشست‌هایتان را تأیید و از هر نشستی که تشخیصش نمی‌دهید یا دیگر استفاده نمی‌کنید خارج شوید.</string>
+    <string name="settings_sessions_other_title">دیگر نشست‌ها</string>
    <string name="settings_sessions_list">نشست‌ها</string>
    <string name="a11y_open_spaces">گشودن سیاههٔ فضاها</string>
    <string name="a11y_create_message">ایجاد اتاق یا گفت‌وگویی جدید</string>
--- 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="device_manager_session_details_session_id">Istunnon tunnus</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Identifiant de session</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Identifiant de session</string>
+    <string name="encryption_information_device_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>
@ -2601,8 +2601,8 @@
    <string name="a11y_open_settings">Ouvrir les paramètres</string>
    <string name="all_chats">Toutes les conversations</string>
    <string name="device_manager_settings_active_sessions_show_all">Afficher toutes les sessions (V2, en cours)</string>
-    <string name="device_manager_sessions_other_description">Pour une meilleure sécurité, vérifiez vos sessions et déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
-    <string name="device_manager_sessions_other_title">Autres sessions</string>
+    <string name="settings_sessions_other_description">Pour une meilleure sécurité, vérifiez vos sessions et déconnectez toutes les sessions que vous ne connaissez pas ou que vous n’utilisez plus.</string>
+    <string name="settings_sessions_other_title">Autres sessions</string>
    <string name="settings_sessions_list">Sessions</string>
    <string name="a11y_open_spaces">Ouvrir la liste des espaces</string>
    <string name="a11y_create_message">Créer une nouvelle conversation ou salon</string>
--- 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="device_manager_session_details_session_id">ID de sesión</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Identitet</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Munkamenet-azonosító</string>
+    <string name="encryption_information_device_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>
@ -2615,8 +2615,8 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
    <string name="a11y_device_manager_device_type_web">Web</string>
    <string name="a11y_device_manager_device_type_mobile">Mobil</string>
    <string name="device_manager_settings_active_sessions_show_all">Minden munkamenet megjelenítése (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">A legjobb biztonság érdekében ellenőrizd a munkameneteket, és jelentkezz ki minden olyan munkamenetből, melyet már nem ismersz fel vagy nem használsz.</string>
-    <string name="device_manager_sessions_other_title">Más munkamenetek</string>
+    <string name="settings_sessions_other_description">A legjobb biztonság érdekében ellenőrizd a munkameneteket, és jelentkezz ki minden olyan munkamenetből, melyet már nem ismersz fel vagy nem használsz.</string>
+    <string name="settings_sessions_other_title">Más munkamenetek</string>
    <string name="settings_sessions_list">Munkamenetek</string>
    <string name="a11y_open_spaces">Nyitott területek listája</string>
    <string name="a11y_create_message">Új beszélgetés vagy szoba létrehozása</string>
--- 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="device_manager_session_details_session_id">ID Sesi</string>
+    <string name="encryption_information_device_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>
@ -2553,8 +2553,8 @@ Di masa mendatang proses verifikasi ini akan dimutakhirkan.</string>
    <string name="auth_reset_password_error_unverified">Email belum diverifikasi, periksa kotak masuk Anda</string>
    <string name="all_chats">Semua Obrolan</string>
    <string name="device_manager_settings_active_sessions_show_all">Tampilkan Semua Sesi (V2, Dalam Pengembangan)</string>
-    <string name="device_manager_sessions_other_description">Untuk keamanan terbaik, verifikasi sesi Anda dan keluarkan sesi apa pun yang Anda tidak kenal atau Anda tidak gunakan lagi.</string>
-    <string name="device_manager_sessions_other_title">Sesi lainnya</string>
+    <string name="settings_sessions_other_description">Untuk keamanan terbaik, verifikasi sesi Anda dan keluarkan sesi apa pun yang Anda tidak kenal atau Anda tidak gunakan lagi.</string>
+    <string name="settings_sessions_other_title">Sesi lainnya</string>
    <string name="settings_sessions_list">Sesi</string>
    <string name="a11y_open_spaces">Buka daftar space</string>
    <string name="a11y_create_message">Buat percakapan atau ruangan baru</string>
--- 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="device_manager_session_details_session_id">Auðkenni setu</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID sessione</string>
+    <string name="encryption_information_device_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>
@ -2592,8 +2592,8 @@
    <string name="a11y_open_settings">Apri le impostazioni</string>
    <string name="all_chats">Tutte le chat</string>
    <string name="device_manager_settings_active_sessions_show_all">Mostra tutte le sessioni (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">Per una maggiore sicurezza, verifica le tue sessioni e disconnetti quelle che non riconosci o che non usi più.</string>
-    <string name="device_manager_sessions_other_title">Altre sessioni</string>
+    <string name="settings_sessions_other_description">Per una maggiore sicurezza, verifica le tue sessioni e disconnetti quelle che non riconosci o che non usi più.</string>
+    <string name="settings_sessions_other_title">Altre sessioni</string>
    <string name="settings_sessions_list">Sessioni</string>
    <string name="a11y_open_spaces">Apri elenco spazi</string>
    <string name="a11y_create_message">Crea una nuova conversazione o stanza</string>
--- 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="device_manager_session_details_session_id">מזהה מושב</string>
+    <string name="encryption_information_device_id">מזהה מושב</string>
    <string name="encryption_information_device_name">שם ציבורי</string>
    <string name="encryption_information_decryption_error">שגיאת פענוח</string>
    <string name="settings_theme">ערכת נושא</string>
--- 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="device_manager_session_details_session_id">セッションID</string>
+    <string name="encryption_information_device_id">セッションID</string>
    <string name="font_size">文字の大きさ</string>
    <string name="tiny">とても小さい</string>
    <string name="small">小さい</string>
--- 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="device_manager_session_details_session_id">Asulay n tqimit</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID ລະບົບ</string>
+    <string name="encryption_information_device_id">ID ລະບົບ</string>
    <string name="encryption_information_device_name">ຊື່ສາທາລະນະ</string>
    <string name="encryption_information_decryption_error">ການຖອດລະຫັດຜິດພາດ</string>
    <string name="settings_theme">ຫົວຂໍ້</string>
--- 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="device_manager_session_details_session_id">Sesijas ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Økt-ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Sessie ID</string>
+    <string name="encryption_information_device_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>
@ -2600,8 +2600,8 @@
    <string name="location_share_loading_map_error">Kan kaart niet laden
 \nDeze server is mogelijk niet geconfigureerd om kaarten weer te geven.</string>
    <string name="a11y_open_settings">Open instellingen</string>
-    <string name="device_manager_sessions_other_description">Voor de beste beveiliging verifieert u uw sessies en meldt u zich af bij elke sessie die u niet meer herkent of gebruikt.</string>
-    <string name="device_manager_sessions_other_title">Andere sessies</string>
+    <string name="settings_sessions_other_description">Voor de beste beveiliging verifieert u uw sessies en meldt u zich af bij elke sessie die u niet meer herkent of gebruikt.</string>
+    <string name="settings_sessions_other_title">Andere sessies</string>
    <string name="settings_sessions_list">Sessies</string>
    <string name="a11y_open_spaces">Lijst met publieke spaces</string>
    <string name="a11y_create_message">Maak een nieuw gesprek of een nieuwe kamer</string>
--- 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="device_manager_session_details_session_id">Økt-ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID sesji</string>
+    <string name="encryption_information_device_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>
@ -2697,8 +2697,8 @@
    <string name="location_share_loading_map_error">Nie można wczytać mapy.
 \nTen serwer macierzysty może nie być skonfigurowany do wyświetlania map.</string>
    <string name="a11y_open_settings">Otwórz ustawienia</string>
-    <string name="device_manager_sessions_other_description">Aby zapewnić najlepsze bezpieczeństwo, zweryfikuj swoje sesje i wyloguj się z każdej sesji, której już nie rozpoznajesz lub której już nie używasz.</string>
-    <string name="device_manager_sessions_other_title">Inne sesje</string>
+    <string name="settings_sessions_other_description">Aby zapewnić najlepsze bezpieczeństwo, zweryfikuj swoje sesje i wyloguj się z każdej sesji, której już nie rozpoznajesz lub której już nie używasz.</string>
+    <string name="settings_sessions_other_title">Inne sesje</string>
    <string name="settings_sessions_list">Sesje</string>
    <string name="a11y_open_spaces">Lista otwartych przestrzeni</string>
    <string name="a11y_create_message">Utwórz nową rozmowę lub pokój</string>
--- 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="device_manager_session_details_session_id">ID de sessão</string>
+    <string name="encryption_information_device_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>
@ -2601,8 +2601,8 @@
    <string name="a11y_open_settings">Abrir configurações</string>
    <string name="all_chats">Todos os Chats</string>
    <string name="device_manager_settings_active_sessions_show_all">Mostrar Todas Sessões (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">Para a melhor segurança, verifique suas sessões e faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
-    <string name="device_manager_sessions_other_title">Outras sessões</string>
+    <string name="settings_sessions_other_description">Para a melhor segurança, verifique suas sessões e faça signout de qualquer sessão que você não reconhece ou usa mais.</string>
+    <string name="settings_sessions_other_title">Outras sessões</string>
    <string name="settings_sessions_list">Sessões</string>
    <string name="a11y_open_spaces">Abrir lista de espaços</string>
    <string name="a11y_create_message">Criar uma nova conversa ou sala</string>
--- 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="device_manager_session_details_session_id">ID do dispositivo</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID сессии</string>
+    <string name="encryption_information_device_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>
@ -2660,8 +2660,8 @@
    <string name="location_share_loading_map_error">Не удалось загрузить карту
 \nВозможно, этот домашний сервер не настроен для отображения карт.</string>
    <string name="all_chats">Все беседы</string>
-    <string name="device_manager_sessions_other_description">Для лучшей безопасности заверьте свои сессии и выйдите из тех, которые более не признаёте или не используете.</string>
-    <string name="device_manager_sessions_other_title">Другие сессии</string>
+    <string name="settings_sessions_other_description">Для лучшей безопасности заверьте свои сессии и выйдите из тех, которые более не признаёте или не используете.</string>
+    <string name="settings_sessions_other_title">Другие сессии</string>
    <string name="settings_sessions_list">Сессии</string>
    <string name="a11y_create_message">Создать беседу или комнату</string>
    <string name="device_manager_settings_active_sessions_show_all">Показать все сессии (V2, в разработке)</string>
--- 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="device_manager_session_details_session_id">ID relácie</string>
+    <string name="encryption_information_device_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>
@ -2651,8 +2651,8 @@
    <string name="a11y_open_settings">Otvoriť nastavenia</string>
    <string name="all_chats">Všetky konverzácie</string>
    <string name="device_manager_settings_active_sessions_show_all">Zobraziť všetky relácie (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">V záujme čo najlepšieho zabezpečenia overte svoje relácie a odhláste sa z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
-    <string name="device_manager_sessions_other_title">Iné relácie</string>
+    <string name="settings_sessions_other_description">V záujme čo najlepšieho zabezpečenia overte svoje relácie a odhláste sa z každej relácie, ktorú už nepoznáte alebo nepoužívate.</string>
+    <string name="settings_sessions_other_title">Iné relácie</string>
    <string name="settings_sessions_list">Relácie</string>
    <string name="a11y_open_spaces">Otvoriť zoznam priestorov</string>
    <string name="a11y_create_message">Vytvoriť novú konverzáciu alebo miestnosť</string>
--- 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="device_manager_session_details_session_id">ID Sesioni</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">Sessions-ID</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">పరికరం ID</string>
+    <string name="encryption_information_device_id">పరికరం ID</string>
    <string name="encryption_information_device_key">పరికరం కీ</string>

    <string name="encryption_export_e2e_room_keys">E2E గది కీలను ఎగుమతి చేయండి</string>
--- 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="device_manager_session_details_session_id">Oturum kimliği</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">ID сеансу</string>
+    <string name="encryption_information_device_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>
@ -2701,8 +2701,8 @@
    <string name="a11y_open_settings">Відкрити налаштування</string>
    <string name="all_chats">Усі бесіди</string>
    <string name="device_manager_settings_active_sessions_show_all">Показати всі сеанси (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">Для найкращої безпеки перевірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте.</string>
-    <string name="device_manager_sessions_other_title">Інші сеанси</string>
+    <string name="settings_sessions_other_description">Для найкращої безпеки перевірте свої сеанси та вийдіть з усіх сеансів, які ви більше не розпізнаєте або не використовуєте.</string>
+    <string name="settings_sessions_other_title">Інші сеанси</string>
    <string name="settings_sessions_list">Сеанси</string>
    <string name="a11y_open_spaces">Відкрити список кімнат</string>
    <string name="a11y_create_message">Створити нову розмову або кімнату</string>
--- 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="device_manager_session_details_session_id">Mã phiên</string>
+    <string name="encryption_information_device_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>
--- 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="device_manager_session_details_session_id">会话 ID</string>
+    <string name="encryption_information_device_id">会话 ID</string>
    <string name="encryption_information_device_key">会话密钥</string>
    <string name="encryption_import_import">导入</string>
    <string name="encryption_information_verified">已验证</string>
@ -2551,8 +2551,8 @@
    <string name="a11y_open_settings">打开设置</string>
    <string name="all_chats">全部聊天</string>
    <string name="device_manager_settings_active_sessions_show_all">显示全部会话（V2, WIP）</string>
-    <string name="device_manager_sessions_other_description">为获得最佳安全性，请验证你的会话，并从任何你不认识或不再使用的会话登出。</string>
-    <string name="device_manager_sessions_other_title">其他会话</string>
+    <string name="settings_sessions_other_description">为获得最佳安全性，请验证你的会话，并从任何你不认识或不再使用的会话登出。</string>
+    <string name="settings_sessions_other_title">其他会话</string>
    <string name="settings_sessions_list">会话</string>
    <string name="a11y_open_spaces">打开空间列表</string>
    <string name="a11y_create_message">创建新对话或房间</string>
--- 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="device_manager_session_details_session_id">工作階段 ID</string>
+    <string name="encryption_information_device_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>
@ -2551,8 +2551,8 @@
    <string name="a11y_open_settings">開啟設定</string>
    <string name="all_chats">所有聊天</string>
    <string name="device_manager_settings_active_sessions_show_all">顯示所有工作階段 (V2, WIP)</string>
-    <string name="device_manager_sessions_other_description">為了取得最佳安全性，請驗證您的工作階段並登出任何您無法識別或不再使用的工作階段。</string>
-    <string name="device_manager_sessions_other_title">其他工作階段</string>
+    <string name="settings_sessions_other_description">為了取得最佳安全性，請驗證您的工作階段並登出任何您無法識別或不再使用的工作階段。</string>
+    <string name="settings_sessions_other_title">其他工作階段</string>
    <string name="settings_sessions_list">工作階段</string>
    <string name="a11y_open_spaces">開啟空間清單</string>
    <string name="a11y_create_message">建立新的對話或聊天室</string>
--- a/library/ui-strings/src/main/res/values/strings.xml
+++ b/library/ui-strings/src/main/res/values/strings.xml
@ -2364,8 +2364,10 @@
    <string name="settings_active_sessions_manage">Manage Sessions</string>
    <string name="settings_active_sessions_signout_device">Sign out of this session</string>
    <string name="settings_sessions_list">Sessions</string>
-    <string name="device_manager_sessions_other_title">Other sessions</string>
-    <string name="device_manager_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>
+    <!-- TODO rename to device_manager_sessions_other_title -->
+    <string name="settings_sessions_other_title">Other sessions</string>
+    <!-- TODO rename to device_manager_sessions_other_description -->
+    <string name="settings_sessions_other_description">For best security, verify your sessions and sign out from any session that you don’t recognize or use anymore.</string>

    <string name="settings_server_name">Server name</string>
    <string name="settings_server_version">Server version</string>
@ -3296,7 +3298,8 @@
    <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>
-    <string name="device_manager_session_details_session_id">Session ID</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_last_activity">Last activity</string>
    <string name="device_manager_session_details_device_ip_address">IP address</string>

--- 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.device_manager_session_details_session_id, it, hasDivider)
+            buildContentItem(R.string.encryption_information_device_id, it, hasDivider)
        }
        sessionLastSeenTs?.let {
            val formattedDate = dateFormatter.format(it, DateFormatKind.MESSAGE_DETAIL)
--- 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/device_manager_session_details_session_id"
+            android:text="@string/encryption_information_device_id"
            android:textStyle="bold" />

        <TextView
--- a/vector/src/main/res/layout/fragment_other_sessions.xml
+++ b/vector/src/main/res/layout/fragment_other_sessions.xml
@ -18,7 +18,7 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:navigationIcon="@drawable/ic_back_24dp"
-            app:title="@string/device_manager_sessions_other_title">
+            app:title="@string/settings_sessions_other_title">

            <FrameLayout
                android:id="@+id/otherSessionsFilterFrameLayout"
@ -53,7 +53,7 @@
        android:id="@+id/deviceListHeaderOtherSessions"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+        app:sessionsListHeaderDescription="@string/settings_sessions_other_description"
        app:sessionsListHeaderTitle=""
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@ -90,8 +90,8 @@
            android:id="@+id/deviceListHeaderOtherSessions"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
-            app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
-            app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title"
+            app:sessionsListHeaderDescription="@string/settings_sessions_other_description"
+            app:sessionsListHeaderTitle="@string/settings_sessions_other_title"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession" />
--- 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/device_manager_session_details_session_id"
+            android:title="@string/encryption_information_device_id"
            tools:summary="VZRHETBEER" />

        <im.vector.app.core.preference.VectorPreference