diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a545654c115..97311064597 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -104,6 +104,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 30b935780f0..74c44beafaa 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -93,6 +93,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b2c39f82ff0..36a4da1a00b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -40,6 +40,7 @@
     <string name="label_membership_external">Extern</string>
     <string name="label_membership_service">Dienst</string>
     <string name="label_user_deleted">Gelöscht</string>
+    <string name="label_try_again">Erneut versuchen</string>
     <string name="label_message_sent_failure">Nachricht konnte aufgrund von Verbindungsproblemen nicht gesendet werden.</string>
     <string name="label_message_edit_sent_failure">Bearbeitete Nachricht konnte aufgrund von Verbindungsproblemen nicht gesendet werden.</string>
     <string name="label_message_sent_remotely_failure">Nachricht nicht gesendet, da das Backend %s nicht erreichbar ist.</string>
@@ -157,6 +158,7 @@
     <string name="content_description_add_participants_search_field">Personen nach Namen oder Benutzernamen suchen</string>
     <string name="content_description_add_participants_back_btn">Zurück zum Hinzufügen von Teilnehmern</string>
     <string name="content_description_home_profile_btn">Ihr Profil</string>
+    <string name="content_description_home_profile_btn_with_notification">Ihr Profil, ein ungelesener Hinweis.</string>
     <string name="content_description_open_label">Öffnen</string>
     <string name="content_description_join_call_label">Anruf annehmen</string>
     <string name="content_description_share_label">Teilen</string>
@@ -167,10 +169,14 @@
     <string name="content_description_toggle_setting_label">umschalten</string>
     <string name="content_description_edit_guests_option_back_btn">Zurück zu Unterhaltungsdetails</string>
     <string name="content_description_edit_self_delete_back_btn">Zurück zu Unterhaltungsdetails</string>
+    <string name="content_description_accept_or_ignore_connection_label">Anfrage akzeptieren oder ignorieren</string>
     <string name="content_description_open_user_profile_label">Profil öffnen</string>
     <string name="content_description_open_conversation_label">Unterhaltung öffnen</string>
     <string name="content_description_open_link_label">Link öffnen</string>
+    <string name="content_description_drop_down">Auswahlliste</string>
     <string name="content_description_open_notification_settings_label">Benachrichtigungseinstellungen öffnen</string>
+    <string name="content_description_new_conversation_close_btn">Ansicht neue Unterhaltung schließen</string>
+    <string name="content_description_new_group_conversation_back_btn">Zurück zur Ansicht neue Unterhaltung</string>
     <string name="content_description_new_conversation_name_back_btn">Zurück zur Ansicht neue Unterhaltung</string>
     <string name="content_description_new_conversation_options_heading">Unterhaltungsoptionen</string>
     <string name="content_description_new_conversation_options_back_btn">Zurück zur neuen Gruppenerstellung</string>
@@ -512,14 +518,13 @@
     <!-- User Profile -->
     <string name="user_profile_title">Benutzerprofil</string>
     <string name="user_profile_close_description">Benutzerprofil schließen</string>
-    <string name="user_profile_logout">Abmelden</string>
     <string name="user_profile_other_accs">Ihre anderen Benutzerkonten</string>
     <string name="user_profile_status_availability">Verfügbarkeit</string>
     <string name="user_profile_status_available">Verfügbar</string>
     <string name="user_profile_status_busy">Beschäftigt</string>
     <string name="user_profile_status_away">Abwesend</string>
     <string name="user_profile_status_none">Kein Status</string>
-    <string name="user_profile_new_account_text">Neues Team oder Benutzerkonto</string>
+    <string name="user_profile_new_account_text">Neues Team oder Konto</string>
     <string name="user_profile_details_tab">Details</string>
     <string name="user_profile_devices_tab">Geräte</string>
     <string name="user_profile_group_tab">Gruppe</string>
@@ -547,6 +552,7 @@
     <!-- Logout Wipe Data Dialog -->
     <string name="dialog_logout_wipe_data_title">Daten löschen?</string>
     <string name="dialog_logout_wipe_data_checkbox">Ihre persönlichen Daten und Unterhaltungen vollständig von diesem Gerät entfernen</string>
