fix(b&w): Bootloader "USB Connected" alignment (#3716)

* fix: Bootloader "USB Connected" alignment
Fixup from #2946

* fix: Different for colorlcd and b&w

* fix: Lets do this properly
Thanks @3djc for the hint to go to bed 😆

* fix: trim `edgetx-` in smaller b&w screens

radio/src/targets/taranis/bootloader/boot_menu.cpp

@@ -69,17 +69,17 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
 
     lcdDrawText(LCD_W / 2, 5 * FH + FH / 2, TR_BL_OR_PLUGIN_USB_CABLE, CENTERED);
 
-    // Remove "opentx-" from string
     const char * vers = getFirmwareVersion();
 #if LCD_W < 212
-    if (strncmp(vers, "opentx-", 7) == 0)
+    // Remove "edgetx-" from string
+    if (strncmp(vers, "edgetx-", 7) == 0)
       vers += 7;
 #endif
-    lcdDrawText(LCD_W / 2, 7 * FH, vers, CENTERED);
+    lcdDrawCenteredText(7 * FH, vers);
     lcdInvertLine(7);
   }
   else if (st == ST_USB) {
-    lcdDrawTextAlignedLeft(4 * FH, TR_BL_USB_CONNECTED);
+    lcdDrawCenteredText(4 * FH, TR_BL_USB_CONNECTED);
   }
   else if (st == ST_DIR_CHECK) {
     if (opt == FR_NO_PATH) {
@@ -101,8 +101,8 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
       if (memoryType == MEM_FLASH) {
         const char * vers = getFirmwareVersion((const char *)Block_buffer);
 #if LCD_W < 212
-        // Remove "opentx-" from string
+        // Remove "edgetx-" from string
-        if (strncmp(vers, "opentx-", 7) == 0)
+        if (strncmp(vers, "edgetx-", 7) == 0)
           vers += 7;
 #endif
         bootloaderDrawMsg(INDENT_WIDTH, vers, 0, false);
@@ -111,7 +111,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
     }
   }
   else if (st == ST_FLASHING) {
-    lcdDrawTextAlignedLeft(4 * FH, TR_BL_WRITING_FW);
+    lcdDrawCenteredText(4 * FH, TR_BL_WRITING_FW);
 
     lcdDrawRect(3, 6 * FH + 4, (LCD_W - 8), 7);
     lcdDrawSolidHorizontalLine(5, 6 * FH + 6, (LCD_W - 12) * opt / 100, FORCE);
@@ -119,7 +119,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char *str)
     lcdDrawSolidHorizontalLine(5, 6 * FH + 8, (LCD_W - 12) * opt / 100, FORCE);
   }
   else if (st == ST_FLASH_DONE) {
-    lcdDrawTextAlignedLeft(4 * FH, TR_BL_WRITING_COMPL);
+    lcdDrawCenteredText(4 * FH, TR_BL_WRITING_COMPL);
   }
 }
 

radio/src/translations/cn.h

@@ -967,7 +967,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -979,6 +978,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing..."
+#define TR_BL_WRITING_COMPL           "Writing complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -997,23 +998,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/cz.h

@@ -982,7 +982,6 @@
 #endif
 
 // Bootloader common (Poznamka: nutne pouziti textu bez diakritiky - omezeni velikosti pameti bootloader!)
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB pripojeno"
 #define TR_BL_USB_CONNECTED           "USB pripojeno"
 #define TR_BL_USB_PLUGIN              "nebo pripojte USB kabel"
 #define TR_BL_USB_MASS_STORE          "pro pouziti uloziste"
@@ -994,6 +993,8 @@
 #define TR_BL_EXIT                    "Ukoncit"
 #define TR_BL_DIR_MISSING             " Adresar chybi"
 #define TR_BL_DIR_EMPTY               " Adresar je prazdny"
