WIP - minimize TT's UI diff

core/embed/rust/src/ui/model_tt/layout.rs

@@ -744,7 +744,7 @@ extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs:
             Paragraph::new(
                 &theme::TEXT_NORMAL,
                 StrBuffer::from(tr("reset__by_continuing")),
-            ),
+            ).with_bottom_padding(17), // simulating a carriage return
             Paragraph::new(
                 &theme::TEXT_NORMAL,
                 StrBuffer::from(tr("reset__more_info_at")),

core/embed/rust/src/ui/translations/cs.json

@@ -544,12 +544,12 @@
     "invalid_pin": "Neplatný PIN",
     "last_attempt": "Poslední pokus",
     "mismatch": "Zadané PINy nesouhlasí!",
+    "pin_mismatch": "NESHODA PIN",
     "please_check_again": "Zkontrolujte prosím znovu.",
     "reenter_new": "Znovu PIN",
     "reenter_to_confirm": "Pro potvrzení znovu zadejte PIN.",
     "should_be_long": "PIN by měl být 4-50 číslic dlouhý.",
     "title_check_pin": "ZKONTROLOVAT PIN",
-    "title_mismatch": "NESHODA PIN",
     "title_settings": "NASTAVENÍ PINU",
     "title_wrong_pin": "ŠPATNÝ ŠPENDLÍK",
     "tries_left": "zbývající pokusy",
@@ -657,10 +657,12 @@
     "share_words_title": "STANDARDNÍ ZÁLOHA",
     "slip39_checklist_num_groups": "Počet skupin",
     "slip39_checklist_num_shares": "Počet podílů",
+    "slip39_checklist_set_num_shares": "Nastavit počet akcií",
     "slip39_checklist_set_sizes": "Nastavit velikosti a prahy",
     "slip39_checklist_set_threshold": "Nastavit práh",
     "slip39_checklist_title": "KONTROLNÍ SEZNAM ZÁLOHY",
     "slip39_checklist_write_down": "Zapsat a ověřit podíly",
+    "slip39_checklist_write_down_recovery": "Zapište si a zkontrolujte všechny obnovovací akcie",
     "the_threshold_sets_the_number_of_shares": "Prah určuje počet podílů ",
     "threshold_info": "= minimální počet unikátních seznamů slov použitých pro obnovení.",
     "title_backup_is_done": "ZÁLOHA JE HOTOVÁ",
@@ -878,10 +880,10 @@
     "reenter_to_confirm": "Pro potvrzení znovu zadejte kód pro vymazání.",
     "title_check": "ZKONTROLOVAT KÓD PRO VYMAZÁNÍ",
     "title_invalid": "NEPLATNÝ KÓD PRO VYMAZÁNÍ",
-    "title_mismatch": "NESHODA KÓDU PRO VYMAZÁNÍ",
     "title_settings": "NASTAVENÍ KÓDU PRO VYMAZÁNÍ",
     "turn_off": "Vypnout ochranu kódem pro vymazání?",
-    "turn_on": "Zapnout ochranu kódem pro vymazání?"
+    "turn_on": "Zapnout ochranu kódem pro vymazání?",
+    "wipe_code_mismatch": "NESHODA KÓDU PRO VYMAZÁNÍ"
   },
   "word_count": {
     "title": "POČET SLOV"

core/embed/rust/src/ui/translations/cs.rs

@@ -488,12 +488,12 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     pin__invalid_pin: "Neplatný PIN",
     pin__last_attempt: "Poslední pokus",
     pin__mismatch: "Zadané PINy nesouhlasí!",
+    pin__pin_mismatch: "NESHODA PIN",
     pin__please_check_again: "Zkontrolujte prosím znovu.",
     pin__reenter_new: "Znovu PIN",
     pin__reenter_to_confirm: "Pro potvrzení znovu zadejte PIN.",
     pin__should_be_long: "PIN by měl být 4-50 číslic dlouhý.",
     pin__title_check_pin: "ZKONTROLOVAT PIN",
-    pin__title_mismatch: "NESHODA PIN",
     pin__title_settings: "NASTAVENÍ PINU",
     pin__title_wrong_pin: "ŠPATNÝ ŠPENDLÍK",
     pin__tries_left: "zbývající pokusy",
@@ -593,10 +593,12 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     reset__share_words_title: "STANDARDNÍ ZÁLOHA",
     reset__slip39_checklist_num_groups: "Počet skupin",
     reset__slip39_checklist_num_shares: "Počet podílů",
+    reset__slip39_checklist_set_num_shares: "Nastavit počet akcií",
     reset__slip39_checklist_set_sizes: "Nastavit velikosti a prahy",
     reset__slip39_checklist_set_threshold: "Nastavit práh",
     reset__slip39_checklist_title: "KONTROLNÍ SEZNAM ZÁLOHY",
     reset__slip39_checklist_write_down: "Zapsat a ověřit podíly",
+    reset__slip39_checklist_write_down_recovery: "Zapište si a zkontrolujte všechny obnovovací akcie",
     reset__the_threshold_sets_the_number_of_shares: "Prah určuje počet podílů ",
     reset__threshold_info: "= minimální počet unikátních seznamů slov použitých pro obnovení.",
     reset__title_backup_is_done: "ZÁLOHA JE HOTOVÁ",
@@ -788,10 +790,10 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     wipe_code__reenter_to_confirm: "Pro potvrzení znovu zadejte kód pro vymazání.",
     wipe_code__title_check: "ZKONTROLOVAT KÓD PRO VYMAZÁNÍ",
     wipe_code__title_invalid: "NEPLATNÝ KÓD PRO VYMAZÁNÍ",
-    wipe_code__title_mismatch: "NESHODA KÓDU PRO VYMAZÁNÍ",
     wipe_code__title_settings: "NASTAVENÍ KÓDU PRO VYMAZÁNÍ",
     wipe_code__turn_off: "Vypnout ochranu kódem pro vymazání?",
     wipe_code__turn_on: "Zapnout ochranu kódem pro vymazání?",
+    wipe_code__wipe_code_mismatch: "NESHODA KÓDU PRO VYMAZÁNÍ",
     word_count__title: "POČET SLOV",
     words__are_you_sure: "Jste si jisti?",
     words__buying: "Koupit",

core/embed/rust/src/ui/translations/en.json

@@ -544,12 +544,12 @@
     "invalid_pin": "Invalid PIN",
     "last_attempt": "Last attempt",
     "mismatch": "Entered PINs do not match!",
+    "pin_mismatch": "PIN mismatch",
     "please_check_again": "Please check again.",
     "reenter_new": "Re-enter new PIN",
     "reenter_to_confirm": "Please re-enter PIN to confirm.",
     "should_be_long": "PIN should be 4-50 digits long.",
     "title_check_pin": "CHECK PIN",
-    "title_mismatch": "PIN MISMATCH",
     "title_settings": "PIN SETTINGS",
     "title_wrong_pin": "WRONG PIN",
     "tries_left": "tries left",
@@ -657,10 +657,12 @@
     "share_words_title": "STANDARD BACKUP",
     "slip39_checklist_num_groups": "Number of groups",
     "slip39_checklist_num_shares": "Number of shares",
+    "slip39_checklist_set_num_shares": "Set number of shares",
     "slip39_checklist_set_sizes": "Set sizes and thresholds",
     "slip39_checklist_set_threshold": "Set threshold",
     "slip39_checklist_title": "BACKUP CHECKLIST",
     "slip39_checklist_write_down": "Write down and check all shares",
+    "slip39_checklist_write_down_recovery": "Write down and check all recovery shares",
     "the_threshold_sets_the_number_of_shares": "The threshold sets the number of shares ",
     "threshold_info": "= minimum number of unique word lists used for recovery.",
     "title_backup_is_done": "BACKUP IS DONE",
@@ -721,7 +723,7 @@
     "title_problem": "SD CARD PROBLEM",
     "unknown_filesystem": "Unknown filesystem.",
     "unplug_and_insert_correct": "Please unplug the device and insert the correct SD card.",
-    "use_different_card": "Use a different card or format the SD card to the FAT32 filesystem",
+    "use_different_card": "Use a different card or format the SD card to the FAT32 filesystem.",
     "wanna_format": "Do you really want to format the SD card?",
     "wrong_sd_card": "Wrong SD card."
   },