+    <string name="dialog_logout_wipe_data_cancel_description">Abmeldung abbrechen</string>
     <!-- User Profile status dialog-->
     <string name="user_profile_change_status_dialog_available_title">Ändern Sie Ihren Status zu Verfügbar</string>
     <string name="user_profile_change_status_dialog_available_text">Andere sehen den Status als Verfügbar. Benachrichtigungen über eingehende Anrufe und Nachrichten werden anhand der Einstellungen in jeder Unterhaltung angezeigt.</string>
@@ -560,6 +566,7 @@
     <!-- Conversations BottomSheet -->
     <string name="label_notifications">Benachrichtigungen</string>
     <string name="label_add_to_favourites">Zu Favoriten hinzufügen</string>
+    <string name="label_remove_from_favourites">Aus Favoriten entfernen</string>
     <string name="label_move_to_folder">In Ordner verschieben</string>
     <string name="label_move_to_archive">Ins Archiv verschieben</string>
     <string name="label_unarchive">Reaktivieren</string>
@@ -814,6 +821,11 @@
     <string name="dialog_archive_conversation_title">Unterhaltung archivieren?</string>
     <string name="dialog_archive_conversation_description">Diese Unterhaltung wird in Ihr Archiv verschoben. Sie erhalten weiterhin neue Nachrichten, Dateien und Anrufe, aber keine Benachrichtigungen. Sie können die Unterhaltung jederzeit reaktivieren.</string>
     <string name="dialog_archive_conversation_option">Archivieren</string>
+    <!-- Favorite -->
+    <string name="success_adding_to_favorite">\"%s\" wurde zu Favoriten hinzugefügt</string>
+    <string name="success_removing_from_favorite">“%s“ wurde aus Favoriten entfernt</string>
+    <string name="error_adding_to_favorite">“%s” konnte nicht zu Favoriten hinzugefügt werden</string>
+    <string name="error_removing_from_favorite">“%s” konnte nicht aus Favoriten entfernt werden</string>
     <!-- Animation label -->
     <string name="label_open_conversation">Unterhaltung öffnen</string>
     <string name="label_start_conversation">Unterhaltung beginnen</string>
@@ -1440,6 +1452,12 @@ registriert. Bitte versuchen Sie es mit einer anderen.</string>
     <string name="personal_to_team_migration_step_label">Schritt %1$d von 4</string>
     <string name="personal_to_team_migration_back_to_wire_button">Zurück zu Wire</string>
     <string name="personal_to_team_migration_back_button_label">Zurück</string>
+    <string name="personal_to_team_migration_back_button_team_name_content_description">Zurück zur Team-Konto-Übersicht</string>
+    <string name="personal_to_team_migration_back_button_confirmation_content_description">Zurück zur Ansicht Team-Name</string>
+    <string name="personal_to_team_migration_close_team_account_content_description">Team-Konto-Übersicht schließen</string>
+    <string name="personal_to_team_migration_close_team_name_content_description">Ansicht Teamname schließen</string>
+    <string name="personal_to_team_migration_close_confirmation_content_description">Bestätigungsansicht schließen</string>
+    <string name="personal_to_team_migration_close_team_created_content_description">Ansicht Team erstellt schließen</string>
     <string name="personal_to_team_migration_team_plan_step">Team-Konto</string>
     <string name="personal_to_team_migration_team_plan_description">Übertragen Sie Ihr privates Benutzerkonto in ein Team-Konto, um besser zusammenzuarbeiten.</string>
     <string name="personal_to_team_migration_team_plan_admin_console_label">Admin-Konsole:</string>
@@ -1472,4 +1490,9 @@ registriert. Bitte versuchen Sie es mit einer anderen.</string>
     <string name="personal_to_team_migration_confirm_leave_dialog_description">Wenn Sie jetzt aufhören, verlieren Sie Ihren Fortschritt und müssen die Team-Erstellung neu beginnen.</string>
     <string name="personal_to_team_migration_confirm_leave_dialog_continue_button">Team-Erstellung fortsetzen</string>
     <string name="personal_to_team_migration_confirm_leave_dialog_leave_button">Schließen ohne zu speichern</string>