+#define TR_BL_WRITING_FW              "Nahravani firmware ..."
+#define TR_BL_WRITING_COMPL           "Nahravani dokonceno"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Neplatny soubor s firmwarem"
@@ -1012,23 +1013,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Obnovit EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Nahravani..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Nahravani dokonceno"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Stisknete tlacitko napajeni."
     #define TR_BL_FLASH_EXIT          "Ukoncit rezim nahravani."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Nahravani firmware ..."
-  #define TR_BL_WRITING_COMPL         "Nahravani dokonceno"
   #define TR_BL_SELECT_KEY            "[ENT] pro vybrani souboru"
   #define TR_BL_FLASH_KEY             "Drzet dlouze [ENT] pro nahrani"
   #define TR_BL_EXIT_KEY              "[RTN] pro ukonceni"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Nahravani firmware ..."
-  #define TR_BL_WRITING_COMPL         "Nahravani dokonceno"
   #define TR_BL_RF_USB_ACCESS         "RF USB pristup"
   #define TR_BL_CURRENT_FW            "Aktualni firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] pro vybrani souboru"

radio/src/translations/da.h

@@ -981,7 +981,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB forbundet"
 #define TR_BL_USB_CONNECTED           "USB forbundet"
 #define TR_BL_USB_PLUGIN              "eller brug USB kabel"
 #define TR_BL_USB_MASS_STORE          "for USB disk"
@@ -993,6 +992,8 @@
 #define TR_BL_EXIT                    "Forlad"
 #define TR_BL_DIR_MISSING             " Katalog mangler"
 #define TR_BL_DIR_EMPTY               " Katalog er tomt"
+#define TR_BL_WRITING_FW              "Installerer..."
+#define TR_BL_WRITING_COMPL           "Installation slut"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Ikke en installationsfil!"
@@ -1011,23 +1012,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Genskab EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Installerer..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Installation slut"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Tryk power knap."
     #define TR_BL_FLASH_EXIT          "Forlad installation tilstand."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Installerer firmware ..."
-  #define TR_BL_WRITING_COMPL         "Installation slut"
   #define TR_BL_SELECT_KEY            "[ENT] for at bruge fil"
   #define TR_BL_FLASH_KEY             "[ENT] lang tid for at starte"
   #define TR_BL_EXIT_KEY              "[RTN] for at forlade"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Installerer firmware ..."
-  #define TR_BL_WRITING_COMPL         "Installation slut"
   #define TR_BL_RF_USB_ACCESS         "RF USB adgang"
   #define TR_BL_CURRENT_FW            "Firmware version:"
   #define TR_BL_SELECT_KEY            "[R TRIM] for at bruge fil"

radio/src/translations/de.h

@@ -961,7 +961,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB verbunden"
 #define TR_BL_USB_CONNECTED           "USB verbunden"
 #define TR_BL_USB_PLUGIN              "Oder schließen Sie ein USB-Kabel"
 #define TR_BL_USB_MASS_STORE          "für den SD-Speicher an"
@@ -973,6 +972,8 @@
 #define TR_BL_EXIT                    "Beenden"
 #define TR_BL_DIR_MISSING             " Verzeichnis fehlt"
 #define TR_BL_DIR_EMPTY               " Verzeichnis leer"
+#define TR_BL_WRITING_FW              "Schreibe..."
+#define TR_BL_WRITING_COMPL           "Schreiben abgeschlossen"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Keine gültige Firmwaredatei"
@@ -991,23 +992,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "EEPROM wiederherstellen"
-  #define TR_BL_WRITING_FW            CENTER "\015Schreibe..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Schreiben abgeschlossen"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Drücke den Power Knopf."
     #define TR_BL_FLASH_EXIT          "Verlasse den Flashmodus."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Schreibe Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Schreiben abgeschlossen"
   #define TR_BL_SELECT_KEY            "[ENT] um Datei auszuwählen"
   #define TR_BL_FLASH_KEY             "Halte [ENT] gedrückt, zum schreiben"
   #define TR_BL_EXIT_KEY              "[RTN] zum beenden"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Schreibe Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Schreiben abgeschlossen"
   #define TR_BL_RF_USB_ACCESS         "RF USB Zugriff"
   #define TR_BL_CURRENT_FW            "Aktuelle Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] um Datei auszuwählen"

