diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h index ea96952844..00b6fb1642 100644 --- a/core/embed/rust/librust_qstr.h +++ b/core/embed/rust/librust_qstr.h @@ -294,7 +294,6 @@ static void _librust_qstrs(void) { MP_QSTR_instructions__shares_start_with_1; MP_QSTR_instructions__swipe_down; MP_QSTR_instructions__swipe_horizontally; - MP_QSTR_instructions__swipe_up; MP_QSTR_instructions__tap_to_confirm; MP_QSTR_instructions__tap_to_continue; MP_QSTR_instructions__tap_to_start; diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index fd6108abd6..708fb751bb 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -1245,7 +1245,6 @@ pub enum TranslatedString { cardano__deposit = 851, // "Deposit:" #[cfg(feature = "universal_fw")] cardano__vote_delegation = 852, // "Vote delegation" - instructions__swipe_up = 853, // "Swipe up" instructions__tap_to_confirm = 854, // "Tap to confirm" instructions__hold_to_confirm = 855, // "Hold to confirm" words__important = 856, // "Important" @@ -1311,7 +1310,7 @@ pub enum TranslatedString { tutorial__exit = 917, // "Exit tutorial" tutorial__menu = 920, // "Find context-specific actions and options in the menu." tutorial__ready_to_use_safe5 = 922, // "You're all set to start using your device!" - tutorial__swipe_up_and_down = 924, // "Swipe up & down\nto move through screens." + tutorial__swipe_up_and_down = 924, // "Tap the lower half of the screen to continue, or swipe down to go back." tutorial__title_easy_navigation = 925, // "Easy navigation" tutorial__welcome_safe5 = 926, // "Welcome to\nTrezor Safe 5" words__good_to_know = 927, // "Good to know" @@ -2644,7 +2643,6 @@ impl TranslatedString { Self::cardano__deposit => "Deposit:", #[cfg(feature = "universal_fw")] Self::cardano__vote_delegation => "Vote delegation", - Self::instructions__swipe_up => "Swipe up", Self::instructions__tap_to_confirm => "Tap to confirm", Self::instructions__hold_to_confirm => "Hold to confirm", Self::words__important => "Important", @@ -2710,7 +2708,7 @@ impl TranslatedString { Self::tutorial__exit => "Exit tutorial", Self::tutorial__menu => "Find context-specific actions and options in the menu.", Self::tutorial__ready_to_use_safe5 => "You're all set to start using your device!", - Self::tutorial__swipe_up_and_down => "Swipe up & down\nto move through screens.", + Self::tutorial__swipe_up_and_down => "Tap the lower half of the screen to continue, or swipe down to go back.", Self::tutorial__title_easy_navigation => "Easy navigation", Self::tutorial__welcome_safe5 => "Welcome to\nTrezor Safe 5", Self::words__good_to_know => "Good to know", @@ -4042,7 +4040,6 @@ impl TranslatedString { Qstr::MP_QSTR_cardano__deposit => Some(Self::cardano__deposit), #[cfg(feature = "universal_fw")] Qstr::MP_QSTR_cardano__vote_delegation => Some(Self::cardano__vote_delegation), - Qstr::MP_QSTR_instructions__swipe_up => Some(Self::instructions__swipe_up), Qstr::MP_QSTR_instructions__tap_to_confirm => Some(Self::instructions__tap_to_confirm), Qstr::MP_QSTR_instructions__hold_to_confirm => Some(Self::instructions__hold_to_confirm), Qstr::MP_QSTR_words__important => Some(Self::words__important), diff --git a/core/embed/rust/src/ui/layout_delizia/flow/show_tutorial.rs b/core/embed/rust/src/ui/layout_delizia/flow/show_tutorial.rs index 7c20cd8ca8..86c76673d0 100644 --- a/core/embed/rust/src/ui/layout_delizia/flow/show_tutorial.rs +++ b/core/embed/rust/src/ui/layout_delizia/flow/show_tutorial.rs @@ -75,7 +75,7 @@ pub fn new_show_tutorial() -> Result { TR::tutorial__welcome_safe5.into(), SwipeContent::new(PromptScreen::new_tap_to_start()), ) - .with_footer(TR::instructions__tap_to_start.into(), None) + .with_footer(TR::instructions__tap_to_continue.into(), None) .map(super::util::map_to_confirm); let content_step_begin = Frame::left_aligned( @@ -85,11 +85,7 @@ pub fn new_show_tutorial() -> Result { TR::tutorial__lets_begin, ))), ) - .with_footer( - TR::instructions__swipe_up.into(), - Some(TR::tutorial__get_started.into()), - ) - .with_swipe(Direction::Up, SwipeSettings::default()) + .with_swipeup_footer(None) .map_to_button_msg(); let content_step_navigation = Frame::left_aligned( @@ -99,11 +95,7 @@ pub fn new_show_tutorial() -> Result { TR::tutorial__swipe_up_and_down, ))), ) - .with_footer( - TR::instructions__swipe_up.into(), - Some(TR::tutorial__continue.into()), - ) - .with_swipe(Direction::Up, SwipeSettings::default()) + .with_swipeup_footer(None) .with_swipe(Direction::Down, SwipeSettings::default()) .map_to_button_msg(); @@ -116,11 +108,7 @@ pub fn new_show_tutorial() -> Result { ) .with_menu_button() .button_styled(theme::button_warning_low()) - .with_footer( - TR::instructions__swipe_up.into(), - Some(TR::buttons__continue.into()), - ) - .with_swipe(Direction::Up, SwipeSettings::default()) + .with_swipeup_footer(None) .with_swipe(Direction::Down, SwipeSettings::default()) .map_to_button_msg(); @@ -138,8 +126,7 @@ pub fn new_show_tutorial() -> Result { TR::tutorial__ready_to_use_safe5, ))), ) - .with_footer(TR::instructions__swipe_up.into(), None) - .with_swipe(Direction::Up, SwipeSettings::default()) + .with_swipeup_footer(None) .map_to_button_msg(); let content_menu = Frame::left_aligned( diff --git a/core/mocks/trezortranslate_keys.pyi b/core/mocks/trezortranslate_keys.pyi index 7306c8c1e2..251abf39fe 100644 --- a/core/mocks/trezortranslate_keys.pyi +++ b/core/mocks/trezortranslate_keys.pyi @@ -398,7 +398,6 @@ class TR: instructions__shares_start_with_1: str = "Start with share #1" instructions__swipe_down: str = "Swipe down" instructions__swipe_horizontally: str = "Swipe horizontally" - instructions__swipe_up: str = "Swipe up" instructions__tap_to_confirm: str = "Tap to confirm" instructions__tap_to_continue: str = "Tap to continue" instructions__tap_to_start: str = "Tap to start" @@ -896,7 +895,7 @@ class TR: tutorial__restart_tutorial: str = "Restart tutorial" tutorial__scroll_down: str = "Press right to scroll down to read all content when text doesn't fit on one screen.\n\rPress left to scroll up." tutorial__sure_you_want_skip: str = "Are you sure you\nwant to skip the tutorial?" - tutorial__swipe_up_and_down: str = "Swipe up & down\nto move through screens." + tutorial__swipe_up_and_down: str = "Tap the lower half of the screen to continue, or swipe down to go back." tutorial__title_easy_navigation: str = "Easy navigation" tutorial__title_handy_menu: str = "Handy menu" tutorial__title_hello: str = "Hello" diff --git a/core/translations/cs.json b/core/translations/cs.json index 15cb40c98e..37308870cb 100644 --- a/core/translations/cs.json +++ b/core/translations/cs.json @@ -939,7 +939,7 @@ "tutorial__restart_tutorial": "Restartovat tutoriál", "tutorial__scroll_down": "Když se text nevejde na jednu obrazovku, pravým tlačítkem posunete text dolů.\n\rLevým tlačítkem se posunete nahoru.", "tutorial__sure_you_want_skip": "Opravdu chcete\npřeskočit tutoriál?", - "tutorial__swipe_up_and_down": "Přejetím prstem nahoru a dolů procházíte mezi obrazovkami.", + "tutorial__swipe_up_and_down": "Pokračujte klepnutím do spodní části obrazovky, nebo se vraťte přejetím prstem dolů.", "tutorial__title_easy_navigation": "Základní navigace", "tutorial__title_handy_menu": "Praktická nabídka", "tutorial__title_hello": "Dobrý den", diff --git a/core/translations/de.json b/core/translations/de.json index ab21a934bd..9a2dbcd7c2 100644 --- a/core/translations/de.json +++ b/core/translations/de.json @@ -939,7 +939,7 @@ "tutorial__restart_tutorial": "Tutorial neustarten", "tutorial__scroll_down": "Drücke rechts, um nach unten zu scrollen und alles zu lesen, wenn der Text nicht auf einen Bildschirm passt.\n\rDrücke links, um nach oben zu scrollen.", "tutorial__sure_you_want_skip": "Möchtest du das Tutorial\nwirklich überspringen?", - "tutorial__swipe_up_and_down": "Nach oben und unten wischen\num den Bildschirmen durchgehen.", + "tutorial__swipe_up_and_down": "Tippe auf die untere Hälfte des Bildschirms zum Fortfahren oder wische nach unten zum Zurückgehen.", "tutorial__title_easy_navigation": "Leichte Navigation", "tutorial__title_handy_menu": "Nützliches Menü", "tutorial__title_hello": "Hallo", diff --git a/core/translations/en.json b/core/translations/en.json index 5a11716c38..5bf97e8726 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -400,7 +400,6 @@ "instructions__shares_start_with_1": "Start with share #1", "instructions__swipe_down": "Swipe down", "instructions__swipe_horizontally": "Swipe horizontally", - "instructions__swipe_up": "Swipe up", "instructions__tap_to_confirm": "Tap to confirm", "instructions__tap_to_continue": "Tap to continue", "instructions__tap_to_start": "Tap to start", @@ -898,7 +897,7 @@ "tutorial__restart_tutorial": "Restart tutorial", "tutorial__scroll_down": "Press right to scroll down to read all content when text doesn't fit on one screen.\n\rPress left to scroll up.", "tutorial__sure_you_want_skip": "Are you sure you\nwant to skip the tutorial?", - "tutorial__swipe_up_and_down": "Swipe up & down\nto move through screens.", + "tutorial__swipe_up_and_down": "Tap the lower half of the screen to continue, or swipe down to go back.", "tutorial__title_easy_navigation": "Easy navigation", "tutorial__title_handy_menu": "Handy menu", "tutorial__title_hello": "Hello", diff --git a/core/translations/es.json b/core/translations/es.json index e8e2694fc8..66aac4f836 100644 --- a/core/translations/es.json +++ b/core/translations/es.json @@ -939,7 +939,7 @@ "tutorial__restart_tutorial": "Reiniciar tutorial", "tutorial__scroll_down": "Pulsa el botón derecho para ir bajando y leer todo cuando el texto no quepa en una pantalla.\n\rPulsa el botón izquierdo para ir hacia arriba.", "tutorial__sure_you_want_skip": "¿Seguro que quieres\nomitir el tutorial?", - "tutorial__swipe_up_and_down": "Desliza hacia arriba y hacia abajo\npara moverte por las pantallas.", + "tutorial__swipe_up_and_down": "Toca la mitad inferior\nde la pantalla para continuar o desliza hacia abajo para volver.", "tutorial__title_easy_navigation": "Navegación fácil", "tutorial__title_handy_menu": "Menú útil", "tutorial__title_hello": "Hola", diff --git a/core/translations/it.json b/core/translations/it.json index ee4a11df7c..b64d3465d2 100644 --- a/core/translations/it.json +++ b/core/translations/it.json @@ -924,7 +924,7 @@ "tutorial__restart_tutorial": "Riavvia il tutorial", "tutorial__scroll_down": "Tasto dx per scorrere giù e leggere tutto il cont. se testo non può essere visual. su una scherm.\n\rTasto sx per scorrere su.", "tutorial__sure_you_want_skip": "Vuoi davvero\nsaltare il tutorial?", - "tutorial__swipe_up_and_down": "Scorri verso l'alto e il basso\nper spostarti tra le schermate.", + "tutorial__swipe_up_and_down": "Tocca la parte inferiore per continuare o scorri in basso per tornare indietro.", "tutorial__title_easy_navigation": "Navigazione semplificata", "tutorial__title_handy_menu": "Menu intuitivo", "tutorial__title_hello": "Ciao", diff --git a/core/translations/pt.json b/core/translations/pt.json index e86ac14877..5c3c6ac851 100644 --- a/core/translations/pt.json +++ b/core/translations/pt.json @@ -938,7 +938,7 @@ "tutorial__restart_tutorial": "Reiniciar tutorial", "tutorial__scroll_down": "Pressione lado direito para rolar o texto quando não couber na tela.\n\rPressione o botão esquerdo para rolar para cima.", "tutorial__sure_you_want_skip": "Deseja\npular o tutorial?", - "tutorial__swipe_up_and_down": "Deslize para cima e para baixo\npara se movimentar pelas telas.", + "tutorial__swipe_up_and_down": "Toque abaixo para continuar ou deslize para baixo para voltar.", "tutorial__title_easy_navigation": "Fácil navegação", "tutorial__title_handy_menu": "Menu prático", "tutorial__title_hello": "Olá", diff --git a/core/translations/signatures.json b/core/translations/signatures.json index 6cd494011d..ab8022461c 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,8 +1,8 @@ { "current": { - "merkle_root": "c5737293106917124bb2d2a9eba7f125ac5f092d00b9057b533a442b8d733814", - "datetime": "2025-02-25T15:06:04.452557", - "commit": "6cb8724fd09fae4160307dcd29c824fab129f0d5" + "merkle_root": "1754d367a3f9796a460e21677a38465ac51110a5abaae96a8977e64cd3d35e27", + "datetime": "2025-02-25T22:15:23.529862", + "commit": "ba8a64d3e42febd344f60f039b6ac21ffb36aa9c" }, "history": [ {