+    <string name="personal_to_team_migration_error_title">Team nicht erstellt</string>
+    <string name="personal_to_team_migration_error_title_already_in_team">Bereits Teil eines Teams</string>
+    <string name="personal_to_team_migration_error_message_already_in_team">Sie haben ein Team mit dieser E-Mail-Adresse auf einem anderen Gerät erstellt oder sind einem Team beigetreten.</string>
+    <string name="personal_to_team_migration_error_message_slow_network">Wire konnte die Erstellung Ihres Teams aufgrund einer langsamen Internetverbindung nicht abschließen.</string>
+    <string name="personal_to_team_migration_error_message_unknown_error">Wire konnte die Erstellung Ihres Teams aufgrund eines unbekannten Fehlers nicht abschließen.</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 616b3a25832..b9256cc2634 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -412,14 +412,12 @@ Hasta 500 personas pueden unirse a una conversaci&#243;n en grupo.</string>
     <!-- User Profile -->
     <string name="user_profile_title">Perfil de usuario</string>
     <string name="user_profile_close_description">Cerrar perfil de usuario</string>
-    <string name="user_profile_logout">Cerrar sesi&#243;n</string>
     <string name="user_profile_other_accs">Tus otras cuentas</string>
     <string name="user_profile_status_availability">Disponibilidad</string>
     <string name="user_profile_status_available">Disponible</string>
     <string name="user_profile_status_busy">Ocupado</string>
     <string name="user_profile_status_away">Ausente</string>
     <string name="user_profile_status_none">Ninguno</string>
-    <string name="user_profile_new_account_text">Nueva cuenta o equipo</string>
     <string name="user_profile_details_tab">Detalles</string>
     <string name="user_profile_devices_tab">Dispositivos</string>
     <string name="user_profile_group_tab">Grupo</string>
@@ -643,6 +641,7 @@ Hasta 500 personas pueden unirse a una conversaci&#243;n en grupo.</string>
     <string name="delete_group_conversation_error">Ocurri&#243; un error al eliminar la conversaci&#243;n.</string>
     <string name="error_limit_number_assets_imported_exceeded">Solo puedes enviar hasta 20 archivos a la vez.</string>
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Abrir conversaci&#243;n</string>
     <string name="email_label">Correo electr&#243;nico</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 9b4aee1f834..f1b54d4384f 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -282,6 +282,7 @@
     <string name="blocking_user_success">%s blokeeritud</string>
     <string name="conversation_group_removed_success">“%s” eemaldatud</string>
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Ava vestlus</string>
     <string name="email_label">E-post</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c84b999886f..e531cda2d23 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -467,14 +467,12 @@
     <!-- User Profile -->
     <string name="user_profile_title">Profil utilisateur</string>
     <string name="user_profile_close_description">Fermer le profil utilisateur</string>
-    <string name="user_profile_logout">Se déconnecter</string>
     <string name="user_profile_other_accs">Vos autres comptes</string>
     <string name="user_profile_status_availability">Disponibilité</string>
     <string name="user_profile_status_available">Disponible</string>
     <string name="user_profile_status_busy">Occupé(e)</string>
     <string name="user_profile_status_away">Absent(e)</string>
     <string name="user_profile_status_none">Aucune</string>
-    <string name="user_profile_new_account_text">Nouvelle équipe ou nouveau compte</string>
     <string name="user_profile_details_tab">Informations</string>
     <string name="user_profile_devices_tab">Appareils</string>
     <string name="user_profile_group_tab">Groupe</string>
@@ -545,6 +543,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 616ae24f095..b505a7a8c90 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -412,11 +412,9 @@
     <string name="attachment_voice_message">Zvuk</string>
     <!-- User Profile -->
     <string name="user_profile_title">Korisnički profil</string>
-    <string name="user_profile_logout">Odjava</string>
     <string name="user_profile_status_busy">Zauzet</string>
     <string name="user_profile_status_away">Odsutan</string>
     <string name="user_profile_status_none">Ništa</string>