radio/src/translations/en.h

@@ -976,7 +976,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -988,6 +987,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing..."
+#define TR_BL_WRITING_COMPL           "Writing complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1006,23 +1007,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/es.h

@@ -979,7 +979,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -991,6 +990,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing..."
+#define TR_BL_WRITING_COMPL           "Writing complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1009,23 +1010,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/fi.h

@@ -991,7 +991,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -1003,6 +1002,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing..."
+#define TR_BL_WRITING_COMPL           "Writing complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1021,23 +1022,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/fr.h

@@ -992,7 +992,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connecte"
 #define TR_BL_USB_CONNECTED           "USB Connecte"
 #define TR_BL_USB_PLUGIN              "ou branchez cable USB"
 #define TR_BL_USB_MASS_STORE          "pour stockage de masse"
@@ -1004,6 +1003,8 @@
 #define TR_BL_EXIT                    "Quitter"
 #define TR_BL_DIR_MISSING             " Repertoire absent"
 #define TR_BL_DIR_EMPTY               " Repertoire vide"
+#define TR_BL_WRITING_FW              "Ecriture Firmware ..."
+#define TR_BL_WRITING_COMPL           "Ecriture terminée"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Fichier firmware non valide"
@@ -1022,23 +1023,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restaurer EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Ecriture ..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Ecriture terminee"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Appuyez sur le bouton power."
     #define TR_BL_FLASH_EXIT          "Quitter mode flashage."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Ecriture Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Ecriture terminée"
   #define TR_BL_SELECT_KEY            "[ENT] pour select. fichier"
   #define TR_BL_FLASH_KEY             "Appui long [ENT] pour flasher"
   #define TR_BL_EXIT_KEY              "[RTN] pour quitter"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Ecriture Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Ecriture terminée"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Firmware actuel:"
   #define TR_BL_SELECT_KEY            "[R TRIM] pour sélect. fichier"

radio/src/translations/he.h

@@ -1053,7 +1053,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011חיבור חוטי חובר"
 #define TR_BL_USB_CONNECTED           "חיבור חוטי חובר"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -1065,6 +1064,8 @@
 #define TR_BL_EXIT                    "יציאה"
 #define TR_BL_DIR_MISSING             " ארכיון חסר"
 #define TR_BL_DIR_EMPTY               " ארכיון ריק"
+#define TR_BL_WRITING_FW              "... כותב תוכנה"
+#define TR_BL_WRITING_COMPL           "כתיבה הושלמה"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1083,23 +1084,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015...ממתין"
-  #define TR_BL_WRITING_COMPL         CENTER "\007כתיבה הושלמה"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "לחץ על כפתור ההפעלה"
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "... כותב תוכנה"
-  #define TR_BL_WRITING_COMPL         "כתיבה הושלמה"
   #define TR_BL_SELECT_KEY            "[ENT] לבחירת קובץ"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] ליציאה"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/it.h

@@ -973,7 +973,6 @@
 #endif
 
 // Bootloader common
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connessa"
 #define TR_BL_USB_CONNECTED           "USB Connessa"
 #define TR_BL_USB_PLUGIN              "O connetti il cavo USB"
 #define TR_BL_USB_MASS_STORE          "per memoria di massa"
@@ -985,6 +984,8 @@
 #define TR_BL_EXIT                    "Esci"
 #define TR_BL_DIR_MISSING             " Cartella non trovata"
 #define TR_BL_DIR_EMPTY               " Cartella vuota"
