1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-19 05:58:09 +00:00

fix(core/mercury): small copy change in tutorial

[no changelog]
This commit is contained in:
obrusvit 2024-07-18 14:49:53 +02:00 committed by Vít Obrusník
parent 522d33a71f
commit 958d08cc91
11 changed files with 17 additions and 21 deletions

View File

@ -289,9 +289,9 @@ static void _librust_qstrs(void) {
MP_QSTR_instructions__continue_holding; MP_QSTR_instructions__continue_holding;
MP_QSTR_instructions__continue_in_app; MP_QSTR_instructions__continue_in_app;
MP_QSTR_instructions__enter_next_share; MP_QSTR_instructions__enter_next_share;
MP_QSTR_instructions__exit_tutorial;
MP_QSTR_instructions__hold_to_confirm; MP_QSTR_instructions__hold_to_confirm;
MP_QSTR_instructions__hold_to_continue; MP_QSTR_instructions__hold_to_continue;
MP_QSTR_instructions__hold_to_exit_tutorial;
MP_QSTR_instructions__hold_to_finish_tutorial; MP_QSTR_instructions__hold_to_finish_tutorial;
MP_QSTR_instructions__hold_to_sign; MP_QSTR_instructions__hold_to_sign;
MP_QSTR_instructions__learn_more; MP_QSTR_instructions__learn_more;

View File

@ -1289,7 +1289,7 @@ pub enum TranslatedString {
instructions__continue_holding = 888, // "Continue\nholding" instructions__continue_holding = 888, // "Continue\nholding"
instructions__enter_next_share = 889, // "Enter next share" instructions__enter_next_share = 889, // "Enter next share"
instructions__hold_to_continue = 890, // "Hold to continue" instructions__hold_to_continue = 890, // "Hold to continue"
instructions__exit_tutorial = 891, // "Exit tutorial" instructions__hold_to_exit_tutorial = 891, // "Hold to exit tutorial"
instructions__hold_to_finish_tutorial = 892, // "\"\"" instructions__hold_to_finish_tutorial = 892, // "\"\""
instructions__learn_more = 893, // "Learn more" instructions__learn_more = 893, // "Learn more"
instructions__shares_continue_with_x_template = 894, // "Continue with Share #{0}" instructions__shares_continue_with_x_template = 894, // "Continue with Share #{0}"
@ -2638,7 +2638,7 @@ impl TranslatedString {
Self::instructions__continue_holding => "Continue\nholding", Self::instructions__continue_holding => "Continue\nholding",
Self::instructions__enter_next_share => "Enter next share", Self::instructions__enter_next_share => "Enter next share",
Self::instructions__hold_to_continue => "Hold to continue", Self::instructions__hold_to_continue => "Hold to continue",
Self::instructions__exit_tutorial => "Exit tutorial", Self::instructions__hold_to_exit_tutorial => "Hold to exit tutorial",
Self::instructions__hold_to_finish_tutorial => "\"\"", Self::instructions__hold_to_finish_tutorial => "\"\"",
Self::instructions__learn_more => "Learn more", Self::instructions__learn_more => "Learn more",
Self::instructions__shares_continue_with_x_template => "Continue with Share #{0}", Self::instructions__shares_continue_with_x_template => "Continue with Share #{0}",
@ -3988,7 +3988,7 @@ impl TranslatedString {
Qstr::MP_QSTR_instructions__continue_holding => Some(Self::instructions__continue_holding), Qstr::MP_QSTR_instructions__continue_holding => Some(Self::instructions__continue_holding),
Qstr::MP_QSTR_instructions__enter_next_share => Some(Self::instructions__enter_next_share), Qstr::MP_QSTR_instructions__enter_next_share => Some(Self::instructions__enter_next_share),
Qstr::MP_QSTR_instructions__hold_to_continue => Some(Self::instructions__hold_to_continue), Qstr::MP_QSTR_instructions__hold_to_continue => Some(Self::instructions__hold_to_continue),
Qstr::MP_QSTR_instructions__exit_tutorial => Some(Self::instructions__exit_tutorial), Qstr::MP_QSTR_instructions__hold_to_exit_tutorial => Some(Self::instructions__hold_to_exit_tutorial),
Qstr::MP_QSTR_instructions__hold_to_finish_tutorial => Some(Self::instructions__hold_to_finish_tutorial), Qstr::MP_QSTR_instructions__hold_to_finish_tutorial => Some(Self::instructions__hold_to_finish_tutorial),
Qstr::MP_QSTR_instructions__learn_more => Some(Self::instructions__learn_more), 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_continue_with_x_template => Some(Self::instructions__shares_continue_with_x_template),

View File

@ -137,7 +137,7 @@ impl ShowTutorial {
TR::tutorial__title_hold.into(), TR::tutorial__title_hold.into(),
SwipeContent::new(PromptScreen::new_hold_to_confirm()), SwipeContent::new(PromptScreen::new_hold_to_confirm()),
) )
.with_footer(TR::instructions__exit_tutorial.into(), None) .with_footer(TR::instructions__hold_to_exit_tutorial.into(), None)
.map(|msg| matches!(msg, FrameMsg::Content(())).then_some(FlowMsg::Confirmed)); .map(|msg| matches!(msg, FrameMsg::Content(())).then_some(FlowMsg::Confirmed));
let content_step_done = Frame::left_aligned( let content_step_done = Frame::left_aligned(
@ -181,7 +181,7 @@ impl ShowTutorial {
TR::tutorial__title_hold.into(), TR::tutorial__title_hold.into(),
SwipeContent::new(PromptScreen::new_hold_to_confirm_danger()), SwipeContent::new(PromptScreen::new_hold_to_confirm_danger()),
) )
.with_footer(TR::instructions__exit_tutorial.into(), None) .with_footer(TR::instructions__hold_to_exit_tutorial.into(), None)
.map(|msg| matches!(msg, FrameMsg::Content(())).then_some(FlowMsg::Confirmed)); .map(|msg| matches!(msg, FrameMsg::Content(())).then_some(FlowMsg::Confirmed));
let res = SwipeFlow::new(&ShowTutorial::StepWelcome)? let res = SwipeFlow::new(&ShowTutorial::StepWelcome)?

View File

@ -380,9 +380,9 @@ class TR:
instructions__continue_holding: str = "Continue\nholding" instructions__continue_holding: str = "Continue\nholding"
instructions__continue_in_app: str = "Continue in the app" instructions__continue_in_app: str = "Continue in the app"
instructions__enter_next_share: str = "Enter next share" instructions__enter_next_share: str = "Enter next share"
instructions__exit_tutorial: str = "Exit tutorial"
instructions__hold_to_confirm: str = "Hold to confirm" instructions__hold_to_confirm: str = "Hold to confirm"
instructions__hold_to_continue: str = "Hold to continue" instructions__hold_to_continue: str = "Hold to continue"
instructions__hold_to_exit_tutorial: str = "Hold to exit tutorial"
instructions__hold_to_sign: str = "Hold to sign" instructions__hold_to_sign: str = "Hold to sign"
instructions__learn_more: str = "Learn more" instructions__learn_more: str = "Learn more"
instructions__shares_continue_with_x_template: str = "Continue with Share #{0}" instructions__shares_continue_with_x_template: str = "Continue with Share #{0}"

View File

@ -412,7 +412,6 @@
"instructions__continue_holding": "Stále\ndržte", "instructions__continue_holding": "Stále\ndržte",
"instructions__continue_in_app": "Pokračujte v aplikaci", "instructions__continue_in_app": "Pokračujte v aplikaci",
"instructions__enter_next_share": "Zadejte další část", "instructions__enter_next_share": "Zadejte další část",
"instructions__exit_tutorial": "Ukončit tutoriál",
"instructions__hold_to_confirm": "Držením potvrďte", "instructions__hold_to_confirm": "Držením potvrďte",
"instructions__hold_to_continue": "Držením pokračujte", "instructions__hold_to_continue": "Držením pokračujte",
"instructions__hold_to_exit_tutorial": "Podržením ukončíte tutoriál", "instructions__hold_to_exit_tutorial": "Podržením ukončíte tutoriál",

View File

@ -412,10 +412,9 @@
"instructions__continue_holding": "Weiter\nhalten", "instructions__continue_holding": "Weiter\nhalten",
"instructions__continue_in_app": "In der App fortfahren", "instructions__continue_in_app": "In der App fortfahren",
"instructions__enter_next_share": "Nächsten Share eingeben", "instructions__enter_next_share": "Nächsten Share eingeben",
"instructions__exit_tutorial": "Tutorial beenden",
"instructions__hold_to_confirm": "Zum Bestätigen halten", "instructions__hold_to_confirm": "Zum Bestätigen halten",
"instructions__hold_to_continue": "Zum Fortfahren halten", "instructions__hold_to_continue": "Zum Fortfahren halten",
"instructions__hold_to_exit_tutorial": "Zum Verlassen des Tutorials halten", "instructions__hold_to_exit_tutorial": "Zum Verlassen halten",
"instructions__hold_to_sign": "Zum Signieren halten", "instructions__hold_to_sign": "Zum Signieren halten",
"instructions__learn_more": "Mehr erfahren", "instructions__learn_more": "Mehr erfahren",
"instructions__shares_continue_with_x_template": "Mit Share #{0} fortfahren", "instructions__shares_continue_with_x_template": "Mit Share #{0} fortfahren",
@ -899,7 +898,7 @@
"tutorial__title_easy_navigation": "Leichte Navigation", "tutorial__title_easy_navigation": "Leichte Navigation",
"tutorial__title_handy_menu": "Nützliches Menü", "tutorial__title_handy_menu": "Nützliches Menü",
"tutorial__title_hello": "Hallo", "tutorial__title_hello": "Hallo",
"tutorial__title_hold": "Halte den Bildschirm um wichtige Schritte bestätigen", "tutorial__title_hold": "Halte den Bildschirm um Schritte bestätigen",
"tutorial__title_lets_begin": "Lass uns beginnen", "tutorial__title_lets_begin": "Lass uns beginnen",
"tutorial__title_navigation": "Navigation", "tutorial__title_navigation": "Navigation",
"tutorial__title_screen_scroll": "Bildschirm scrollen", "tutorial__title_screen_scroll": "Bildschirm scrollen",

View File

@ -384,7 +384,7 @@
"instructions__enter_next_share": "Enter next share", "instructions__enter_next_share": "Enter next share",
"instructions__hold_to_confirm": "Hold to confirm", "instructions__hold_to_confirm": "Hold to confirm",
"instructions__hold_to_continue": "Hold to continue", "instructions__hold_to_continue": "Hold to continue",
"instructions__exit_tutorial": "Exit tutorial", "instructions__hold_to_exit_tutorial": "Hold to exit tutorial",
"instructions__hold_to_sign": "Hold to sign", "instructions__hold_to_sign": "Hold to sign",
"instructions__learn_more": "Learn more", "instructions__learn_more": "Learn more",
"instructions__shares_continue_with_x_template": "Continue with Share #{0}", "instructions__shares_continue_with_x_template": "Continue with Share #{0}",

View File

@ -412,7 +412,6 @@
"instructions__continue_holding": "Continuar\nposición", "instructions__continue_holding": "Continuar\nposición",
"instructions__continue_in_app": "Continuar en la aplicación", "instructions__continue_in_app": "Continuar en la aplicación",
"instructions__enter_next_share": "Introduce el siguiente recurso", "instructions__enter_next_share": "Introduce el siguiente recurso",
"instructions__exit_tutorial": "Salir del tutorial",
"instructions__hold_to_confirm": "Pulsa para confirmar", "instructions__hold_to_confirm": "Pulsa para confirmar",
"instructions__hold_to_continue": "Pulsa para continuar", "instructions__hold_to_continue": "Pulsa para continuar",
"instructions__hold_to_exit_tutorial": "Pulsa para salir del tutorial", "instructions__hold_to_exit_tutorial": "Pulsa para salir del tutorial",

View File

@ -412,10 +412,9 @@
"instructions__continue_holding": "Continuer\nappui", "instructions__continue_holding": "Continuer\nappui",
"instructions__continue_in_app": "Continuer dans lapplication", "instructions__continue_in_app": "Continuer dans lapplication",
"instructions__enter_next_share": "Saisissez le prochain fragment", "instructions__enter_next_share": "Saisissez le prochain fragment",
"instructions__exit_tutorial": "Sortir du tutoriel",
"instructions__hold_to_confirm": "Appui pour confirmer", "instructions__hold_to_confirm": "Appui pour confirmer",
"instructions__hold_to_continue": "Appui pour continuer", "instructions__hold_to_continue": "Appui pour continuer",
"instructions__hold_to_exit_tutorial": "Appui pour quitter le tutoriel", "instructions__hold_to_exit_tutorial": "Appui pour quitter",
"instructions__hold_to_sign": "Appui pour signer", "instructions__hold_to_sign": "Appui pour signer",
"instructions__learn_more": "En savoir plus", "instructions__learn_more": "En savoir plus",
"instructions__shares_continue_with_x_template": "Continuez avec le fragment #{0}", "instructions__shares_continue_with_x_template": "Continuez avec le fragment #{0}",
@ -895,8 +894,8 @@
"tutorial__restart_tutorial": "Recommencer le tutoriel", "tutorial__restart_tutorial": "Recommencer le tutoriel",
"tutorial__scroll_down": "Utilisez le bouton droit pour lire le contenu lorsqu'il dépasse.\n\rBouton gauche pour faire défiler l'écran vers le haut.", "tutorial__scroll_down": "Utilisez le bouton droit pour lire le contenu lorsqu'il dépasse.\n\rBouton gauche pour faire défiler l'écran vers le haut.",
"tutorial__sure_you_want_skip": "Voulez-vous vraiment\nignorer le tutoriel ?", "tutorial__sure_you_want_skip": "Voulez-vous vraiment\nignorer le tutoriel ?",
"tutorial__swipe_up_and_down": "Balayer vers le haut ou le bas\npour changer d'écran.", "tutorial__swipe_up_and_down": "Balayer vers le haut ou le bas pour changer d'écran.",
"tutorial__title_easy_navigation": "navigation facile", "tutorial__title_easy_navigation": "Navigation facile",
"tutorial__title_handy_menu": "Menu pratique", "tutorial__title_handy_menu": "Menu pratique",
"tutorial__title_hello": "Bonjour", "tutorial__title_hello": "Bonjour",
"tutorial__title_hold": "Maintenir pour confirmer les actions importantes", "tutorial__title_hold": "Maintenir pour confirmer les actions importantes",

View File

@ -890,7 +890,7 @@
"888": "instructions__continue_holding", "888": "instructions__continue_holding",
"889": "instructions__enter_next_share", "889": "instructions__enter_next_share",
"890": "instructions__hold_to_continue", "890": "instructions__hold_to_continue",
"891": "instructions__exit_tutorial", "891": "instructions__hold_to_exit_tutorial",
"892": "instructions__hold_to_finish_tutorial", "892": "instructions__hold_to_finish_tutorial",
"893": "instructions__learn_more", "893": "instructions__learn_more",
"894": "instructions__shares_continue_with_x_template", "894": "instructions__shares_continue_with_x_template",

View File

@ -1,8 +1,8 @@
{ {
"current": { "current": {
"merkle_root": "8c40d9e33f42783293a32e768f155e29aa3650b9bbc5e1ebaabf1ec46a7733b7", "merkle_root": "d7985bf925238153655b5d7cc41beab9591035daba8d28578c20c452f454a2e0",
"datetime": "2024-07-17T17:20:50.219181", "datetime": "2024-07-18T12:41:32.771526",
"commit": "ace22197e82214ae18255d48fae68ece0e7a0386" "commit": "21eafdc5ec6bac60b3546ec9742aeaf8cee76715"
}, },
"history": [ "history": [
{ {