chore(core): resort translation JSONs by keys

Done by: ``` cd core/translations python ./cli.py merge ??.json ```
trezor · Jan 15, 2025 · 3c44637 · 3c44637
1 parent 6f2cd10
commit 3c44637
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 93 deletions.
diff --git a/core/embed/rust/src/translations/generated/translated_string.rs b/core/embed/rust/src/translations/generated/translated_string.rs
diff --git a/core/translations/cs.json b/core/translations/cs.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_cs.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_cs.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_cs.json",
-      "4_FONT_BIG": "font_unifont_regular_16_cs.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_cs.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_cs.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_cs.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_cs.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_cs.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_cs.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_cs.json",
       "3_FONT_MONO": "font_robotomono_medium_21_cs.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_cs.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_cs.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_cs.json",
       "3_FONT_MONO": "font_robotomono_medium_21_cs.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_cs.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_cs.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_cs.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_cs.json",
+      "4_FONT_BIG": "font_unifont_regular_16_cs.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_cs.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_cs.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_cs.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {
@@ -421,7 +421,12 @@
     "homescreen__title_no_usb_connection": "Žádné připojení usb",
     "homescreen__title_pin_not_set": "Není nastaven PIN",
     "homescreen__title_seedless": "Bez seedu",
-    "homescreen__title_set": {"Bolt": "Změnit domov. obr.?", "Samson": "Změnit domov. obr.?", "Quicksilver": "Změnit domovskou obrazovku?", "LayoutTBD": "Změnit domovskou obrazovku?"},
+    "homescreen__title_set": {
+      "Bolt": "Změnit domov. obr.?",
+      "LayoutTBD": "Změnit domovskou obrazovku?",
+      "Quicksilver": "Změnit domovskou obrazovku?",
+      "Samson": "Změnit domov. obr.?"
+    },
     "inputs__back": "ZPĚT",
     "inputs__cancel": "ZRUŠIT",
     "inputs__delete": "ODSTRANIT",

diff --git a/core/translations/de.json b/core/translations/de.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_de.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_de.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_de.json",
-      "4_FONT_BIG": "font_unifont_regular_16_de.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_de.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_de.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_de.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_de.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_de.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_de.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_de.json",
       "3_FONT_MONO": "font_robotomono_medium_21_de.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_de.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_de.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_de.json",
       "3_FONT_MONO": "font_robotomono_medium_21_de.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_de.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_de.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_de.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_de.json",
+      "4_FONT_BIG": "font_unifont_regular_16_de.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_de.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_de.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_de.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {

diff --git a/core/translations/en.json b/core/translations/en.json
@@ -357,7 +357,11 @@
     "fido__title_reset": "FIDO2 reset",
     "fido__title_select_credential": "Select credential",
     "fido__title_u2f_auth": "U2F authenticate",
-    "fido__title_u2f_register": {"Bolt": "U2F register", "Samson": "U2F register", "Quicksilver": "U2F register"},
+    "fido__title_u2f_register": {
+      "Bolt": "U2F register",
+      "Quicksilver": "U2F register",
+      "Samson": "U2F register"
+    },
     "fido__title_verify_user": "FIDO2 verify user",
     "fido__unable_to_verify_user": "Unable to verify user.",
     "fido__wanna_erase_credentials": "Do you really want to erase all credentials?",
@@ -379,7 +383,11 @@
     "homescreen__title_no_usb_connection": "No USB connection",
     "homescreen__title_pin_not_set": "PIN not set",
     "homescreen__title_seedless": "Seedless",
-    "homescreen__title_set": {"Bolt": "Change wallpaper?", "Samson": "Change wallpaper?", "Quicksilver": "Change wallpaper?"},
+    "homescreen__title_set": {
+      "Bolt": "Change wallpaper?",
+      "Quicksilver": "Change wallpaper?",
+      "Samson": "Change wallpaper?"
+    },
     "inputs__back": "BACK",
     "inputs__cancel": "CANCEL",
     "inputs__delete": "DELETE",

diff --git a/core/translations/es.json b/core/translations/es.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_es.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_es.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_es.json",
-      "4_FONT_BIG": "font_unifont_regular_16_es.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_es.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_es.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_es.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_es.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_es.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_es.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_es.json",
       "3_FONT_MONO": "font_robotomono_medium_21_es.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_es.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_es.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_es.json",
       "3_FONT_MONO": "font_robotomono_medium_21_es.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_es.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_es.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_es.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_es.json",
+      "4_FONT_BIG": "font_unifont_regular_16_es.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_es.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_es.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_es.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {

diff --git a/core/translations/fr.json b/core/translations/fr.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_fr.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_fr.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_fr.json",
-      "4_FONT_BIG": "font_unifont_regular_16_fr.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_fr.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_fr.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_fr.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_fr.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_fr.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_fr.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_fr.json",
       "3_FONT_MONO": "font_robotomono_medium_21_fr.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_fr.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_fr.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_fr.json",
       "3_FONT_MONO": "font_robotomono_medium_21_fr.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_fr.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_fr.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_fr.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_fr.json",
+      "4_FONT_BIG": "font_unifont_regular_16_fr.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_fr.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_fr.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_fr.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {

diff --git a/core/translations/it.json b/core/translations/it.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_it.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_it.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_it.json",
-      "4_FONT_BIG": "font_unifont_regular_16_it.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_it.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_it.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_it.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_it.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_it.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_it.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_it.json",
       "3_FONT_MONO": "font_robotomono_medium_21_it.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_it.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_it.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_it.json",
       "3_FONT_MONO": "font_robotomono_medium_21_it.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_it.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_it.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_it.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_it.json",
+      "4_FONT_BIG": "font_unifont_regular_16_it.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_it.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_it.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_it.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {

diff --git a/core/translations/pt.json b/core/translations/pt.json
@@ -1,15 +1,5 @@
 {
   "fonts": {
-    "Samson": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_pt.json",
-      "2_FONT_BOLD": "font_pixeloperator_bold_8_pt.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_pt.json",
-      "4_FONT_BIG": "font_unifont_regular_16_pt.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_pt.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_pt.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_pt.json",
-      "8_FONT_SUB": null
-    },
     "Bolt": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_pt.json",
       "2_FONT_BOLD": null,
@@ -20,7 +10,7 @@
       "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_pt.json",
       "8_FONT_SUB": null
     },
-    "Quicksilver": {
+    "LayoutTBD": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_pt.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_pt.json",
       "3_FONT_MONO": "font_robotomono_medium_21_pt.json",
@@ -30,7 +20,7 @@
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_pt.json"
     },
-    "LayoutTBD": {
+    "Quicksilver": {
       "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_pt.json",
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_pt.json",
       "3_FONT_MONO": "font_robotomono_medium_21_pt.json",
@@ -39,6 +29,16 @@
       "6_FONT_NORMAL_UPPER": null,
       "7_FONT_BOLD_UPPER": null,
       "8_FONT_SUB": "font_ttsatoshi_demibold_18_pt.json"
+    },
+    "Samson": {
+      "1_FONT_NORMAL": "font_pixeloperator_regular_8_pt.json",
+      "2_FONT_BOLD": "font_pixeloperator_bold_8_pt.json",
+      "3_FONT_MONO": "font_pixeloperatormono_regular_8_pt.json",
+      "4_FONT_BIG": "font_unifont_regular_16_pt.json",
+      "5_FONT_DEMIBOLD": "font_unifont_bold_16_pt.json",
+      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_pt.json",
+      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_pt.json",
+      "8_FONT_SUB": null
     }
   },
   "header": {