+#define TR_BL_WRITING_FW              "Scrittura Firmware..."
+#define TR_BL_WRITING_COMPL           "Scrittura completata"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Firmware non valido"
@@ -1003,23 +1004,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific
   #define TR_BL_RESTORE_EEPROM        "Ripristino EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Scrittura..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Scrittura completata"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Premi il bottone d'accensione"
     #define TR_BL_FLASH_EXIT          "Esci dal modo scrittura."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific
-  #define TR_BL_WRITING_FW            "Scrittura Firmware..."
-  #define TR_BL_WRITING_COMPL         "Scrittura completata"
   #define TR_BL_SELECT_KEY            "[ENT] per scegliere il file"
   #define TR_BL_FLASH_KEY             "Tenere premuto [ENT] per scrivere"
   #define TR_BL_EXIT_KEY              "[RTN] per uscire"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific
-  #define TR_BL_WRITING_FW            "Scrittura Firmware..."
-  #define TR_BL_WRITING_COMPL         "Scrittura completata"
   #define TR_BL_RF_USB_ACCESS         "RF Accesso USB"
   #define TR_BL_CURRENT_FW            "Firmware corrente:"
   #define TR_BL_SELECT_KEY            "[R TRIM] per scegliere il file"

radio/src/translations/jp.h

@@ -972,7 +972,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -984,6 +983,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing Firmware ..."
+#define TR_BL_WRITING_COMPL           "Writing Complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1002,23 +1003,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/nl.h

@@ -984,7 +984,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -996,6 +995,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing Firmware ..."
+#define TR_BL_WRITING_COMPL           "Writing Complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1014,23 +1015,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/pl.h

@@ -972,7 +972,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB polaczone"
 #define TR_BL_USB_CONNECTED           "USB polaczone"
 #define TR_BL_USB_PLUGIN              "lub podlacz kabel USB"
 #define TR_BL_USB_MASS_STORE          "dla trybu danych"
@@ -984,6 +983,8 @@
 #define TR_BL_EXIT                    "Wyjdz"
 #define TR_BL_DIR_MISSING             " Brak katalogu"
 #define TR_BL_DIR_EMPTY               " Katalog jest pusty"
+#define TR_BL_WRITING_FW              "Zapis firmware ..."
+#define TR_BL_WRITING_COMPL           "Zapis ukonczony"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Nieprawidlowy plik firmware"
@@ -1002,23 +1003,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Przywroc EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Zapis..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Zapis ukonczony"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Nacisnij przycisk Power"
     #define TR_BL_FLASH_EXIT          "Wyjdz z trybu flashowania"
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Zapis firmware ..."
-  #define TR_BL_WRITING_COMPL         "Zapis ukonczony"
   #define TR_BL_SELECT_KEY            "[ENT] aby wybrac plik"
   #define TR_BL_FLASH_KEY             "Przytrzymaj [ENT] aby flashowac"
   #define TR_BL_EXIT_KEY              "[RTN] aby wyjsc"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Zapis firmware ..."
-  #define TR_BL_WRITING_COMPL         "Zapis ukonczony"
   #define TR_BL_RF_USB_ACCESS         "Dostep RF USB"
   #define TR_BL_CURRENT_FW            "Obecny firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] aby wybrac plik"

radio/src/translations/pt.h

@@ -981,7 +981,6 @@
 #endif
 
 // Bootloader common - Ascii only
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -993,6 +992,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing Firmware ..."
+#define TR_BL_WRITING_COMPL           "Writing Complete"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1011,23 +1012,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific - Ascii only
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific - Ascii only
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"

radio/src/translations/se.h

@@ -1008,7 +1008,6 @@
 #endif
 
 // Bootloader common
-#define TR_BL_USB_CONNECT_BOOT          CENTER "\011USB ansluten"
 #define TR_BL_USB_CONNECTED             "USB ansluten"
 #define TR_BL_USB_PLUGIN                "Eller anslut med en USB-kabel"
 #define TR_BL_USB_MASS_STORE            "foer masslagring"