@@ -878,10 +880,10 @@
     "reenter_to_confirm": "Please re-enter wipe code to confirm.",
     "title_check": "CHECK WIPE CODE",
     "title_invalid": "INVALID WIPE CODE",
-    "title_mismatch": "WIPE CODE MISMATCH",
     "title_settings": "WIPE CODE SETTINGS",
     "turn_off": "Turn off wipe code protection?",
-    "turn_on": "Turn on wipe code protection?"
+    "turn_on": "Turn on wipe code protection?",
+    "wipe_code_mismatch": "Wipe code mismatch"
   },
   "word_count": {
     "title": "NUMBER OF WORDS"

core/embed/rust/src/ui/translations/en.rs

@@ -488,12 +488,12 @@ pub const EN_TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     pin__invalid_pin: "Invalid PIN",
     pin__last_attempt: "Last attempt",
     pin__mismatch: "Entered PINs do not match!",
+    pin__pin_mismatch: "PIN mismatch",
     pin__please_check_again: "Please check again.",
     pin__reenter_new: "Re-enter new PIN",
     pin__reenter_to_confirm: "Please re-enter PIN to confirm.",
     pin__should_be_long: "PIN should be 4-50 digits long.",
     pin__title_check_pin: "CHECK PIN",
-    pin__title_mismatch: "PIN MISMATCH",
     pin__title_settings: "PIN SETTINGS",
     pin__title_wrong_pin: "WRONG PIN",
     pin__tries_left: "tries left",
@@ -593,10 +593,12 @@ pub const EN_TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     reset__share_words_title: "STANDARD BACKUP",
     reset__slip39_checklist_num_groups: "Number of groups",
     reset__slip39_checklist_num_shares: "Number of shares",
+    reset__slip39_checklist_set_num_shares: "Set number of shares",
     reset__slip39_checklist_set_sizes: "Set sizes and thresholds",
     reset__slip39_checklist_set_threshold: "Set threshold",
     reset__slip39_checklist_title: "BACKUP CHECKLIST",
     reset__slip39_checklist_write_down: "Write down and check all shares",
+    reset__slip39_checklist_write_down_recovery: "Write down and check all recovery shares",
     reset__the_threshold_sets_the_number_of_shares: "The threshold sets the number of shares ",
     reset__threshold_info: "= minimum number of unique word lists used for recovery.",
     reset__title_backup_is_done: "BACKUP IS DONE",
@@ -649,7 +651,7 @@ pub const EN_TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     sd_card__title_problem: "SD CARD PROBLEM",
     sd_card__unknown_filesystem: "Unknown filesystem.",
     sd_card__unplug_and_insert_correct: "Please unplug the device and insert the correct SD card.",
-    sd_card__use_different_card: "Use a different card or format the SD card to the FAT32 filesystem",
+    sd_card__use_different_card: "Use a different card or format the SD card to the FAT32 filesystem.",
     sd_card__wanna_format: "Do you really want to format the SD card?",
     sd_card__wrong_sd_card: "Wrong SD card.",
     send__address_path: "address path",
@@ -788,10 +790,10 @@ pub const EN_TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     wipe_code__reenter_to_confirm: "Please re-enter wipe code to confirm.",
     wipe_code__title_check: "CHECK WIPE CODE",
     wipe_code__title_invalid: "INVALID WIPE CODE",
-    wipe_code__title_mismatch: "WIPE CODE MISMATCH",
     wipe_code__title_settings: "WIPE CODE SETTINGS",
     wipe_code__turn_off: "Turn off wipe code protection?",
     wipe_code__turn_on: "Turn on wipe code protection?",
+    wipe_code__wipe_code_mismatch: "Wipe code mismatch",
     word_count__title: "NUMBER OF WORDS",
     words__are_you_sure: "Are you sure?",
     words__buying: "Buying",

core/embed/rust/src/ui/translations/export.rs

@@ -498,12 +498,12 @@ pub static mp_module_trezortranslate: Module = obj_module! {
     ///     "pin__invalid_pin",
     ///     "pin__last_attempt",
     ///     "pin__mismatch",
+    ///     "pin__pin_mismatch",
     ///     "pin__please_check_again",
     ///     "pin__reenter_new",
     ///     "pin__reenter_to_confirm",
     ///     "pin__should_be_long",
     ///     "pin__title_check_pin",
-    ///     "pin__title_mismatch",
     ///     "pin__title_settings",
     ///     "pin__title_wrong_pin",
     ///     "pin__tries_left",
@@ -603,10 +603,12 @@ pub static mp_module_trezortranslate: Module = obj_module! {
     ///     "reset__share_words_title",
     ///     "reset__slip39_checklist_num_groups",
     ///     "reset__slip39_checklist_num_shares",
+    ///     "reset__slip39_checklist_set_num_shares",
     ///     "reset__slip39_checklist_set_sizes",
     ///     "reset__slip39_checklist_set_threshold",
     ///     "reset__slip39_checklist_title",
     ///     "reset__slip39_checklist_write_down",
+    ///     "reset__slip39_checklist_write_down_recovery",
     ///     "reset__the_threshold_sets_the_number_of_shares",
     ///     "reset__threshold_info",
     ///     "reset__title_backup_is_done",
@@ -798,10 +800,10 @@ pub static mp_module_trezortranslate: Module = obj_module! {
     ///     "wipe_code__reenter_to_confirm",
     ///     "wipe_code__title_check",
     ///     "wipe_code__title_invalid",
-    ///     "wipe_code__title_mismatch",
     ///     "wipe_code__title_settings",
     ///     "wipe_code__turn_off",
     ///     "wipe_code__turn_on",
+    ///     "wipe_code__wipe_code_mismatch",
     ///     "word_count__title",
     ///     "words__are_you_sure",
     ///     "words__buying",

core/embed/rust/src/ui/translations/fr.json

@@ -544,12 +544,12 @@
     "invalid_pin": "La broche que vous avez entrée n'est pas valide.",
     "last_attempt": "Dernière tentative",
     "mismatch": "Les épingles entrées ne correspondent pas!",
+    "pin_mismatch": "Non-concordance",
     "please_check_again": "Veuillez vérifier à nouveau.",
     "reenter_new": "Rentrez à la nouvelle épingle",
     "reenter_to_confirm": "Veuillez réintégrer la broche pour confirmer.",
     "should_be_long": "La broche doit avoir 4 à 50 chiffres de long.",
     "title_check_pin": "ÉPINGLE",
-    "title_mismatch": "NON-CONCORDANCE",
     "title_settings": "PARAMÈTRES DE LA BROCHE",
     "title_wrong_pin": "MAUVAISE ÉPINGLE",
     "tries_left": "essaie à gauche",
@@ -657,10 +657,12 @@
     "share_words_title": "SAUVEGARDE STANDARD",
     "slip39_checklist_num_groups": "Nombre de groupes",
     "slip39_checklist_num_shares": "Nombre de partages",
+    "slip39_checklist_set_num_shares": "Définir le nombre d'actions",
     "slip39_checklist_set_sizes": "Régler les tailles et les seuils",
     "slip39_checklist_set_threshold": "Définir le seuil",
     "slip39_checklist_title": "LISTE DE CONTRÔLE DE SAUVEGARDE",
     "slip39_checklist_write_down": "Notez et vérifiez toutes les partages",
+    "slip39_checklist_write_down_recovery": "Notez et vérifiez toutes les parts de récupération",
     "the_threshold_sets_the_number_of_shares": "Le seuil définit le nombre d'actions",
     "threshold_info": "= Nombre minimum de listes de mots uniques utilisées pour la récupération.",
     "title_backup_is_done": "LA SAUVEGARDE EST TERMINÉE",
@@ -878,10 +880,10 @@
     "reenter_to_confirm": "Veuillez réintégrer le code d'essuyage pour confirmer.",
     "title_check": "VÉRIFIER LE CODE D'ESSUYAGE",
     "title_invalid": "CODE D'ESSUYAGE NON VALIDE",
-    "title_mismatch": "EFFACER LE DÉCALAGE DU CODE",
     "title_settings": "EFFACER LES PARAMÈTRES DU CODE",
     "turn_off": "Désactiver la protection du code d'essuyage?",
-    "turn_on": "Activer la protection du code d'essuyage?"
+    "turn_on": "Activer la protection du code d'essuyage?",
+    "wipe_code_mismatch": "Effacer le décalage du code"
   },
   "word_count": {
     "title": "NOMBRE DE MOTS"

core/embed/rust/src/ui/translations/fr.rs

@@ -488,12 +488,12 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     pin__invalid_pin: "La broche que vous avez entrée n'est pas valide.",
     pin__last_attempt: "Dernière tentative",
     pin__mismatch: "Les épingles entrées ne correspondent pas!",
+    pin__pin_mismatch: "Non-concordance",
     pin__please_check_again: "Veuillez vérifier à nouveau.",
     pin__reenter_new: "Rentrez à la nouvelle épingle",
     pin__reenter_to_confirm: "Veuillez réintégrer la broche pour confirmer.",
     pin__should_be_long: "La broche doit avoir 4 à 50 chiffres de long.",
     pin__title_check_pin: "ÉPINGLE",
-    pin__title_mismatch: "NON-CONCORDANCE",
     pin__title_settings: "PARAMÈTRES DE LA BROCHE",
     pin__title_wrong_pin: "MAUVAISE ÉPINGLE",
     pin__tries_left: "essaie à gauche",
@@ -593,10 +593,12 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     reset__share_words_title: "SAUVEGARDE STANDARD",
     reset__slip39_checklist_num_groups: "Nombre de groupes",
     reset__slip39_checklist_num_shares: "Nombre de partages",
+    reset__slip39_checklist_set_num_shares: "Définir le nombre d'actions",
     reset__slip39_checklist_set_sizes: "Régler les tailles et les seuils",
     reset__slip39_checklist_set_threshold: "Définir le seuil",
     reset__slip39_checklist_title: "LISTE DE CONTRÔLE DE SAUVEGARDE",
     reset__slip39_checklist_write_down: "Notez et vérifiez toutes les partages",
+    reset__slip39_checklist_write_down_recovery: "Notez et vérifiez toutes les parts de récupération",
     reset__the_threshold_sets_the_number_of_shares: "Le seuil définit le nombre d'actions",
     reset__threshold_info: "= Nombre minimum de listes de mots uniques utilisées pour la récupération.",
     reset__title_backup_is_done: "LA SAUVEGARDE EST TERMINÉE",
@@ -788,10 +790,10 @@ pub const TRANSLATIONS: TranslationsGeneral = TranslationsGeneral {
     wipe_code__reenter_to_confirm: "Veuillez réintégrer le code d'essuyage pour confirmer.",
     wipe_code__title_check: "VÉRIFIER LE CODE D'ESSUYAGE",
     wipe_code__title_invalid: "CODE D'ESSUYAGE NON VALIDE",
-    wipe_code__title_mismatch: "EFFACER LE DÉCALAGE DU CODE",
     wipe_code__title_settings: "EFFACER LES PARAMÈTRES DU CODE",
     wipe_code__turn_off: "Désactiver la protection du code d'essuyage?",
     wipe_code__turn_on: "Activer la protection du code d'essuyage?",
+    wipe_code__wipe_code_mismatch: "Effacer le décalage du code",
     word_count__title: "NOMBRE DE MOTS",
     words__are_you_sure: "Es-tu sûr?",
     words__buying: "Achat",