-    <string name="user_profile_new_account_text">Novi tim ili račun</string>
     <string name="user_profile_details_tab">Detalji</string>
     <string name="user_profile_devices_tab">Uređaji</string>
     <string name="user_profile_group_tab">Grupa</string>
@@ -489,6 +487,7 @@
     <string name="error_limit_number_assets_imported_exceeded">Možete poslati najviše 20 datoteka odjednom</string>
     <!-- Archiving -->
     <string name="dialog_archive_conversation_option">Arhiviraj</string>
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Otvori razgovor</string>
     <string name="email_label">E-mail</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ca2b898a5bb..f684fd8e9a5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -558,14 +558,12 @@
     <!-- User Profile -->
     <string name="user_profile_title">Felhasználói profil</string>
     <string name="user_profile_close_description">A felhasználói profil bezárása</string>
-    <string name="user_profile_logout">Kijelentkezés</string>
     <string name="user_profile_other_accs">További fiókjai</string>
     <string name="user_profile_status_availability">Elérhetőség</string>
     <string name="user_profile_status_available">Elérhető</string>
     <string name="user_profile_status_busy">Elfoglalt</string>
     <string name="user_profile_status_away">Nincs a gépnél</string>
     <string name="user_profile_status_none">Semmi</string>
-    <string name="user_profile_new_account_text">Új csapat vagy fiók</string>
     <string name="user_profile_details_tab">Részletek</string>
     <string name="user_profile_devices_tab">Eszközök</string>
     <string name="user_profile_group_tab">Csoport</string>
@@ -874,6 +872,7 @@
     <string name="dialog_archive_conversation_title">Archiválja a beszélgetést?</string>
     <string name="dialog_archive_conversation_description">Ez a beszélgetés az archívumba kerül. Továbbra is megkapja az új üzeneteket, fájlokat és hívásokat, azonban nem lesznek értesítések. Az archívumból bármikor előveheti a beszélgetést.</string>
     <string name="dialog_archive_conversation_option">Archiválás</string>
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Nyitott beszélgetés</string>
     <string name="label_start_conversation">Beszélgetés indítása</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 020238e3069..422f13b97f3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -461,14 +461,12 @@ Fino a 500 persone possono unirsi a una conversazione di gruppo.</string>
     <!-- User Profile -->
     <string name="user_profile_title">Profilo Utente</string>
     <string name="user_profile_close_description">Chiudi profilo utente</string>
-    <string name="user_profile_logout">Logout</string>
     <string name="user_profile_other_accs">Gli Altri Tuoi Profili</string>
     <string name="user_profile_status_availability">Disponibilità</string>
     <string name="user_profile_status_available">Disponibile</string>
     <string name="user_profile_status_busy">Occupato</string>
     <string name="user_profile_status_away">Assente</string>
     <string name="user_profile_status_none">Nessuno</string>
-    <string name="user_profile_new_account_text">Nuovo team o account</string>
     <string name="user_profile_details_tab">Dettagli</string>
     <string name="user_profile_devices_tab">Dispositivi</string>
     <string name="user_profile_group_tab">Gruppo</string>
@@ -747,6 +745,7 @@ Fino a 500 persone possono unirsi a una conversazione di gruppo.</string>
     <string name="dialog_archive_conversation_title">Archiviare la conversazione?</string>
     <string name="dialog_archive_conversation_description">Questa conversazione si sposta nel tuo archivio. Ricevi comunque nuovi messaggi, file e chiamate, ma nessuna notifica. Puoi disarchiviarla in qualsiasi momento.</string>
     <string name="dialog_archive_conversation_option">Archivia</string>
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Apri la conversazione.</string>
     <string name="email_label">E-mail</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b6b29e04ca5..e9c224c182a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -336,6 +336,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index a7eaf316f3a..d1ff73fe325 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -88,6 +88,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8cf561849fe..9e51632ea48 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -386,14 +386,12 @@ Do grupy mo&#380;e do&#322;&#261;czy&#263; maksymalnie 500 os&#243;b.</string>
     <!-- User Profile -->
     <string name="user_profile_title">Profil U&#380;ytkownika</string>
     <string name="user_profile_close_description">Zamknij Profil U&#380;ytkownika</string>
