arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-21 01:29:02 +00:00
Code Issues Releases Wiki Activity

Merge 65b405a696 into f89e7670c5

Browse Source
This commit is contained in:
Ioan Bizău 2025-04-19 14:30:12 +07:00 committed by GitHub
commit 83e3cb5f03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/embed/rust/librust_qstr.h
View File

@ -312,7 +312,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;
@ -537,6 +536,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;

6
core/embed/rust/src/translations/generated/translated_string.rs generated
View File

@ -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,
}
}

4
core/embed/rust/src/ui/shape/text.rs
View File

@ -54,6 +54,10 @@ impl<'a> Text<'a> {
pub fn render<'r>(mut self, renderer: &mut impl Renderer<'r>) {
self.bounds = self.calc_bounds();
#[cfg(feature = "ui_debug")]
if self.font.text_width(self.text) > renderer.viewport().clip.width() {
fatal_error!(&uformat!(len: 128, "Text too long: '{}'", self.text));
}
renderer.render_shape(self);
}

2
core/mocks/trezortranslate_keys.pyi
View File

@ -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."

12
core/src/trezor/ui/layouts/delizia/reset.py
View File

@ -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)

1
core/translations/cs.json
View File

@ -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ě",

1
core/translations/de.json
View File

@ -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",

2
core/translations/en.json
View File

@ -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.",

1
core/translations/es.json
View File

@ -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",

1
core/translations/fr.json
View File

@ -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",

1
core/translations/it.json
View File

@ -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",

3
core/translations/order.json
View File

@ -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"
}

1
core/translations/pt.json
View File

@ -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",

6
core/translations/signatures.json
View File

@ -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": [
{