From 3f45049650fcf8d80cc787845ec77513de7396ad Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 15 May 2024 09:43:32 +1000 Subject: [PATCH] fix: replace non-compliant translations with EN ASCII (#4993) --- radio/src/translations/he.h | 30 +++++++--------- radio/src/translations/jp.h | 40 ++++++++++----------- radio/src/translations/ru.h | 62 ++++++++++++++++---------------- radio/src/translations/ua.h | 72 +++++++++++++++++++++---------------- 4 files changed, 105 insertions(+), 99 deletions(-) diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index d8aa21dd226..7a2bdaec261 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -1016,17 +1016,19 @@ #endif // Bootloader common - Ascii only -#define TR_BL_USB_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" #define TR_BL_USB_PLUGIN_MASS_STORE "Or plug in a USB cable for mass storage" -#define TR_BL_WRITE_FW "כתיבת תוכנה" +#define TR_BL_WRITE_FW "Write Firmware" #define TR_BL_FORK "Fork:" -#define TR_BL_VERSION "גירסא:" -#define TR_BL_RADIO "רדיו:" -#define TR_BL_EXIT "יציאה" -#define TR_BL_DIR_MISSING " ארכיון חסר" -#define TR_BL_DIR_EMPTY " ארכיון ריק" +#define TR_BL_VERSION "Version:" +#define TR_BL_RADIO "Radio:" +#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" @@ -1045,28 +1047,22 @@ #if defined(PCBTARANIS) // Bootloader Taranis specific - Ascii only #define TR_BL_RESTORE_EEPROM "Restore EEPROM" - #define TR_BL_WRITING_FW "...ממתין" - #define TR_BL_WRITING_COMPL "כתיבה הושלמה" #if defined(RADIO_COMMANDO8) - #define TR_BL_POWER_KEY "לחץ על כפתור ההפעלה" + #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 "... כותב תוכנה" - #define TR_BL_WRITING_COMPL "כתיבה הושלמה" - #define TR_BL_SELECT_KEY "[ENT] לבחירת קובץ" + #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] ליציאה" + #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" #define TR_BL_FLASH_KEY "Hold [R TRIM] long to flash" - #define TR_BL_EXIT_KEY " [L TRIM] ליציאה" + #define TR_BL_EXIT_KEY " [L TRIM] to exit" #elif defined(PCBPL18) // Bootloader PL18 specific - Ascii only #define TR_BL_RF_USB_ACCESS "RF USB access" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index e0df479313e..afb6083a922 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -1031,12 +1031,12 @@ #define TR_BL_WRITING_COMPL "Writing complete" #if LCD_W >= 480 - #define TR_BL_INVALID_FIRMWARE "有効なファームウェアではありません" + #define TR_BL_INVALID_FIRMWARE "Not a valid firmware file" #elif LCD_W >= 212 #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN_MASS_STORE - #define TR_BL_HOLD_ENTER_TO_START "\012[ENT]を長押しし書き込み開始" - #define TR_BL_INVALID_FIRMWARE "\011有効なファームウェアではありません" - #define TR_BL_INVALID_EEPROM "\011有効なEEPROMファイルではありません" + #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! " #else #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN #define TR_BL_HOLD_ENTER_TO_START "\006Hold [ENT] to start" @@ -1053,26 +1053,26 @@ #endif #elif defined(PCBHORUS) // Bootloader Horus specific - Ascii only - #define TR_BL_SELECT_KEY "[ENT]でファイルを選択" - #define TR_BL_FLASH_KEY "[ENT]を長押しし書き込み" - #define TR_BL_EXIT_KEY "[RTN]で終了" + #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_RF_USB_ACCESS "RF USB アクセス" - #define TR_BL_CURRENT_FW "現ファームウェア:" - #define TR_BL_SELECT_KEY "[R TRIM]でファイルを選択" - #define TR_BL_FLASH_KEY "[R TRIM]を長押しし書き込み" - #define TR_BL_EXIT_KEY " [L TRIM]で終了" + #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" #elif defined(PCBPL18) // Bootloader PL18 specific - Ascii only - #define TR_BL_RF_USB_ACCESS "RF USB アクセス" - #define TR_BL_ERASE_INT_FLASH "内蔵フラッシュストレージの消去" - #define TR_BL_ERASE_FLASH "フラッシュストレージの消去" - #define TR_BL_ERASE_FLASH_MSG "最大200秒かかります" - #define TR_BL_SELECT_KEY " [TR4 Dn]でファイルを選択" - #define TR_BL_FLASH_KEY " [TR4 Dn]を長押しし書き込み" - #define TR_BL_ERASE_KEY " [TR4 Dn]を長押しし消去" - #define TR_BL_EXIT_KEY " [TR4 Up]で終了" + #define TR_BL_RF_USB_ACCESS "RF USB access" + #define TR_BL_ERASE_INT_FLASH "Erase Internal Flash Storage" + #define TR_BL_ERASE_FLASH "Erase Flash Storage" + #define TR_BL_ERASE_FLASH_MSG "This may take up to 200s" + #define TR_BL_SELECT_KEY " [TR4 Dn] to select file" + #define TR_BL_FLASH_KEY " Hold [TR4 Dn] long to flash" + #define TR_BL_ERASE_KEY " Hold [TR4 Dn] long to erase" + #define TR_BL_EXIT_KEY " [TR4 Up] to exit" #endif // About screen diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index b32a811d6fc..3540ed58d59 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -1019,53 +1019,53 @@ #endif // Bootloader common - Ascii only -#define TR_BL_USB_CONNECTED "Подключение по USB" -#define TR_BL_USB_PLUGIN "Или подключите USB-кабель" -#define TR_BL_USB_MASS_STORE "Для масс хранения" -#define TR_BL_USB_PLUGIN_MASS_STORE "Подключ USB для сохр данных" -#define TR_BL_WRITE_FW "Запись ПО" -#define TR_BL_FORK "Вилка:" -#define TR_BL_VERSION "Версия:" -#define TR_BL_RADIO "Пульт:" -#define TR_BL_EXIT "Выход" -#define TR_BL_DIR_MISSING "Каталог отсут" -#define TR_BL_DIR_EMPTY "Каталог пуст" -#define TR_BL_WRITING_FW "Предупреждение..." -#define TR_BL_WRITING_COMPL "Запись завершена" +#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" +#define TR_BL_USB_PLUGIN_MASS_STORE "Or plug in a USB cable for mass storage" +#define TR_BL_WRITE_FW "Write Firmware" +#define TR_BL_FORK "Fork:" +#define TR_BL_VERSION "Version:" +#define TR_BL_RADIO "Radio:" +#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 "Недопустимый файл ПО" + #define TR_BL_INVALID_FIRMWARE "Not a valid firmware file" #elif LCD_W >= 212 #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN_MASS_STORE - #define TR_BL_HOLD_ENTER_TO_START "\012Удерживайте [ENT], для записи" - #define TR_BL_INVALID_FIRMWARE "\011Недопустимый файл ПО! " - #define TR_BL_INVALID_EEPROM "\011Недопустимый файл EEPROM! " + #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! " #else #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN - #define TR_BL_HOLD_ENTER_TO_START "\006Нажать [ENT] для начла" - #define TR_BL_INVALID_FIRMWARE "\004Недопустимое ПО! " - #define TR_BL_INVALID_EEPROM "\004Недопустимый EEPROM! " + #define TR_BL_HOLD_ENTER_TO_START "\006Hold [ENT] to start" + #define TR_BL_INVALID_FIRMWARE "\004Not a valid firmware! " + #define TR_BL_INVALID_EEPROM "\004Not a valid EEPROM! " #endif #if defined(PCBTARANIS) // Bootloader Taranis specific - Ascii only - #define TR_BL_RESTORE_EEPROM "Восстанавить EEPROM" + #define TR_BL_RESTORE_EEPROM "Restore EEPROM" #if defined(RADIO_COMMANDO8) - #define TR_BL_POWER_KEY "Нажмите кнопку включ." - #define TR_BL_FLASH_EXIT "Выход из режима прошивки." + #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_SELECT_KEY "[ENT] для выбора файла" - #define TR_BL_FLASH_KEY "Удерживайте [ENT] для прошивки" - #define TR_BL_EXIT_KEY "[RTN] для выхода" + #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_RF_USB_ACCESS "Доступ к RF USB" - #define TR_BL_CURRENT_FW "Текущая прошивка:" - #define TR_BL_SELECT_KEY "[П ТРИМ] для выбора файла" - #define TR_BL_FLASH_KEY "Удерживайте [П ТРИМ] для прошивки" - #define TR_BL_EXIT_KEY "[Л ТРИМ] для выхода" + #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" #elif defined(PCBPL18) // Bootloader PL18 specific - Ascii only #define TR_BL_RF_USB_ACCESS "RF USB access" diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 621b140f3c5..4e77d86121e 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -1019,53 +1019,63 @@ #endif // Bootloader common - Ascii only -#define TR_BL_USB_CONNECTED "USB Підключено" -#define TR_BL_USB_PLUGIN "Або підключіть USB кабель" -#define TR_BL_USB_MASS_STORE "для сховища" -#define TR_BL_USB_PLUGIN_MASS_STORE "Або підключіть USB кабель для сховища" -#define TR_BL_WRITE_FW "Записати Firmware" -#define TR_BL_FORK "Форк:" -#define TR_BL_VERSION "Версія:" -#define TR_BL_RADIO "Радіо:" -#define TR_BL_EXIT "Вихід" -#define TR_BL_DIR_MISSING " Тека відсутня" -#define TR_BL_DIR_EMPTY " Тека порожня" -#define TR_BL_WRITING_FW "Запис..." -#define TR_BL_WRITING_COMPL "Запис закінчено" +#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" +#define TR_BL_USB_PLUGIN_MASS_STORE "Or plug in a USB cable for mass storage" +#define TR_BL_WRITE_FW "Write Firmware" +#define TR_BL_FORK "Fork:" +#define TR_BL_VERSION "Version:" +#define TR_BL_RADIO "Radio:" +#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 "Невірний файл firmware" + #define TR_BL_INVALID_FIRMWARE "Not a valid firmware file" #elif LCD_W >= 212 #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN_MASS_STORE - #define TR_BL_HOLD_ENTER_TO_START "\012Тримайте [ENT] для початку запису" - #define TR_BL_INVALID_FIRMWARE "\011Невірний файл firmware! " - #define TR_BL_INVALID_EEPROM "\011Невірний файл EEPROM! " + #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! " #else #define TR_BL_OR_PLUGIN_USB_CABLE TR_BL_USB_PLUGIN - #define TR_BL_HOLD_ENTER_TO_START "\006Тримайте [ENT] для старту" - #define TR_BL_INVALID_FIRMWARE "\004Невірний firmware! " - #define TR_BL_INVALID_EEPROM "\004Невірний EEPROM! " + #define TR_BL_HOLD_ENTER_TO_START "\006Hold [ENT] to start" + #define TR_BL_INVALID_FIRMWARE "\004Not a valid firmware! " + #define TR_BL_INVALID_EEPROM "\004Not a valid EEPROM! " #endif #if defined(PCBTARANIS) // Bootloader Taranis specific - Ascii only - #define TR_BL_RESTORE_EEPROM "Відновити EEPROM" + #define TR_BL_RESTORE_EEPROM "Restore EEPROM" #if defined(RADIO_COMMANDO8) - #define TR_BL_POWER_KEY "Натисніть кнопку живлення." - #define TR_BL_FLASH_EXIT "Вийти з режиму прошивки." + #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_SELECT_KEY "[ENT] для вибору файлу" - #define TR_BL_FLASH_KEY "Тримайте [ENT] довго для прошивки" - #define TR_BL_EXIT_KEY "[RTN] для виходу" + #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_RF_USB_ACCESS "Доступ RF USB" - #define TR_BL_CURRENT_FW "Поточний Firmware:" - #define TR_BL_SELECT_KEY "[R TRIM] для вибору файлу" - #define TR_BL_FLASH_KEY "Тримайте [R TRIM] довго для прошивки" - #define TR_BL_EXIT_KEY " [L TRIM] для виходу" + #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" +#elif defined(PCBPL18) + // Bootloader PL18 specific - Ascii only + #define TR_BL_RF_USB_ACCESS "RF USB access" + #define TR_BL_ERASE_INT_FLASH "Erase Internal Flash Storage" + #define TR_BL_ERASE_FLASH "Erase Flash Storage" + #define TR_BL_ERASE_FLASH_MSG "This may take up to 200s" + #define TR_BL_SELECT_KEY " [TR4 Dn] to select file" + #define TR_BL_FLASH_KEY " Hold [TR4 Dn] long to flash" + #define TR_BL_ERASE_KEY " Hold [TR4 Dn] long to erase" + #define TR_BL_EXIT_KEY " [TR4 Up] to exit" #endif // About screen