-    <string name="user_profile_logout">Wyloguj Si&#281;</string>
     <string name="user_profile_other_accs">Twoje Pozosta&#322;e Konta</string>
     <string name="user_profile_status_availability">Dost&#281;pno&#347;&#263;</string>
     <string name="user_profile_status_available">Dost&#281;pny</string>
     <string name="user_profile_status_busy">Zaj&#281;ty</string>
     <string name="user_profile_status_away">Nieobecny</string>
     <string name="user_profile_status_none">Brak</string>
-    <string name="user_profile_new_account_text">Nowy Zesp&#243;&#322; lub Konto</string>
     <string name="user_profile_details_tab">Szczeg&#243;&#322;y</string>
     <string name="user_profile_devices_tab">Urz&#261;dzenia</string>
     <string name="user_profile_group_tab">Grupa</string>
@@ -620,6 +618,7 @@ Do grupy mo&#380;e do&#322;&#261;czy&#263; maksymalnie 500 os&#243;b.</string>
     <string name="delete_group_conversation_error">Wyst&#261;pi&#322; b&#322;&#261;d podczas usuwania rozmowy.</string>
     <string name="error_limit_number_assets_imported_exceeded">Mo&#380;esz przes&#322;a&#263; jednocze&#347;nie maksymalnie 20 plik&#243;w</string>
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Otw&#243;rz konwersacj&#281;</string>
     <string name="email_label">E-mail</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index baec64fcbf4..2d5d4b960c6 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -449,14 +449,12 @@ Até 500 pessoas podem participar de uma conversa em grupo.</string>
     <!-- User Profile -->
     <string name="user_profile_title">Perfil do usuário</string>
     <string name="user_profile_close_description">Fechar perfil do usuário</string>
-    <string name="user_profile_logout">Sair</string>
     <string name="user_profile_other_accs">Suas outras contas</string>
     <string name="user_profile_status_availability">Disponibilidade</string>
     <string name="user_profile_status_available">Disponível</string>
     <string name="user_profile_status_busy">Ocupado</string>
     <string name="user_profile_status_away">Ausente</string>
     <string name="user_profile_status_none">Nenhum</string>
-    <string name="user_profile_new_account_text">Nova equipe ou conta</string>
     <string name="user_profile_details_tab">Detalhes</string>
     <string name="user_profile_devices_tab">Dispositivos</string>
     <string name="user_profile_group_tab">Grupo</string>
@@ -684,6 +682,7 @@ Até 500 pessoas podem participar de uma conversa em grupo.</string>
     <!-- Archiving -->
     <string name="success_archiving_conversation">Conversa arquivada</string>
     <string name="dialog_archive_conversation_title">Arquivar conversa?</string>
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Abrir conversa</string>
     <string name="email_label">E-mail</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2474c1e8920..3ed7680d1d6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -40,6 +40,7 @@
     <string name="label_membership_external">Внешний</string>
     <string name="label_membership_service">Сервис</string>
     <string name="label_user_deleted">Удалено</string>
+    <string name="label_try_again">Повторить</string>
     <string name="label_message_sent_failure">Не удалось отправить сообщение из-за проблем с подключением.</string>
     <string name="label_message_edit_sent_failure">Не удалось изменить сообщение из-за проблем с подключением.</string>
     <string name="label_message_sent_remotely_failure">Сообщение не может быть отправлено, поскольку бэкэнд %s недоступен.</string>
@@ -196,6 +197,7 @@
     <string name="content_description_add_participants_search_field">Поиск по имени или псевдониму</string>
     <string name="content_description_add_participants_back_btn">Вернуться к просмотру добавления участников</string>
     <string name="content_description_home_profile_btn">Ваш профиль</string>
+    <string name="content_description_home_profile_btn_with_notification">Ваш профиль, одна непрочитанная подсказка.</string>
     <string name="content_description_open_label">открыть</string>
     <string name="content_description_join_call_label">присоединиться к вызову</string>
     <string name="content_description_share_label">поделиться</string>
@@ -208,15 +210,19 @@
     <string name="content_description_toggle_setting_label">переключить настройку</string>
     <string name="content_description_edit_guests_option_back_btn">Вернуться к сведениям о беседе</string>
     <string name="content_description_edit_self_delete_back_btn">Вернуться к сведениям о беседе</string>
