mirror of
https://github.com/trezor/trezor-firmware.git
synced 2025-02-28 15:22:14 +00:00
chore(eckhart): de-duplicate "Keep holding" TStr
This commit is contained in:
parent
e992b77924
commit
119748d743
@ -289,7 +289,6 @@ static void _librust_qstrs(void) {
|
|||||||
MP_QSTR_instructions__hold_to_continue;
|
MP_QSTR_instructions__hold_to_continue;
|
||||||
MP_QSTR_instructions__hold_to_exit_tutorial;
|
MP_QSTR_instructions__hold_to_exit_tutorial;
|
||||||
MP_QSTR_instructions__hold_to_sign;
|
MP_QSTR_instructions__hold_to_sign;
|
||||||
MP_QSTR_instructions__keep_holding;
|
|
||||||
MP_QSTR_instructions__learn_more;
|
MP_QSTR_instructions__learn_more;
|
||||||
MP_QSTR_instructions__shares_continue_with_x_template;
|
MP_QSTR_instructions__shares_continue_with_x_template;
|
||||||
MP_QSTR_instructions__shares_start_with_1;
|
MP_QSTR_instructions__shares_start_with_1;
|
||||||
|
@ -1279,7 +1279,7 @@ pub enum TranslatedString {
|
|||||||
haptic_feedback__enable = 885, // "Enable haptic feedback?"
|
haptic_feedback__enable = 885, // "Enable haptic feedback?"
|
||||||
haptic_feedback__subtitle = 886, // "Setting"
|
haptic_feedback__subtitle = 886, // "Setting"
|
||||||
haptic_feedback__title = 887, // "Haptic feedback"
|
haptic_feedback__title = 887, // "Haptic feedback"
|
||||||
instructions__continue_holding = 888, // "Continue\nholding"
|
instructions__continue_holding = 888, // {"Bolt": "", "Caesar": "", "Delizia": "Continue\nholding", "Eckhart": "Keep holding"}
|
||||||
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__hold_to_exit_tutorial = 891, // "Hold to exit tutorial"
|
instructions__hold_to_exit_tutorial = 891, // "Hold to exit tutorial"
|
||||||
@ -1402,8 +1402,7 @@ pub enum TranslatedString {
|
|||||||
solana__stake_on_question = 989, // "Stake SOL on {0}?"
|
solana__stake_on_question = 989, // "Stake SOL on {0}?"
|
||||||
sign_message__confirm_without_review = 990, // "Confirm without review"
|
sign_message__confirm_without_review = 990, // "Confirm without review"
|
||||||
instructions__tap_to_continue = 991, // "Tap to continue"
|
instructions__tap_to_continue = 991, // "Tap to continue"
|
||||||
instructions__keep_holding = 992, // "Keep holding"
|
reset__share_words_first = 992, // "Write down the first word from the backup."
|
||||||
reset__share_words_first = 993, // "Write down the first word from the backup."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TranslatedString {
|
impl TranslatedString {
|
||||||
@ -2686,7 +2685,14 @@ impl TranslatedString {
|
|||||||
Self::haptic_feedback__enable => "Enable haptic feedback?",
|
Self::haptic_feedback__enable => "Enable haptic feedback?",
|
||||||
Self::haptic_feedback__subtitle => "Setting",
|
Self::haptic_feedback__subtitle => "Setting",
|
||||||
Self::haptic_feedback__title => "Haptic feedback",
|
Self::haptic_feedback__title => "Haptic feedback",
|
||||||
|
#[cfg(feature = "layout_bolt")]
|
||||||
|
Self::instructions__continue_holding => "",
|
||||||
|
#[cfg(feature = "layout_caesar")]
|
||||||
|
Self::instructions__continue_holding => "",
|
||||||
|
#[cfg(feature = "layout_delizia")]
|
||||||
Self::instructions__continue_holding => "Continue\nholding",
|
Self::instructions__continue_holding => "Continue\nholding",
|
||||||
|
#[cfg(feature = "layout_eckhart")]
|
||||||
|
Self::instructions__continue_holding => "Keep holding",
|
||||||
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__hold_to_exit_tutorial => "Hold to exit tutorial",
|
Self::instructions__hold_to_exit_tutorial => "Hold to exit tutorial",
|
||||||
@ -2816,7 +2822,6 @@ impl TranslatedString {
|
|||||||
Self::solana__stake_on_question => "Stake SOL on {0}?",
|
Self::solana__stake_on_question => "Stake SOL on {0}?",
|
||||||
Self::sign_message__confirm_without_review => "Confirm without review",
|
Self::sign_message__confirm_without_review => "Confirm without review",
|
||||||
Self::instructions__tap_to_continue => "Tap to continue",
|
Self::instructions__tap_to_continue => "Tap to continue",
|
||||||
Self::instructions__keep_holding => "Keep holding",
|
|
||||||
Self::reset__share_words_first => "Write down the first word from the backup.",
|
Self::reset__share_words_first => "Write down the first word from the backup.",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4215,7 +4220,6 @@ impl TranslatedString {
|
|||||||
Qstr::MP_QSTR_solana__stake_on_question => Some(Self::solana__stake_on_question),
|
Qstr::MP_QSTR_solana__stake_on_question => Some(Self::solana__stake_on_question),
|
||||||
Qstr::MP_QSTR_sign_message__confirm_without_review => Some(Self::sign_message__confirm_without_review),
|
Qstr::MP_QSTR_sign_message__confirm_without_review => Some(Self::sign_message__confirm_without_review),
|
||||||
Qstr::MP_QSTR_instructions__tap_to_continue => Some(Self::instructions__tap_to_continue),
|
Qstr::MP_QSTR_instructions__tap_to_continue => Some(Self::instructions__tap_to_continue),
|
||||||
Qstr::MP_QSTR_instructions__keep_holding => Some(Self::instructions__keep_holding),
|
|
||||||
Qstr::MP_QSTR_reset__share_words_first => Some(Self::reset__share_words_first),
|
Qstr::MP_QSTR_reset__share_words_first => Some(Self::reset__share_words_first),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
|
@ -144,7 +144,7 @@ impl ActionBar {
|
|||||||
.map(|dur| {
|
.map(|dur| {
|
||||||
HoldToConfirmAnim::new()
|
HoldToConfirmAnim::new()
|
||||||
.with_duration(dur)
|
.with_duration(dur)
|
||||||
.with_header_overlay(TR::instructions__keep_holding.into())
|
.with_header_overlay(TR::instructions__continue_holding.into())
|
||||||
});
|
});
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
|
@ -386,14 +386,13 @@ class TR:
|
|||||||
inputs__return: str = "RETURN"
|
inputs__return: str = "RETURN"
|
||||||
inputs__show: str = "SHOW"
|
inputs__show: str = "SHOW"
|
||||||
inputs__space: str = "SPACE"
|
inputs__space: str = "SPACE"
|
||||||
instructions__continue_holding: str = "Continue\nholding"
|
instructions__continue_holding: str = ""
|
||||||
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__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_exit_tutorial: str = "Hold to exit tutorial"
|
||||||
instructions__hold_to_sign: str = "Hold to sign"
|
instructions__hold_to_sign: str = "Hold to sign"
|
||||||
instructions__keep_holding: str = "Keep holding"
|
|
||||||
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}"
|
||||||
instructions__shares_start_with_1: str = "Start with share #1"
|
instructions__shares_start_with_1: str = "Start with share #1"
|
||||||
|
@ -388,14 +388,13 @@
|
|||||||
"inputs__return": "RETURN",
|
"inputs__return": "RETURN",
|
||||||
"inputs__show": "SHOW",
|
"inputs__show": "SHOW",
|
||||||
"inputs__space": "SPACE",
|
"inputs__space": "SPACE",
|
||||||
"instructions__continue_holding": "Continue\nholding",
|
"instructions__continue_holding": {"Bolt": "", "Caesar": "", "Delizia": "Continue\nholding", "Eckhart": "Keep holding"},
|
||||||
"instructions__continue_in_app": "Continue in the app",
|
"instructions__continue_in_app": "Continue in the app",
|
||||||
"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__hold_to_exit_tutorial": "Hold to 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__keep_holding": "Keep holding",
|
|
||||||
"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}",
|
||||||
"instructions__shares_start_with_1": "Start with share #1",
|
"instructions__shares_start_with_1": "Start with share #1",
|
||||||
|
@ -991,6 +991,5 @@
|
|||||||
"989": "solana__stake_on_question",
|
"989": "solana__stake_on_question",
|
||||||
"990": "sign_message__confirm_without_review",
|
"990": "sign_message__confirm_without_review",
|
||||||
"991": "instructions__tap_to_continue",
|
"991": "instructions__tap_to_continue",
|
||||||
"992": "instructions__keep_holding",
|
"992": "reset__share_words_first"
|
||||||
"993": "reset__share_words_first"
|
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"current": {
|
"current": {
|
||||||
"merkle_root": "19d4e95a0a33b04208bf228d5e00dceb75e0f0a59fc2fde24a8c53a3f61f6866",
|
"merkle_root": "6684203c68c3a64d607c948fac5eeaa9f349f0e81cf54c8dfc662d5a8d3662e8",
|
||||||
"datetime": "2025-02-26T14:55:24.158526",
|
"datetime": "2025-02-26T16:20:10.257648",
|
||||||
"commit": "d2061b7671c84edd65033f7e22d65deda13cad06"
|
"commit": "1f4a43feee5e3f959d638a300b6faf2235c69a82"
|
||||||
},
|
},
|
||||||
"history": [
|
"history": [
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user