From 72e9371fa30a1de4c0f8963176f0e4d16f8a1632 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 17 Jun 2026 10:04:24 +0200
Subject: [PATCH] Custom recovery key: import strings from Localazy

---
 enterprise                                    |  2 +-
 .../impl/src/main/res/values/localazy.xml     | 18 +++++++++++++
 .../impl/src/main/res/values/temporary.xml    | 26 -------------------
 tools/localazy/config.json                    |  1 +
 4 files changed, 20 insertions(+), 27 deletions(-)
 delete mode 100644 features/securebackup/impl/src/main/res/values/temporary.xml

diff --git a/enterprise b/enterprise
index 3e04d8aa06..0a17f4b5c9 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit 3e04d8aa069904e5c21384edf651ee76c13ab0c0
+Subproject commit 0a17f4b5c9b5d7bc450eae6f1c4c082b37bca36e
diff --git a/features/securebackup/impl/src/main/res/values/localazy.xml b/features/securebackup/impl/src/main/res/values/localazy.xml
index e0fc2d37e7..65266060a1 100644
--- a/features/securebackup/impl/src/main/res/values/localazy.xml
+++ b/features/securebackup/impl/src/main/res/values/localazy.xml
@@ -20,6 +20,24 @@
   <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_custom_recovery_key_confirm_error_mismatch">"The recovery key you entered doesn\'t match"</string>
+  <string name="screen_custom_recovery_key_confirm_submit">"Finish setup"</string>
+  <string name="screen_custom_recovery_key_confirm_subtitle">"Enter your recovery key again."</string>
+  <string name="screen_custom_recovery_key_confirm_title">"Confirm your recovery key"</string>
+  <string name="screen_custom_recovery_key_input_notice">"Minimum %1$s characters. Do not use your account password"</string>
+  <string name="screen_custom_recovery_key_input_strength">"Strength"</string>
+  <string name="screen_custom_recovery_key_input_strength_a11y">"Passphrase strength: %1$s"</string>
+  <string name="screen_custom_recovery_key_input_strength_moderate">"Moderate"</string>
+  <string name="screen_custom_recovery_key_input_strength_strong">"Strong"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_strong">"Very strong"</string>
+  <string name="screen_custom_recovery_key_input_strength_very_weak">"Very weak"</string>
+  <string name="screen_custom_recovery_key_input_strength_weak">"Weak"</string>
+  <string name="screen_custom_recovery_key_input_subtitle">"Choose a recovery key that you can memorize."</string>
+  <string name="screen_custom_recovery_key_input_title">"Enter a recovery key"</string>
+  <string name="screen_custom_recovery_key_loading_a11y">"Loading recovery key requirements"</string>
+  <string name="screen_custom_recovery_key_success_notice">"To change your recovery key, go to Settings → Encryption → Backup"</string>
+  <string name="screen_custom_recovery_key_success_subtitle">"You can use your recovery key to confirm new devices or restore your encrypted chats if you lose access to all your devices."</string>
+  <string name="screen_custom_recovery_key_success_title">"Your backup is now fully set up"</string>
   <string name="screen_encryption_reset_action_continue_reset">"Continue reset"</string>
   <string name="screen_encryption_reset_bullet_1">"Your account details, contacts, preferences, and chat list will be kept"</string>
   <string name="screen_encryption_reset_bullet_2">"You will lose any message history that’s stored only on the server"</string>
diff --git a/features/securebackup/impl/src/main/res/values/temporary.xml b/features/securebackup/impl/src/main/res/values/temporary.xml
deleted file mode 100644
index 7bac07c172..0000000000
--- a/features/securebackup/impl/src/main/res/values/temporary.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2026 Element Creations Ltd.
-  ~
-  ~ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
-  ~ Please see LICENSE files in the repository root for full details.
-  -->
-<resources>
-    <string name="pro_screen_recovery_key_mode_input_title">Enter a recovery key</string>
-    <string name="pro_screen_recovery_key_mode_input_description">Choose a recovery key that you can memorize.</string>
-    <string name="pro_screen_recovery_key_mode_confirm_title">Confirm your recovery key</string>
-    <string name="pro_screen_recovery_key_mode_confirm_description">Enter your recovery key again.</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_field_footer">Minimum %1$s characters. Do not use your account password</string>
-    <string name="pro_screen_recovery_key_mode_confirm_finish_button">Finish setup</string>
-    <string name="pro_screen_recovery_key_mode_success_title">Your backup is now fully set up</string>
-    <string name="pro_screen_recovery_key_mode_success_description">You can use your recovery key to confirm new devices or restore your encrypted chats if you lose access to all your devices.</string>
-    <string name="pro_screen_recovery_key_mode_success_settings_hint">To change your recovery key, go to Settings → Encryption → Backup</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_base">Strength</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_very_weak">Very weak</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_weak">Weak</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_moderate">Moderate</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_strong">Strong</string>
-    <string name="pro_screen_recovery_key_mode_input_passphrase_strength_label_very_strong">Very strong</string>
-    <string name="pro_screen_recovery_key_mode_custom_mismatch">The recovery key you entered doesn\'t match</string>
-    <string name="a11y_recovery_key_custom_strength_announcement">Passphrase strength: %1$s</string>
-    <string name="a11y_recovery_key_loading_specs">Loading recovery key requirements</string>
-</resources>
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 6ea495439e..e125ffbe6f 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -315,6 +315,7 @@
         "screen_chat_backup_.*",
         "screen_key_backup_disable_.*",
         "screen_recovery_key_.*",
+        "screen\\.custom_recovery_key\\..*",
         "screen_create_new_recovery_key_.*",
         "screen_encryption_reset.*",
         "screen_reset_encryption.*",