+    <string name="content_description_accept_or_ignore_connection_label">принять или игнорировать запрос</string>
     <string name="content_description_open_user_profile_label">открыть профиль</string>
     <string name="content_description_open_conversation_label">открыть беседу</string>
     <string name="content_description_open_service_label">открыть сервис</string>
     <string name="content_description_change_it_label">изменить</string>
     <string name="content_description_open_link_label">открыть ссылку</string>
     <string name="content_description_alert">Оповещение</string>
+    <string name="content_description_drop_down">Раскрывающийся список</string>
     <string name="content_description_close_dropdown">закрыть раскрывающийся список</string>
     <string name="content_description_open_notification_settings_label">открыть настройки уведомлений</string>
-    <string name="content_description_new_conversation_name_back_btn">Вернуться к новому виду бесед</string>
+    <string name="content_description_new_conversation_close_btn">Закрыть просмотр новой беседы</string>
+    <string name="content_description_new_group_conversation_back_btn">Вернуться к просмотру новой беседы</string>
+    <string name="content_description_new_conversation_name_back_btn">Вернуться к просмотру новой беседы</string>
     <string name="content_description_new_conversation_name_field">Введите имя группы</string>
     <string name="content_description_new_conversation_options_heading">Настройки беседы</string>
     <string name="content_description_new_conversation_options_back_btn">Вернуться к созданию новой группы</string>
@@ -597,6 +603,7 @@
     <!-- Logout Wipe Data Dialog -->
     <string name="dialog_logout_wipe_data_title">Удалить данные?</string>
     <string name="dialog_logout_wipe_data_checkbox">Удалить всю личную информацию и беседы на этом устройстве</string>
+    <string name="dialog_logout_wipe_data_cancel_description">Отменить выход</string>
     <!-- User Profile status dialog-->
     <string name="user_profile_change_status_dialog_available_title">Установка статуса \'Доступен\'</string>
     <string name="user_profile_change_status_dialog_available_text">Для других пользователей будет отображаться статус \'Доступен\'. Вы будете получать уведомления о входящих вызовах и сообщениях в соответствии с настройками уведомлений в каждой беседе.</string>
@@ -610,6 +617,7 @@
     <!-- Conversations BottomSheet -->
     <string name="label_notifications">Уведомления</string>
     <string name="label_add_to_favourites">Добавить в избранное</string>
+    <string name="label_remove_from_favourites">Удалить из избранного</string>
     <string name="label_move_to_folder">Переместить в папку</string>
     <string name="label_move_to_archive">Переместить в архив</string>
     <string name="label_unarchive">Переместить из архива</string>
@@ -909,6 +917,11 @@
     <string name="dialog_archive_conversation_title">Архивировать беседу?</string>
     <string name="dialog_archive_conversation_description">Эта беседа перемещается в архив. Вы по-прежнему будете получать новые сообщения, файлы и звонки, но без уведомлений. Разархивировать беседу можно в любое время.</string>
     <string name="dialog_archive_conversation_option">Архивировать</string>
+    <!-- Favorite -->
+    <string name="success_adding_to_favorite">“%s” был добавлен в избранное</string>
+    <string name="success_removing_from_favorite">“%s” был удален из избранного</string>
+    <string name="error_adding_to_favorite">“%s” не удалось добавить в избранное</string>
+    <string name="error_removing_from_favorite">“%s” не может быть удален из избранного</string>
     <!-- Animation label -->
     <string name="label_open_conversation">Открыть беседу</string>
     <string name="label_start_conversation">Начать беседу</string>
@@ -1586,7 +1599,13 @@
     <string name="personal_to_team_migration_step_label">Шаг %1$d из 4</string>
     <string name="personal_to_team_migration_back_to_wire_button">Вернуться в Wire</string>
     <string name="personal_to_team_migration_back_button_label">Назад</string>
