diff --git a/core/embed/rust/librust_qstr.h b/core/embed/rust/librust_qstr.h index c115c0c8c11..7ac29af8f4e 100644 --- a/core/embed/rust/librust_qstr.h +++ b/core/embed/rust/librust_qstr.h @@ -766,6 +766,7 @@ static void _librust_qstrs(void) { MP_QSTR_words__confirm_fee; MP_QSTR_words__contains; MP_QSTR_words__continue_anyway; + MP_QSTR_words__continue_anyway_question; MP_QSTR_words__continue_with; MP_QSTR_words__error; MP_QSTR_words__fee; diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs index b19f4240cec..682f9572d8e 100644 --- a/core/embed/rust/src/translations/generated/translated_string.rs +++ b/core/embed/rust/src/translations/generated/translated_string.rs @@ -1187,7 +1187,7 @@ pub enum TranslatedString { words__confirm = 800, // "Confirm" words__confirm_fee = 801, // "Confirm fee" words__contains = 802, // "Contains" - words__continue_anyway = 803, // "Continue anyway?" + words__continue_anyway_question = 803, // "Continue anyway?" words__continue_with = 804, // "Continue with" words__error = 805, // "Error" words__fee = 806, // "Fee" @@ -1370,6 +1370,7 @@ pub enum TranslatedString { #[cfg(feature = "universal_fw")] fido__title_credential_details = 965, // "Credential details" address__public_key_confirmed = 966, // "Public key confirmed" + words__continue_anyway = 967, // "Continue anyway" } impl TranslatedString { @@ -2551,7 +2552,7 @@ impl TranslatedString { Self::words__confirm => "Confirm", Self::words__confirm_fee => "Confirm fee", Self::words__contains => "Contains", - Self::words__continue_anyway => "Continue anyway?", + Self::words__continue_anyway_question => "Continue anyway?", Self::words__continue_with => "Continue with", Self::words__error => "Error", Self::words__fee => "Fee", @@ -2734,6 +2735,7 @@ impl TranslatedString { #[cfg(feature = "universal_fw")] Self::fido__title_credential_details => "Credential details", Self::address__public_key_confirmed => "Public key confirmed", + Self::words__continue_anyway => "Continue anyway", } } @@ -3916,7 +3918,7 @@ impl TranslatedString { Qstr::MP_QSTR_words__confirm => Some(Self::words__confirm), Qstr::MP_QSTR_words__confirm_fee => Some(Self::words__confirm_fee), Qstr::MP_QSTR_words__contains => Some(Self::words__contains), - Qstr::MP_QSTR_words__continue_anyway => Some(Self::words__continue_anyway), + Qstr::MP_QSTR_words__continue_anyway_question => Some(Self::words__continue_anyway_question), Qstr::MP_QSTR_words__continue_with => Some(Self::words__continue_with), Qstr::MP_QSTR_words__error => Some(Self::words__error), Qstr::MP_QSTR_words__fee => Some(Self::words__fee), @@ -4099,6 +4101,7 @@ impl TranslatedString { #[cfg(feature = "universal_fw")] Qstr::MP_QSTR_fido__title_credential_details => Some(Self::fido__title_credential_details), Qstr::MP_QSTR_address__public_key_confirmed => Some(Self::address__public_key_confirmed), + Qstr::MP_QSTR_words__continue_anyway => Some(Self::words__continue_anyway), _ => None, } } diff --git a/core/embed/rust/src/ui/model_mercury/flow/prompt_backup.rs b/core/embed/rust/src/ui/model_mercury/flow/prompt_backup.rs index 4ffc88ac45a..251444223f3 100644 --- a/core/embed/rust/src/ui/model_mercury/flow/prompt_backup.rs +++ b/core/embed/rust/src/ui/model_mercury/flow/prompt_backup.rs @@ -113,7 +113,7 @@ impl PromptBackup { .with_cancel_button() .with_footer( TR::instructions__swipe_up.into(), - Some(TR::words__continue_anyway.into()), + Some(TR::words__continue_anyway_question.into()), ) .with_swipe(Direction::Up, SwipeSettings::default()) .with_swipe(Direction::Right, SwipeSettings::immediate()) diff --git a/core/embed/rust/src/ui/model_mercury/flow/warning_hi_prio.rs b/core/embed/rust/src/ui/model_mercury/flow/warning_hi_prio.rs index 8d5c35b940c..79f5c258967 100644 --- a/core/embed/rust/src/ui/model_mercury/flow/warning_hi_prio.rs +++ b/core/embed/rust/src/ui/model_mercury/flow/warning_hi_prio.rs @@ -71,7 +71,7 @@ impl WarningHiPrio { let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?; let value: TString = kwargs.get_or(Qstr::MP_QSTR_value, "".into())?; let cancel: TString = TR::words__cancel_and_exit.into(); - let confirm: TString = TR::buttons__continue.into(); + let confirm: TString = TR::words__continue_anyway.into(); let done_title: TString = TR::words__operation_cancelled.into(); // Message diff --git a/core/mocks/trezortranslate_keys.pyi b/core/mocks/trezortranslate_keys.pyi index 5c50ae13d9a..7bf9f6f03c6 100644 --- a/core/mocks/trezortranslate_keys.pyi +++ b/core/mocks/trezortranslate_keys.pyi @@ -922,7 +922,8 @@ class TR: words__confirm: str = "Confirm" words__confirm_fee: str = "Confirm fee" words__contains: str = "Contains" - words__continue_anyway: str = "Continue anyway?" + words__continue_anyway: str = "Continue anyway" + words__continue_anyway_question: str = "Continue anyway?" words__continue_with: str = "Continue with" words__error: str = "Error" words__fee: str = "Fee" diff --git a/core/src/apps/bitcoin/sign_tx/layout.py b/core/src/apps/bitcoin/sign_tx/layout.py index 3e6eaf4534b..8f7e6ec462b 100644 --- a/core/src/apps/bitcoin/sign_tx/layout.py +++ b/core/src/apps/bitcoin/sign_tx/layout.py @@ -284,7 +284,7 @@ async def confirm_unverified_external_input() -> None: await layouts.show_warning( "unverified_external_input", TR.bitcoin__unverified_external_inputs, - TR.words__continue_anyway, + TR.words__continue_anyway_question, button=TR.buttons__continue, br_code=ButtonRequestType.SignTx, ) @@ -294,7 +294,7 @@ async def confirm_multiple_accounts() -> None: await layouts.show_warning( "sending_from_multiple_accounts", TR.send__from_multiple_accounts, - TR.words__continue_anyway, + TR.words__continue_anyway_question, button=TR.buttons__continue, br_code=ButtonRequestType.SignTx, ) @@ -307,7 +307,7 @@ async def confirm_nondefault_locktime(lock_time: int, lock_time_disabled: bool) await layouts.show_warning( "nondefault_locktime", TR.bitcoin__locktime_no_effect, - TR.words__continue_anyway, + TR.words__continue_anyway_question, button=TR.buttons__continue, br_code=ButtonRequestType.SignTx, ) diff --git a/core/src/trezor/ui/layouts/mercury/__init__.py b/core/src/trezor/ui/layouts/mercury/__init__.py index 21e45b8443d..9e819f44b0b 100644 --- a/core/src/trezor/ui/layouts/mercury/__init__.py +++ b/core/src/trezor/ui/layouts/mercury/__init__.py @@ -601,7 +601,7 @@ def show_warning( trezorui2.show_warning( title=TR.words__important, value=content, - button=subheader or TR.words__continue_anyway, + button=subheader or TR.words__continue_anyway_question, danger=True, ) ), diff --git a/core/src/trezor/ui/layouts/tr/__init__.py b/core/src/trezor/ui/layouts/tr/__init__.py index 4134f46aec4..54105ffeb1f 100644 --- a/core/src/trezor/ui/layouts/tr/__init__.py +++ b/core/src/trezor/ui/layouts/tr/__init__.py @@ -517,7 +517,7 @@ def confirm_multisig_warning() -> Awaitable[None]: return show_warning( "warning_multisig", TR.send__receiving_to_multisig, - TR.words__continue_anyway, + TR.words__continue_anyway_question, ) diff --git a/core/src/trezor/ui/layouts/tt/__init__.py b/core/src/trezor/ui/layouts/tt/__init__.py index dce95f4af91..ba9d86fec18 100644 --- a/core/src/trezor/ui/layouts/tt/__init__.py +++ b/core/src/trezor/ui/layouts/tt/__init__.py @@ -436,7 +436,7 @@ def confirm_path_warning(path: str, path_type: str | None = None) -> Awaitable[N trezorui2.show_warning( title=title, value=path, - description=TR.words__continue_anyway, + description=TR.words__continue_anyway_question, button=TR.buttons__continue, ) ), @@ -450,7 +450,7 @@ def confirm_multisig_warning() -> Awaitable[None]: return show_warning( "warning_multisig", TR.send__receiving_to_multisig, - TR.words__continue_anyway, + TR.words__continue_anyway_question, ) diff --git a/core/tools/translations/rules.json b/core/tools/translations/rules.json index 873524446f2..863ed1caea2 100644 --- a/core/tools/translations/rules.json +++ b/core/tools/translations/rules.json @@ -803,6 +803,7 @@ "words__confirm_fee": "text,1", "words__contains": "text,1", "words__continue_anyway": "text,1", + "words__continue_anyway_question": "text,1", "words__continue_with": "text,1", "words__error": "text,1", "words__fee": "text,1", diff --git a/core/translations/cs.json b/core/translations/cs.json index 53859c5d1bf..62ef6c34541 100644 --- a/core/translations/cs.json +++ b/core/translations/cs.json @@ -943,7 +943,8 @@ "words__confirm": "Potvrdit", "words__confirm_fee": "Potvrdit poplatek", "words__contains": "Obsahuje", - "words__continue_anyway": "Přesto pokračovat?", + "words__continue_anyway": "Přesto pokračovat", + "words__continue_anyway_question": "Přesto pokračovat?", "words__continue_with": "Pokračovat s", "words__error": "Chyba", "words__fee": "Poplatek", diff --git a/core/translations/de.json b/core/translations/de.json index 0c8a3221aa6..8cdb7532e5b 100644 --- a/core/translations/de.json +++ b/core/translations/de.json @@ -943,7 +943,8 @@ "words__confirm": "Bestätigen", "words__confirm_fee": "Gebühr bestätigen", "words__contains": "Enthält", - "words__continue_anyway": "trotzdem fortfahren?", + "words__continue_anyway": "trotzdem fortfahren", + "words__continue_anyway_question": "trotzdem fortfahren?", "words__continue_with": "Weiter mit", "words__error": "Fehler", "words__fee": "Gebühr", diff --git a/core/translations/en.json b/core/translations/en.json index ededa511efe..2f0499af778 100644 --- a/core/translations/en.json +++ b/core/translations/en.json @@ -924,7 +924,8 @@ "words__confirm": "Confirm", "words__confirm_fee": "Confirm fee", "words__contains": "Contains", - "words__continue_anyway": "Continue anyway?", + "words__continue_anyway": "Continue anyway", + "words__continue_anyway_question": "Continue anyway?", "words__continue_with": "Continue with", "words__error": "Error", "words__fee": "Fee", diff --git a/core/translations/es.json b/core/translations/es.json index e46c6d8cc73..9e1874806b9 100644 --- a/core/translations/es.json +++ b/core/translations/es.json @@ -943,7 +943,8 @@ "words__confirm": "Confirmar", "words__confirm_fee": "Confirmar comisión", "words__contains": "Contiene", - "words__continue_anyway": "¿Continuar?", + "words__continue_anyway": "Continuar", + "words__continue_anyway_question": "¿Continuar?", "words__continue_with": "Continuar con", "words__error": "Error", "words__fee": "Comisión", diff --git a/core/translations/fr.json b/core/translations/fr.json index 10e20391550..e67c873d4ac 100644 --- a/core/translations/fr.json +++ b/core/translations/fr.json @@ -943,7 +943,8 @@ "words__confirm": "Conf.", "words__confirm_fee": "Conf. les frais", "words__contains": "Contient", - "words__continue_anyway": "Continuer qdm ?", + "words__continue_anyway": "Continuer qdm", + "words__continue_anyway_question": "Continuer qdm ?", "words__continue_with": "Continuer avec", "words__error": "Erreur", "words__fee": "Frais", diff --git a/core/translations/it.json b/core/translations/it.json index eb0b26e37db..ad9a0201d33 100644 --- a/core/translations/it.json +++ b/core/translations/it.json @@ -883,7 +883,8 @@ "words__confirm": "Conferma", "words__confirm_fee": "Conferma commissione", "words__contains": "Contiene", - "words__continue_anyway": "Continuare comunque?", + "words__continue_anyway": "Continuare comunque", + "words__continue_anyway_question": "Continuare comunque?", "words__continue_with": "Continua con", "words__error": "Errore", "words__fee": "Commissione", diff --git a/core/translations/order.json b/core/translations/order.json index 8cb633b70cd..0b75816a2d0 100644 --- a/core/translations/order.json +++ b/core/translations/order.json @@ -802,7 +802,7 @@ "800": "words__confirm", "801": "words__confirm_fee", "802": "words__contains", - "803": "words__continue_anyway", + "803": "words__continue_anyway_question", "804": "words__continue_with", "805": "words__error", "806": "words__fee", @@ -965,5 +965,6 @@ "963": "fido__title_select_credential", "964": "instructions__swipe_down", "965": "fido__title_credential_details", - "966": "address__public_key_confirmed" + "966": "address__public_key_confirmed", + "967": "words__continue_anyway" } diff --git a/core/translations/pt.json b/core/translations/pt.json index ff17d92ee99..603412c2c5a 100644 --- a/core/translations/pt.json +++ b/core/translations/pt.json @@ -886,7 +886,8 @@ "words__confirm": "Confirmar", "words__confirm_fee": "Confirmar taxa", "words__contains": "Contém", - "words__continue_anyway": "Continuar?", + "words__continue_anyway": "Continuar", + "words__continue_anyway_question": "Continuar?", "words__continue_with": "Continuar com", "words__error": "Erro", "words__fee": "Taxa", diff --git a/core/translations/signatures.json b/core/translations/signatures.json index a2966c4143f..a7d7d05c8e8 100644 --- a/core/translations/signatures.json +++ b/core/translations/signatures.json @@ -1,8 +1,8 @@ { "current": { - "merkle_root": "b6f219293d33f026ebcee6b877ec62903a082f2cedb71053de8ecf614c4b7e4f", - "datetime": "2024-10-02T09:30:46.734439", - "commit": "774f9de745ec38d79c06cbe487af46b8e0136950" + "merkle_root": "38380cf2ffd2a7f73010f96c3c24f8bc3c71728a2da22fd8dee30c85750932de", + "datetime": "2024-10-07T13:19:31.741035", + "commit": "443373ce19421beb2323e68b5ec080a000c1d471" }, "history": [ { diff --git a/core/translations/tr.json b/core/translations/tr.json index 4ac0d9ca750..6a527b56a1a 100644 --- a/core/translations/tr.json +++ b/core/translations/tr.json @@ -883,7 +883,8 @@ "words__confirm": "Onayla", "words__confirm_fee": "Ücreti onayla", "words__contains": "Şunu içerir:", - "words__continue_anyway": "Yine de devam mı?", + "words__continue_anyway": "Yine de devam mı", + "words__continue_anyway_question": "Yine de devam mı?", "words__continue_with": "Şununla devam et:", "words__error": "Hata", "words__fee": "Ücret",