Improve session recovery screens (#2657)

* Improve enter recovery key screen UI

* Add instructions to reset the encryption of the logged in account.

* Update screenshots

* Fix maestro flow

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt

@@ -30,6 +30,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
+import io.element.android.features.securebackup.impl.createkey.CreateNewRecoveryKeyNode
 import io.element.android.features.securebackup.impl.disable.SecureBackupDisableNode
 import io.element.android.features.securebackup.impl.enable.SecureBackupEnableNode
 import io.element.android.features.securebackup.impl.enter.SecureBackupEnterRecoveryKeyNode
@@ -50,6 +51,7 @@ class SecureBackupFlowNode @AssistedInject constructor(
         initialElement = when (plugins.filterIsInstance(SecureBackupEntryPoint.Params::class.java).first().initialElement) {
             SecureBackupEntryPoint.InitialTarget.Root -> NavTarget.Root
             SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey -> NavTarget.EnterRecoveryKey
+            SecureBackupEntryPoint.InitialTarget.CreateNewRecoveryKey -> NavTarget.CreateNewRecoveryKey
         },
         savedStateMap = buildContext.savedStateMap,
     ),
@@ -74,6 +76,9 @@ class SecureBackupFlowNode @AssistedInject constructor(
 
         @Parcelize
         data object EnterRecoveryKey : NavTarget
+
+        @Parcelize
+        data object CreateNewRecoveryKey : NavTarget
     }
 
     private val callback = plugins<SecureBackupEntryPoint.Callback>().firstOrNull()
@@ -134,6 +139,9 @@ class SecureBackupFlowNode @AssistedInject constructor(
                 }
                 createNode<SecureBackupEnterRecoveryKeyNode>(buildContext, plugins = listOf(callback))
             }
+            NavTarget.CreateNewRecoveryKey -> {
+                createNode<CreateNewRecoveryKeyNode>(buildContext)
+            }
         }
     }
 

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.securebackup.impl.createkey
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.core.plugin.Plugin
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.anvilannotations.ContributesNode
+import io.element.android.libraries.di.SessionScope
+
+@ContributesNode(SessionScope::class)
+class CreateNewRecoveryKeyNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+) : Node(buildContext, plugins = plugins) {
+    @Composable
+    override fun View(modifier: Modifier) {
+        CreateNewRecoveryKeyView(
+            modifier = modifier,
+            onBackClicked = ::navigateUp,
+        )
+    }
+}

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt

@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.securebackup.impl.createkey
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.features.securebackup.impl.R
+import io.element.android.libraries.designsystem.components.BigIcon
+import io.element.android.libraries.designsystem.components.PageTitle
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.modifiers.squareSize
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CreateNewRecoveryKeyView(
+    onBackClicked: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Scaffold(
+        modifier = modifier,
+        topBar = {
+            TopAppBar(title = {}, navigationIcon = { BackButton(onClick = onBackClicked) })
+        }
+    ) { padding ->
+        Column(
+            modifier = Modifier.padding(padding)
+        ) {
+            PageTitle(
+                modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 40.dp),
+                title = stringResource(R.string.screen_create_new_recovery_key_title),
+                iconStyle = BigIcon.Style.Default(CompoundIcons.Computer())
+            )
+            Content()
+        }
+    }
+}
+
+@Composable
+private fun Content() {
+    Column(modifier = Modifier.padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(24.dp)) {
+        Item(index = 1, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_1)))
+        Item(index = 2, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_2)))
+        Item(
+            index = 3,
+            text = buildAnnotatedString {
+                val resetAllAction = stringResource(R.string.screen_create_new_recovery_key_list_item_3_reset_all)
+                val text = stringResource(R.string.screen_create_new_recovery_key_list_item_3, resetAllAction)
+                append(text)
+                val start = text.indexOf(resetAllAction)
+                val end = start + resetAllAction.length
+                if (start in text.indices && end in text.indices) {
+                    addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
+                }
+            }
+        )
+        Item(index = 4, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_4)))
+        Item(index = 5, text = AnnotatedString(stringResource(R.string.screen_create_new_recovery_key_list_item_5)))
+    }
+}
+
+@Composable
+private fun Item(index: Int, text: AnnotatedString) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+        ItemNumber(index = index)
+        Text(text = text, style = ElementTheme.typography.fontBodyMdRegular, color = ElementTheme.colors.textPrimary)
+    }
+}
+
+@Composable
+private fun ItemNumber(
+    index: Int,
+) {
+    val color = ElementTheme.colors.textPlaceholder
+    Box(
+        modifier = Modifier
+            .border(1.dp, color, CircleShape)
+            .squareSize()
+    ) {
+        Text(
+            modifier = Modifier.padding(1.5.dp),
+            text = index.toString(),
+            style = ElementTheme.typography.fontBodySmRegular,
+            color = color,
+            textAlign = TextAlign.Center,
+        )
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun CreateNewRecoveryKeyViewPreview() {
+    ElementPreview {
+        CreateNewRecoveryKeyView(
+            onBackClicked = {},
+        )
+    }
+}

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt

@@ -83,7 +83,7 @@ private fun ColumnScope.Buttons(
     state: SecureBackupEnterRecoveryKeyState,
 ) {
     Button(
-        text = stringResource(id = CommonStrings.action_confirm),
+        text = stringResource(id = CommonStrings.action_continue),
         enabled = state.isSubmitEnabled,
         showProgress = state.submitAction.isLoading(),
         modifier = Modifier.fillMaxWidth(),

features/securebackup/impl/src/main/res/values-be/translations.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Ваша рэзервовая копія чата зараз не сінхранізавана."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Наладзьце аднаўленне"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Атрымайце доступ да зашыфраваных паведамленняў, калі вы страціце ўсе свае прылады або выйдзеце з сістэмы %1$s усюды."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Адкрыйце Element на настольнай прыладзе"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Увайдзіце ў свой уліковы запіс яшчэ раз"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Калі будзе прапанавана пацвердзіць вашу прыладу, выберыце %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Скінуць усе”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Выконвайце інструкцыі, каб стварыць новы ключ аднаўлення"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Захавайце новы ключ аднаўлення ў ме́неджэры пароляў або ў зашыфраванай нататке"</string>
+  <string name="screen_create_new_recovery_key_title">"Скіньце шыфраванне для вашага ўліковага запісу з дапамогай іншай прылады"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Адключыць"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Вы страціце зашыфраваныя паведамленні, калі выйдзеце з усіх прылад."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Вы ўпэўнены, што хочаце адключыць рэзервовае капіраванне?"</string>
@@ -25,7 +32,7 @@
   <string name="screen_recovery_key_confirm_description">"Пераканайцеся, што ніхто не бачыць гэты экран!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Паўтарыце спробу, каб пацвердзіць доступ да рэзервовай копіі чата."</string>
   <string name="screen_recovery_key_confirm_error_title">"Няправільны ключ аднаўлення"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Калі ў вас ёсць ключ аднаўлення або парольная фраза/ключ, гэта таксама будзе працаваць."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Калі ў вас ёсць ключ аднаўлення або парольная фраза, гэта таксама будзе працаваць."</string>
   <string name="screen_recovery_key_confirm_key_label">"Ключ аднаўлення або код доступу"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Увесці…"</string>
   <string name="screen_recovery_key_confirm_success">"Ключ аднаўлення пацверджаны"</string>

features/securebackup/impl/src/main/res/values-cs/translations.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaše záloha chatu není aktuálně synchronizována."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Nastavení obnovy"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Získejte přístup ke svým zašifrovaným zprávám, pokud ztratíte všechna zařízení nebo jste všude odhlášeni z %1$s."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Otevřít Element na stolním počítači"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Znovu se přihlaste ke svému účtu"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Když budete vyzváni k ověření vašeho zařízení, vyberte %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"\"Resetovat vše\""</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Postupujte podle pokynů k vytvoření nového obnovovacího klíče"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Uložte nový klíč pro obnovení do správce hesel nebo do zašifrované poznámky"</string>
+  <string name="screen_create_new_recovery_key_title">"Obnovte šifrování účtu pomocí jiného zařízení"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Vypnout"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Pokud se odhlásíte ze všech zařízení, přijdete o zašifrované zprávy."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Opravdu chcete vypnout zálohování?"</string>
@@ -25,7 +32,7 @@
   <string name="screen_recovery_key_confirm_description">"Ujistěte se, že tuto obrazovku nikdo nevidí!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Zkuste prosím znovu potvrdit přístup k záloze chatu."</string>
   <string name="screen_recovery_key_confirm_error_title">"Nesprávný klíč pro obnovení"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Pokud máte frázi pro obnovení nebo tajnou přístupovou frázi/klíč, bude to fungovat také."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Pokud máte bezpečnostní klíč nebo bezpečnostní frázi, bude to fungovat také."</string>
   <string name="screen_recovery_key_confirm_key_label">"Klíč pro obnovení nebo přístupový kód"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Zadejte…"</string>
   <string name="screen_recovery_key_confirm_success">"Klíč pro obnovení potvrzen"</string>

features/securebackup/impl/src/main/res/values-de/translations.xml

@@ -9,6 +9,26 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Dein Chat-Backup ist derzeit nicht synchronisiert."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Wiederherstellung einrichten"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Erhalte Zugriff auf deine verschlüsselten Nachrichten, wenn du alle deine Geräte verlierst oder von %1$s überall abgemeldet bist."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">
+    "Öffne "
+    <b>"Element"</b>
+    " auf einem "
+    <b>"Desktop-Gerät"</b>
+  </string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Melde dich erneut bei deinem Konto an"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Wenn du aufgefordert wirst dein Gerät zu verifizieren, wähle \"%1$s\"."</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"Alles zurücksetzen"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Folge den Anweisungen, um einen neuen Wiederherstellungsschlüssel zu erstellen"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">
+    "Speichere deinen neuen "
+    <b>"Wiederherstellungsschlüssel"</b>
+    " in einem Passwortmanager oder einer verschlüsselten Notiz"
+  </string>
+  <string name="screen_create_new_recovery_key_title">
+    "Erstelle einen neuen "
+    <b>"Wiederherstellungsschlüssel"</b>
+    " mit einem anderen Gerät"
+  </string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Ausschalten"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Du verlierst deine verschlüsselten Nachrichten, wenn du auf allen Geräten abgemeldet bist."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Bist du sicher, dass du das Backup ausschalten willst?"</string>
@@ -29,7 +49,7 @@
   <string name="screen_recovery_key_confirm_description">"Sorge dafür, dass niemand diesen Bildschirm sehen kann!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Bitte versuche es noch einmal, um den Zugriff auf dein Chat-Backup zu bestätigen."</string>
   <string name="screen_recovery_key_confirm_error_title">"Falscher Wiederherstellungsschlüssel"</string>
-  <string name="screen_recovery_key_confirm_key_description">"Dies funktioniert auch mit einer Wiederherstellungspassphrase oder einer geheime Passphrase/einem geheimen Schlüssel."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Dies funktioniert auch mit einem Sicherheitsschlüssel oder Sicherheitsphrase."</string>
   <string name="screen_recovery_key_confirm_key_label">
     <b>"Wiederherstellungsschlüssel"</b>
     " oder Passcode"

features/securebackup/impl/src/main/res/values-hu/translations.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"A csevegéselőzményei nincsenek szinkronban."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Helyreállítás beállítása"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Szerezzen hozzáférést a titkosított üzeneteihez, ha elvesztette az összes eszközét, vagy ha mindenütt kijelentkezett az %1$sből."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Nyissa meg az Elementet egy asztali eszközön"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Jelentkezzen be újra a fiókjába"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Amikor az eszköz ellenőrzését kéri, válassza ezt a lehetőséget: %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"„Minden visszaállítása”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Kövesse az utasításokat egy új helyreállítási kulcs létrehozásához"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Mentse az új helyreállítási kulcsot egy jelszókezelőbe vagy egy titkosított jegyzetbe."</string>
+  <string name="screen_create_new_recovery_key_title">"A fiók titkosításának visszaállítása egy másik eszköz használatával"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Kikapcsolás"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Ha kijelentkezik az összes eszközéről, akkor elveszti a titkosított üzeneteit."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Biztos, hogy kikapcsolja a biztonsági mentéseket?"</string>

features/securebackup/impl/src/main/res/values-in/translations.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Pencadangan percakapan Anda saat ini tidak tersinkron."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Siapkan pemulihan"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Dapatkan akses ke pesan terenkripsi Anda jika Anda kehilangan semua perangkat Anda atau keluar dari %1$s di mana pun."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Buka Element di perangkat desktop"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Masuk ke akun Anda lagi"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Saat diminta untuk memverifikasi perangkat Anda, pilih %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Atur ulang semua”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Ikuti petunjuk untuk membuat kunci pemulihan baru"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Simpan kunci pemulihan baru Anda dalam pengelola kata sandi atau catatan terenkripsi"</string>
+  <string name="screen_create_new_recovery_key_title">"Atur ulang enkripsi untuk akun Anda menggunakan perangkat lain"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Matikan"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Anda akan kehilangan pesan terenkripsi jika Anda keluar dari semua perangkat."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Apakah Anda yakin ingin mematikan pencadangan?"</string>

features/securebackup/impl/src/main/res/values-ru/translations.xml

@@ -15,6 +15,17 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Резервная копия чата в настоящее время не синхронизирована."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Настроить восстановление"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Получите доступ к зашифрованным сообщениям, если вы потеряете все свои устройства или выйдете из системы %1$s отовсюду."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Откройте Element на настольном устройстве"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Войдите в свой аккаунт еще раз"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Когда вас попросят подтвердить устройство, выберите %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Сбросить все”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Следуйте инструкциям, чтобы создать новый ключ восстановления"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">
+    "Сохраните новый "
+    <b>"ключ восстановления"</b>
+    " в менеджере паролей или зашифрованной заметке"
+  </string>
+  <string name="screen_create_new_recovery_key_title">"Сбросьте шифрование вашей учетной записи с помощью другого устройства."</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Выключить"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Вы потеряете зашифрованные сообщения, если выйдете из всех устройств."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Вы действительно хотите отключить резервное копирование?"</string>
@@ -43,7 +54,7 @@
     "Неверный "
     <b>"ключ восстановления"</b>
   </string>
-  <string name="screen_recovery_key_confirm_key_description">"Если у вас есть пароль для восстановления или секретная пароль/ключ, это тоже сработает."</string>
+  <string name="screen_recovery_key_confirm_key_description">"Если у вас есть пароль для восстановления или секретный пароль/ключ, это тоже сработает."</string>
   <string name="screen_recovery_key_confirm_key_label">
     <b>"Ключ восстановления"</b>
     " или пароль"

features/securebackup/impl/src/main/res/values-sk/translations.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Vaša záloha konverzácie nie je momentálne synchronizovaná."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Nastaviť obnovovanie"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Získajte prístup k vašim šifrovaným správam aj keď stratíte všetky svoje zariadenia alebo sa odhlásite zo všetkých %1$s zariadení."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Otvoriť Element v stolnom počítači"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Znova sa prihláste do svojho účtu"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Keď sa zobrazí výzva na overenie vášho zariadenia, vyberte %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"\"Obnoviť všetko\""</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Postupujte podľa pokynov na vytvorenie nového kľúča na obnovenie"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Uložte si nový kľúč na obnovenie do správcu hesiel alebo do zašifrovanej poznámky"</string>
+  <string name="screen_create_new_recovery_key_title">"Obnovte šifrovanie vášho účtu pomocou iného zariadenia"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Vypnúť"</string>
   <string name="screen_key_backup_disable_confirmation_description">"Stratíte prístup k svojim zašifrovaným správam, ak sa odhlásite zo všetkých zariadení"</string>
   <string name="screen_key_backup_disable_confirmation_title">"Ste si istí, že chcete vypnúť zálohovanie?"</string>

features/securebackup/impl/src/main/res/values/localazy.xml

@@ -9,6 +9,13 @@
   <string name="screen_chat_backup_recovery_action_confirm_description">"Your chat backup is currently out of sync."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Set up recovery"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Get access to your encrypted messages if you lose all your devices or are signed out of %1$s everywhere."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Open Element in a desktop device"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Sign into your account again"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"When asked to verify your device, select %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Reset all”"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Follow the instructions to create a new recovery key"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Save your new recovery key in a password manager or encrypted note"</string>
+  <string name="screen_create_new_recovery_key_title">"Reset the encryption for your account using another device"</string>
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"Turn off"</string>
   <string name="screen_key_backup_disable_confirmation_description">"You will lose your encrypted messages if you are signed out of all devices."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Are you sure you want to turn off backup?"</string>
@@ -25,7 +32,7 @@
   <string name="screen_recovery_key_confirm_description">"Make sure nobody can see this screen!"</string>
   <string name="screen_recovery_key_confirm_error_content">"Please try again to confirm access to your chat backup."</string>
   <string name="screen_recovery_key_confirm_error_title">"Incorrect recovery key"</string>
-  <string name="screen_recovery_key_confirm_key_description">"If you have a recovery passphrase or secret passphrase/key, this will work too."</string>
+  <string name="screen_recovery_key_confirm_key_description">"If you have a security key or security phrase, this will work too."</string>
   <string name="screen_recovery_key_confirm_key_label">"Recovery key or passcode"</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Enter…"</string>
   <string name="screen_recovery_key_confirm_success">"Recovery key confirmed"</string>