+    <string name="personal_to_team_migration_back_button_team_name_content_description">Вернуться к информации о команде</string>
+    <string name="personal_to_team_migration_back_button_confirmation_content_description">Вернуться к информации о названии команды</string>
     <string name="personal_to_team_migration_close_icon_content_description">Закрыть процесс миграции команды</string>
+    <string name="personal_to_team_migration_close_team_account_content_description">Закрыть информацию об аккаунте команды</string>
+    <string name="personal_to_team_migration_close_team_name_content_description">Закрыть просмотр информации о названии команды</string>
+    <string name="personal_to_team_migration_close_confirmation_content_description">Закрыть окно подтверждения</string>
+    <string name="personal_to_team_migration_close_team_created_content_description">Закрыть просмотр создания команды</string>
     <string name="personal_to_team_migration_team_plan_step">Аккаунт команды</string>
     <string name="personal_to_team_migration_team_plan_description">Трансформируйте свой персональный аккаунт в командный, чтобы получить больше пользы от совместной работы.</string>
     <string name="personal_to_team_migration_team_plan_admin_console_label">Консоль администратора:</string>
@@ -1619,4 +1638,9 @@
     <string name="personal_to_team_migration_confirm_leave_dialog_description">Если вы выйдете, информация не сохранится и вам придется заново создавать команду.</string>
     <string name="personal_to_team_migration_confirm_leave_dialog_continue_button">Продолжить создание команды</string>
     <string name="personal_to_team_migration_confirm_leave_dialog_leave_button">Выйти без сохранения</string>
+    <string name="personal_to_team_migration_error_title">Команда не создана</string>
+    <string name="personal_to_team_migration_error_title_already_in_team">Уже в команде</string>
+    <string name="personal_to_team_migration_error_message_already_in_team">Вы создали или присоединились к команде с этим email на другом устройстве.</string>
+    <string name="personal_to_team_migration_error_message_slow_network">Wire не удалось завершить создание вашей команды из-за медленного интернет-соединения.</string>
+    <string name="personal_to_team_migration_error_message_unknown_error">Wire не удалось завершить создание вашей команды из-за неизвестной ошибки.</string>
 </resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 40a0a32a4c2..ef91c27c0aa 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -466,14 +466,12 @@
     <!-- User Profile -->
     <string name="user_profile_title">පරිශ්‍රීලක පැතිකඩ</string>
     <string name="user_profile_close_description">පරිශ්‍රීලක පැතිකඩ වසන්න</string>
-    <string name="user_profile_logout">නික්මෙන්න</string>
     <string name="user_profile_other_accs">ඔබගේ වෙනත් ගිණුම්</string>
     <string name="user_profile_status_availability">තත්‍වය</string>
     <string name="user_profile_status_available">සිටිනවා</string>
     <string name="user_profile_status_busy">කාර්යබහුලයි</string>
     <string name="user_profile_status_away">නොසිටියි</string>
     <string name="user_profile_status_none">කිසිවක් නැත</string>
-    <string name="user_profile_new_account_text">නව කණ්ඩායමක් හෝ ගිණුමක්</string>
     <string name="user_profile_details_tab">විස්තර</string>
     <string name="user_profile_devices_tab">උපාංග</string>
     <string name="user_profile_group_tab">සමූහය</string>
@@ -752,6 +750,7 @@
     <string name="dialog_archive_conversation_title">සංවාදය සංරක්‍ෂණය කරන්නද?</string>
     <string name="dialog_archive_conversation_description">මෙම සංවාදය ඔබගේ සංරක්‍ෂිතය වෙත ගෙන යයි. ඔබට තවදුරටත් නව පණිවිඩ, ගොනු සහ ඇමතුම් ලැබේ, නමුත් දැනුම්දීම් නොලැබේ. ඔබට ඕනෑම වේලාවක සංවාදය අසංරක්‍ෂණයට හැකිය.</string>
     <string name="dialog_archive_conversation_option">සංරක්‍ෂණය</string>
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">සංවාදය අරින්න</string>
     <string name="label_start_conversation">සංවාදය අරඹන්න</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index c5a259e0370..116cfe801e2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -330,14 +330,12 @@
     <!-- User Profile -->
     <string name="user_profile_title">Användarprofil</string>
     <string name="user_profile_close_description">Stäng ner användarprofil</string>
