Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bootloader): use ASCII only strings for NV14/EL18 #5178

Merged
merged 1 commit into from
Jun 16, 2024
Merged

fix(bootloader): use ASCII only strings for NV14/EL18 #5178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion radio/src/targets/nv14/bootloader/boot_menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ void bootloaderDrawScreen(BootloaderState st, int opt, const char* str)
bootloaderDrawTitle(TR_BL_RF_USB_ACCESS);

lcd->drawText(62, 75, LV_SYMBOL_USB, BL_FOREGROUND);
coord_t pos = lcd->drawText(84, 75, rfUsbAccess ? TR_DISABLE : TR_ENABLE, BL_FOREGROUND);
coord_t pos = lcd->drawText(84, 75, rfUsbAccess ? TR_BL_DISABLE : TR_BL_ENABLE, BL_FOREGROUND);
pos += 8;

lcd->drawText(60, 110, LV_SYMBOL_NEW_LINE, BL_FOREGROUND);
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/cn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,6 +1040,8 @@
#define TR_BL_HOLD_ENTER_TO_START "\012Hold [ENT] to start writing"
#define TR_BL_INVALID_FIRMWARE "\011Not a valid firmware file! "
#define TR_BL_INVALID_EEPROM "\011Not a valid EEPROM file! "
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#else
#define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN
#define TR_BL_HOLD_ENTER_TO_START "\006Hold [ENT] to start"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] pro vybrani souboru"
#define TR_BL_FLASH_KEY "Drzet dlouze [R TRIM] pro nahrani"
#define TR_BL_EXIT_KEY " [L TRIM] pro ukonceni"
#define TR_BL_ENABLE "Povoleno"
#define TR_BL_DISABLE "Zakazano"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/da.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] for at bruge fil"
#define TR_BL_FLASH_KEY "[R TRIM] længe, for at starte"
#define TR_BL_EXIT_KEY "[L TRIM] for at forlade"
#define TR_BL_ENABLE "Aktiver"
#define TR_BL_DISABLE "Deaktiver"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB adgang"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/de.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] um Datei auszuwählen"
#define TR_BL_FLASH_KEY "Halte [R TRIM] gedrückt, zum schreiben"
#define TR_BL_EXIT_KEY " [L TRIM] zum beenden"
#define TR_BL_ENABLE "Aktivieren"
#define TR_BL_DISABLE "Deaktivieren"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,6 +1069,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/es.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/fi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,6 +1081,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/fr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] pour sélect. fichier"
#define TR_BL_FLASH_KEY "Appui long [R TRIM] pour flasher"
#define TR_BL_EXIT_KEY " [L TRIM] pour quitter"
#define TR_BL_ENABLE "Activer"
#define TR_BL_DISABLE "Désactiver"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/he.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] per scegliere il file"
#define TR_BL_FLASH_KEY "Tener premuto [R TRIM] per scrivere"
#define TR_BL_EXIT_KEY " [L TRIM] per uscire"
#define TR_BL_ENABLE "Abilita"
#define TR_BL_DISABLE "Disabilita"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/jp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/nl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/pl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] aby wybrac plik"
#define TR_BL_FLASH_KEY "Przytrzymaj [R TRIM] aby flashowac"
#define TR_BL_EXIT_KEY " [L TRIM] aby wyjsc"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/pt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,6 +1074,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Desativar"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/ru.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/se.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] foer att vaelja fil"
#define TR_BL_FLASH_KEY "Tryck [R TRIM] foer att flasha"
#define TR_BL_EXIT_KEY " [L TRIM] för att avsluta"
#define TR_BL_ENABLE "Aktivera"
#define TR_BL_DISABLE "Inaktivera"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
10 changes: 6 additions & 4 deletions radio/src/translations/tw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@
#define TR_WIDGET_VALUE "數值"
#endif

// Bootloader common
// Bootloader common - Ascii only
#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"
Expand Down Expand Up @@ -1053,24 +1053,26 @@
#endif

#if defined(PCBTARANIS)
// Bootloader Taranis specific
// Bootloader Taranis specific - Ascii only
#define TR_BL_RESTORE_EEPROM "Restore EEPROM"
#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
// Bootloader Horus specific - Ascii only
#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
// Bootloader NV14 specific - Ascii only
#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"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down
2 changes: 2 additions & 0 deletions radio/src/translations/ua.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,8 @@
#define TR_BL_SELECT_KEY "[R TRIM] to select file"
#define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash"
#define TR_BL_EXIT_KEY " [L TRIM] to exit"
#define TR_BL_ENABLE "Enable"
#define TR_BL_DISABLE "Disable"
#elif defined(PCBPL18)
// Bootloader PL18 specific - Ascii only
#define TR_BL_RF_USB_ACCESS "RF USB access"
Expand Down