From 65b405a696c8807f2930805b8321a1a4270378c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ioan=20Biz=C4=83u?= Date: Tue, 15 Apr 2025 11:20:19 +0200 Subject: [PATCH] chore(delizia): tweak share confirmation copy --- core/embed/rust/librust_qstr.h | 2 +- .../src/translations/generated/translated_string.rs | 6 +++--- core/mocks/trezortranslate_keys.pyi | 2 +- core/src/trezor/ui/layouts/delizia/reset.py | 12 ++++++------ core/translations/cs.json | 1 - core/translations/de.json | 1 - core/translations/en.json | 2 +- core/translations/es.json | 1 - core/translations/fr.json | 1 - core/translations/it.json | 1 - core/translations/order.json | 3 ++- core/translations/pt.json | 1 - core/translations/signatures.json | 6 +++--- 13 files changed, 17 insertions(+), 22 deletions(-) diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h index 986cc45ada..dd17510d6c 100644 --- a/core/embed/rust/librust_qstr.h +++ b/core/embed/rust/librust_qstr.h @@ -304,7 +304,6 @@ static void _librust_qstrs(void) { MP_QSTR_instructions__hold_to_exit_tutorial; MP_QSTR_instructions__hold_to_sign; MP_QSTR_instructions__learn_more; - MP_QSTR_instructions__shares_continue_with_x_template; MP_QSTR_instructions__shares_start_with_1; MP_QSTR_instructions__swipe_down; MP_QSTR_instructions__swipe_horizontally; @@ -524,6 +523,7 @@ static void _librust_qstrs(void) { MP_QSTR_reset__needed_to_form_a_group; MP_QSTR_reset__needed_to_recover_your_wallet; MP_QSTR_reset__never_make_digital_copy; + MP_QSTR_reset__next_share; MP_QSTR_reset__num_of_share_holders_template; MP_QSTR_reset__num_of_shares_advanced_info_template; MP_QSTR_reset__num_of_shares_basic_info_template; diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index 0e73173e6f..f2d28be4fe 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -1284,7 +1284,6 @@ pub enum TranslatedString { instructions__hold_to_continue = 890, // "Hold to continue" instructions__hold_to_exit_tutorial = 891, // "Hold to exit tutorial" instructions__learn_more = 893, // "Learn more" - instructions__shares_continue_with_x_template = 894, // "Continue with Share #{0}" instructions__shares_start_with_1 = 895, // "Start with share #1" instructions__tap_to_start = 896, // "Tap to start" passphrase__title_passphrase = 897, // "Passphrase" @@ -1407,6 +1406,7 @@ pub enum TranslatedString { ble__unpair_all = 993, // "Unpair all bluetooth devices" ble__unpair_current = 994, // "Unpair connected device" ble__unpair_title = 995, // "Unpair" + reset__next_share = 996, // "Next share" } impl TranslatedString { @@ -2687,7 +2687,6 @@ impl TranslatedString { Self::instructions__hold_to_continue => "Hold to continue", Self::instructions__hold_to_exit_tutorial => "Hold to exit tutorial", Self::instructions__learn_more => "Learn more", - Self::instructions__shares_continue_with_x_template => "Continue with Share #{0}", Self::instructions__shares_start_with_1 => "Start with share #1", Self::instructions__tap_to_start => "Tap to start", Self::passphrase__title_passphrase => "Passphrase", @@ -2810,6 +2809,7 @@ impl TranslatedString { Self::ble__unpair_all => "Unpair all bluetooth devices", Self::ble__unpair_current => "Unpair connected device", Self::ble__unpair_title => "Unpair", + Self::reset__next_share => "Next share", } } @@ -4089,7 +4089,6 @@ impl TranslatedString { Qstr::MP_QSTR_instructions__hold_to_continue => Some(Self::instructions__hold_to_continue), Qstr::MP_QSTR_instructions__hold_to_exit_tutorial => Some(Self::instructions__hold_to_exit_tutorial), Qstr::MP_QSTR_instructions__learn_more => Some(Self::instructions__learn_more), - Qstr::MP_QSTR_instructions__shares_continue_with_x_template => Some(Self::instructions__shares_continue_with_x_template), Qstr::MP_QSTR_instructions__shares_start_with_1 => Some(Self::instructions__shares_start_with_1), Qstr::MP_QSTR_instructions__tap_to_start => Some(Self::instructions__tap_to_start), Qstr::MP_QSTR_passphrase__title_passphrase => Some(Self::passphrase__title_passphrase), @@ -4212,6 +4211,7 @@ impl TranslatedString { Qstr::MP_QSTR_ble__unpair_all => Some(Self::ble__unpair_all), Qstr::MP_QSTR_ble__unpair_current => Some(Self::ble__unpair_current), Qstr::MP_QSTR_ble__unpair_title => Some(Self::ble__unpair_title), + Qstr::MP_QSTR_reset__next_share => Some(Self::reset__next_share), _ => None, } } diff --git a/core/mocks/trezortranslate_keys.pyi b/core/mocks/trezortranslate_keys.pyi index 24b3f60335..861c1a0d8f 100644 --- a/core/mocks/trezortranslate_keys.pyi +++ b/core/mocks/trezortranslate_keys.pyi @@ -397,7 +397,6 @@ class TR: instructions__hold_to_exit_tutorial: str = "Hold to exit tutorial" instructions__hold_to_sign: str = "Hold to sign" instructions__learn_more: str = "Learn more" - instructions__shares_continue_with_x_template: str = "Continue with Share #{0}" instructions__shares_start_with_1: str = "Start with share #1" instructions__swipe_down: str = "Swipe down" instructions__swipe_horizontally: str = "Swipe horizontally" @@ -648,6 +647,7 @@ class TR: reset__needed_to_form_a_group: str = "needed to form a group. " reset__needed_to_recover_your_wallet: str = "needed to recover your wallet. " reset__never_make_digital_copy: str = "Never put your backup anywhere digital." + reset__next_share: str = "Next share" reset__num_of_share_holders_template: str = "{0} people or locations will each hold one share." reset__num_of_shares_advanced_info_template: str = "Each recovery share is a sequence of {0} words. Next you will choose the threshold number of shares needed to form Group {1}." reset__num_of_shares_basic_info_template: str = "Each recovery share is a sequence of {0} words. Next you will choose how many shares you need to recover your wallet." diff --git a/core/src/trezor/ui/layouts/delizia/reset.py b/core/src/trezor/ui/layouts/delizia/reset.py index ec65910b6d..924d1f4f3c 100644 --- a/core/src/trezor/ui/layouts/delizia/reset.py +++ b/core/src/trezor/ui/layouts/delizia/reset.py @@ -351,26 +351,26 @@ async def show_share_confirmation_success( # TODO: super-shamir copy not done if share_index == num_of_shares - 1: - title = TR.reset__share_completed_template.format(share_index + 1) + footer_description = TR.reset__share_completed_template.format(share_index + 1) if group_index is None: - footer_description = "" + title = "" else: - footer_description = TR.reset__finished_verifying_group_template.format( + title = TR.reset__finished_verifying_group_template.format( group_index + 1 ) else: if group_index is None: title = TR.reset__share_completed_template.format(share_index + 1) footer_description = ( - TR.instructions__shares_continue_with_x_template.format(share_index + 2) + TR.reset__continue_with_share_template.format(share_index + 2) ) else: - title = TR.reset__continue_with_next_share - footer_description = ( + title = ( TR.reset__group_share_checked_successfully_template.format( group_index + 1, share_index + 1 ) ) + footer_description = TR.reset__next_share await show_success("success_share_confirm", title, subheader=footer_description) diff --git a/core/translations/cs.json b/core/translations/cs.json index 3d3ffdf5de..aaf9373cb9 100644 --- a/core/translations/cs.json +++ b/core/translations/cs.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Podržením ukončíte tutoriál", "instructions__hold_to_sign": "Podržením podepíšete", "instructions__learn_more": "Zjistit více", - "instructions__shares_continue_with_x_template": "Pokračujte částí č. {0}", "instructions__shares_start_with_1": "Začněte částí č. 1", "instructions__swipe_down": "Přejeďte prstem dolů", "instructions__swipe_horizontally": "Přejeďte prstem vodorovně", diff --git a/core/translations/de.json b/core/translations/de.json index aaf3c48e69..9596418df8 100644 --- a/core/translations/de.json +++ b/core/translations/de.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Zum Verlassen halten", "instructions__hold_to_sign": "Zum Signieren halten", "instructions__learn_more": "Mehr erfahren", - "instructions__shares_continue_with_x_template": "Mit Share #{0} fortfahren", "instructions__shares_start_with_1": "Mit Share #1 beginnen", "instructions__swipe_down": "Nach unten wischen", "instructions__swipe_horizontally": "Zur Seite wischen", diff --git a/core/translations/en.json b/core/translations/en.json index 70a09846a3..c578bb39b0 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -399,7 +399,6 @@ "instructions__hold_to_exit_tutorial": "Hold to exit tutorial", "instructions__hold_to_sign": "Hold to sign", "instructions__learn_more": "Learn more", - "instructions__shares_continue_with_x_template": "Continue with Share #{0}", "instructions__shares_start_with_1": "Start with share #1", "instructions__swipe_down": "Swipe down", "instructions__swipe_horizontally": "Swipe horizontally", @@ -634,6 +633,7 @@ "reset__check_wallet_backup_title": "Check wallet backup", "reset__continue_with_next_share": "Continue with the next share.", "reset__continue_with_share_template": "Continue with share #{0}.", + "reset__next_share": "Next share", "reset__create_x_of_y_multi_share_backup_template": "Do you want to create a {0} of {1} multi-share backup?", "reset__finished_verifying_group_template": "You have finished verifying your recovery shares for group {0}.", "reset__finished_verifying_shares": "You have finished verifying your recovery shares.", diff --git a/core/translations/es.json b/core/translations/es.json index fc81d281df..7a5f1c9657 100644 --- a/core/translations/es.json +++ b/core/translations/es.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Pulsa para salir del tutorial", "instructions__hold_to_sign": "Pulsa para firmar", "instructions__learn_more": "Más información", - "instructions__shares_continue_with_x_template": "Continuar con el rec. n.º {0}", "instructions__shares_start_with_1": "Empezar con el rec. n.º 1", "instructions__swipe_down": "Deslizar hacia abajo", "instructions__swipe_horizontally": "Deslizar en horizontal", diff --git a/core/translations/fr.json b/core/translations/fr.json index ebc9284bf5..040f2bff00 100644 --- a/core/translations/fr.json +++ b/core/translations/fr.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Appui pour quitter", "instructions__hold_to_sign": "Appui pour signer", "instructions__learn_more": "En savoir plus", - "instructions__shares_continue_with_x_template": "Continuez avec le fragment #{0}", "instructions__shares_start_with_1": "Commencez avec le fragment #1", "instructions__swipe_down": "Glisser vers le bas", "instructions__swipe_horizontally": "Glisser horizontalement", diff --git a/core/translations/it.json b/core/translations/it.json index 8ddb9793d8..4d59796e06 100644 --- a/core/translations/it.json +++ b/core/translations/it.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Premi ed esci dal tutorial", "instructions__hold_to_sign": "Premi e firma", "instructions__learn_more": "Ulteriori informazioni", - "instructions__shares_continue_with_x_template": "Continua con azione n. {0}", "instructions__shares_start_with_1": "Inizia con azione n. 1", "instructions__swipe_down": "Scorri in basso", "instructions__swipe_horizontally": "Scorri in orizzontale", diff --git a/core/translations/order.json b/core/translations/order.json index c28a400db2..d1c1dc164d 100644 --- a/core/translations/order.json +++ b/core/translations/order.json @@ -994,5 +994,6 @@ "992": "nostr__event_kind_template", "993": "ble__unpair_all", "994": "ble__unpair_current", - "995": "ble__unpair_title" + "995": "ble__unpair_title", + "996": "reset__next_share" } diff --git a/core/translations/pt.json b/core/translations/pt.json index 062b4772d5..3c9c8429cd 100644 --- a/core/translations/pt.json +++ b/core/translations/pt.json @@ -427,7 +427,6 @@ "instructions__hold_to_exit_tutorial": "Pressione para sair do tutorial", "instructions__hold_to_sign": "Pressione para assinar", "instructions__learn_more": "Saiba mais", - "instructions__shares_continue_with_x_template": "Continuar com a cota nº{0}", "instructions__shares_start_with_1": "Começar com cota nº1", "instructions__swipe_down": "Deslizar para baixo", "instructions__swipe_horizontally": "Deslizar horizontalmente", diff --git a/core/translations/signatures.json b/core/translations/signatures.json index 842f520e11..8e13970d5f 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,8 +1,8 @@ { "current": { - "merkle_root": "136cfad983788597b6218f51a94b93b14535f20111dc91aa953e6e9df462ab16", - "datetime": "2025-03-27T18:08:46.572012", - "commit": "b340d6c7b21d110b8bb4478c654b293bd3a977f0" + "merkle_root": "0a51a28bd621d864ca0144c493bc65c2b72ce4f75c3861bf6f5fffd7249dc777", + "datetime": "2025-04-14T15:34:31.830941", + "commit": "eb0ab2451b80c54fdcb4ce3d78d65d0d3dcf78f7" }, "history": [ {