-    <string name="user_profile_logout">Logga ut</string>
     <string name="user_profile_other_accs">Dina andra konton</string>
     <string name="user_profile_status_availability">Tillgänglighet</string>
     <string name="user_profile_status_available">Tillgänglig</string>
     <string name="user_profile_status_busy">Upptagen</string>
     <string name="user_profile_status_away">Borta</string>
     <string name="user_profile_status_none">Ingen</string>
-    <string name="user_profile_new_account_text">Nytt team eller konto</string>
     <string name="user_profile_details_tab">Detaljer</string>
     <string name="user_profile_devices_tab">Enheter</string>
     <string name="user_profile_group_tab">Grupp</string>
@@ -455,6 +453,7 @@
     <string name="error_no_network_message">Kontrollera din internetanslutning och försök igen</string>
     <string name="left_conversation_group_success">Du har lämnat konversationen.</string>
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="email_label">E-postadress</string>
     <string name="phone_label">Telefon</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2b34d6d646b..a52f8f0473d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -276,6 +276,7 @@ Yedek dosyayı korumak için güçlü bir şifre seçin.</string>
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <string name="label_open_conversation">Sohbeti aç</string>
     <!-- Notifications -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 31e5dc0dd5b..4e1aa7fa83e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -138,6 +138,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 7aee44473b6..b82b0cb52cd 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -60,6 +60,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index fca60cc513a..63b4c2fe6bd 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -58,6 +58,7 @@
     <!-- Search Contact-->
     <!-- Snackbar messages -->
     <!-- Archiving -->
+    <!-- Favorite -->
     <!-- Animation label -->
     <!-- Notifications -->
     <!-- Calling-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9309f671a99..a2505de3c77 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -594,7 +594,7 @@
     <!-- User Profile -->
     <string name="user_profile_title">User Profile</string>
     <string name="user_profile_close_description">Close User profile</string>
-    <string name="user_profile_logout">Logout</string>
+    <string name="user_profile_logout">Log out</string>
     <string name="user_profile_other_accs">Your Other Accounts</string>
     <string name="user_profile_status_availability">Availability</string>
     <string name="user_profile_status_available">Available</string>
diff --git a/core/ui-common/src/main/res/values-de/strings.xml b/core/ui-common/src/main/res/values-de/strings.xml
index e54c2b3c133..5445a439673 100644
--- a/core/ui-common/src/main/res/values-de/strings.xml
+++ b/core/ui-common/src/main/res/values-de/strings.xml
@@ -19,6 +19,8 @@
 <resources>
     <string name="label_wait_until_synchronised">Bitte warten Sie, bis die App synchronisiert ist</string>
     <string name="label_wait_until_connected">Bitte warten Sie, bis die Internetverbindung wiederhergestellt ist</string>
+    <string name="content_description_left_arrow">Zurück</string>
+    <string name="content_description_close">Schließen</string>
     <string name="content_description_menu_button">Hauptnavigation</string>
     <string name="content_description_pending_connection_badge">Ausstehende Genehmigung der Kontaktanfrage</string>
 </resources>
diff --git a/core/ui-common/src/main/res/values-ru/strings.xml b/core/ui-common/src/main/res/values-ru/strings.xml
index d255d640257..843c3521da7 100644
--- a/core/ui-common/src/main/res/values-ru/strings.xml
+++ b/core/ui-common/src/main/res/values-ru/strings.xml
@@ -20,7 +20,9 @@
     <string name="label_wait_until_synchronised">Пожалуйста, подождите, пока приложение синхронизируется</string>
     <string name="label_wait_until_connected">Пожалуйста, подождите, пока будет восстановлено подключение к интернету</string>
     <string name="content_description_back_button">Кнопка назад</string>
+    <string name="content_description_left_arrow">Назад</string>
     <string name="content_description_close_button">Кнопка закрыть</string>
+    <string name="content_description_close">Закрыть</string>
     <string name="content_description_menu_button">Основное меню</string>
     <string name="content_description_drop_down_icon">Курсор вниз</string>
     <string name="content_description_pending_connection_badge">ожидание подтверждения запроса</string>