@@ -1020,6 +1019,8 @@
 #define TR_BL_EXIT                      "Avsluta"
 #define TR_BL_DIR_MISSING               " Katalogen saknas"
 #define TR_BL_DIR_EMPTY                 " Katalogen aer tom"
+#define TR_BL_WRITING_FW                "Skriver firmware ..."
+#define TR_BL_WRITING_COMPL             "Skrivning klar"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE        "Inte en giltig firmwarefil"
@@ -1038,23 +1039,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific
   #define TR_BL_RESTORE_EEPROM          "Aaterställ EEPROM"
-  #define TR_BL_WRITING_FW              CENTER "\015Skriver..."
-  #define TR_BL_WRITING_COMPL           CENTER "\007Skrivning klar"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY             "Tryck paa startknappen."
     #define TR_BL_FLASH_EXIT            "Avsluta flashningsläget."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific
-  #define TR_BL_WRITING_FW              "Skriver firmware ..."
-  #define TR_BL_WRITING_COMPL           "Skrivning klar"
   #define TR_BL_SELECT_KEY              "[ENT] för att vaelja fil"
   #define TR_BL_FLASH_KEY               "Tryck [ENT] foer att flasha"
   #define TR_BL_EXIT_KEY                "[RTN] foer att avbryta"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific
-  #define TR_BL_WRITING_FW              "Skriver firmware ..."
-  #define TR_BL_WRITING_COMPL           "Skrivning klar"
   #define TR_BL_RF_USB_ACCESS           "RF USB access"
   #define TR_BL_CURRENT_FW              "Nuvarande firmware:"
   #define TR_BL_SELECT_KEY              "[R TRIM] foer att vaelja fil"

radio/src/translations/tw.h

@@ -971,7 +971,6 @@
 #endif
 
 // Bootloader common
-#define TR_BL_USB_CONNECT_BOOT        CENTER "\011USB Connected"
 #define TR_BL_USB_CONNECTED           "USB Connected"
 #define TR_BL_USB_PLUGIN              "Or plug in a USB cable"
 #define TR_BL_USB_MASS_STORE          "for mass storage"
@@ -983,6 +982,8 @@
 #define TR_BL_EXIT                    "Exit"
 #define TR_BL_DIR_MISSING             " Directory is missing"
 #define TR_BL_DIR_EMPTY               " Directory is empty"
+#define TR_BL_WRITING_FW              "Writing Firmware ..."
+#define TR_BL_WRITING_COMPL           "Writing Completed"
 
 #if LCD_W >= 480
   #define TR_BL_INVALID_FIRMWARE       "Not a valid firmware file"
@@ -1001,23 +1002,17 @@
 #if defined(PCBTARANIS)
    // Bootloader Taranis specific
   #define TR_BL_RESTORE_EEPROM        "Restore EEPROM"
-  #define TR_BL_WRITING_FW            CENTER "\015Writing..."
-  #define TR_BL_WRITING_COMPL         CENTER "\007Writing complete"
   #if defined(RADIO_COMMANDO8)
     #define TR_BL_POWER_KEY           "Press the power button."
     #define TR_BL_FLASH_EXIT          "Exit the flashing mode."
   #endif
 #elif defined(PCBHORUS)
    // Bootloader Horus specific
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_SELECT_KEY            "[ENT] to select file"
   #define TR_BL_FLASH_KEY             "Hold [ENT] long to flash"
   #define TR_BL_EXIT_KEY              "[RTN] to exit"
 #elif defined(PCBNV14)
    // Bootloader NV14 specific
-  #define TR_BL_WRITING_FW            "Writing Firmware ..."
-  #define TR_BL_WRITING_COMPL         "Writing Completed"
   #define TR_BL_RF_USB_ACCESS         "RF USB access"
   #define TR_BL_CURRENT_FW            "Current Firmware:"
   #define TR_BL_SELECT_KEY            "[R TRIM] to select file"