From 67d4a29e31648c59d18a915685c8a7ae138908fc Mon Sep 17 00:00:00 2001 From: Wilhelm Date: Fri, 11 Feb 2022 01:27:05 +0100 Subject: [PATCH] chore: Replace fixed strings with translation for device-flash-dialogs (#1372) * replaced fix strings with translations * additional strings * replaced wrong german string to english in all but german translations * fixed spelling --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 2 +- radio/src/io/frsky_firmware_update.cpp | 49 +++++++++++----------- radio/src/io/multi_firmware_update.cpp | 34 +++++++-------- radio/src/translations.cpp | 7 ++++ radio/src/translations.h | 7 ++++ radio/src/translations/cn.h.txt | 7 ++++ radio/src/translations/cz.h.txt | 7 ++++ radio/src/translations/de.h.txt | 9 +++- radio/src/translations/en.h.txt | 7 ++++ radio/src/translations/es.h.txt | 7 ++++ radio/src/translations/fi.h.txt | 7 ++++ radio/src/translations/fr.h.txt | 7 ++++ radio/src/translations/it.h.txt | 7 ++++ radio/src/translations/nl.h.txt | 7 ++++ radio/src/translations/pl.h.txt | 7 ++++ radio/src/translations/pt.h.txt | 7 ++++ radio/src/translations/se.h.txt | 7 ++++ 17 files changed, 142 insertions(+), 43 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index c3a7afc01..89bff8725 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -135,7 +135,7 @@ class FlashDialog: public FullScreenDialog { public: explicit FlashDialog(const T & device): - FullScreenDialog(WARNING_TYPE_INFO, "Flash device"), + FullScreenDialog(WARNING_TYPE_INFO, STR_FLASH_DEVICE), device(device), progress(this, {LCD_W / 2 - 50, LCD_H / 2, 100, 15}) { diff --git a/radio/src/io/frsky_firmware_update.cpp b/radio/src/io/frsky_firmware_update.cpp index e48cc688e..1280fee6f 100644 --- a/radio/src/io/frsky_firmware_update.cpp +++ b/radio/src/io/frsky_firmware_update.cpp @@ -22,6 +22,7 @@ #include #include "opentx.h" #include "frsky_firmware_update.h" +#include "debug.h" #if defined(LIBOPENUI) #include "libopenui.h" @@ -51,23 +52,23 @@ const char * readFrSkyFirmwareInformation(const char * filename, FrSkyFirmwareIn UINT count; if (f_open(&file, filename, FA_READ) != FR_OK) { - return "Error opening file"; + return STR_NEEDS_FILE; } if (f_read(&file, &data, sizeof(data), &count) != FR_OK || count != sizeof(data)) { f_close(&file); - return "Error reading file"; + return STR_DEVICE_FILE_ERROR; } uint32_t size = f_size(&file); f_close(&file); if (data.headerVersion != 1 && data.fourcc != 0x4B535246) { - return "Wrong format"; + return STR_DEVICE_FILE_ERROR; } if (size != sizeof(data) + data.size) { - return "Wrong size"; + return STR_DEVICE_FILE_ERROR; } return nullptr; @@ -274,14 +275,14 @@ const char * FrskyDeviceFirmwareUpdate::sendPowerOn() } if (telemetryProtocol != PROTOCOL_TELEMETRY_FRSKY_SPORT) { - return TR("Not responding", "Not S.Port 1"); + return STR_DEVICE_NO_RESPONSE; } if (!IS_FRSKY_SPORT_PROTOCOL()) { - return TR("Not responding", "Not S.Port 2"); + return STR_DEVICE_NO_RESPONSE; } - return TR("Not responding", "Device not responding"); + return STR_DEVICE_NO_RESPONSE; } const char * FrskyDeviceFirmwareUpdate::sendReqVersion() @@ -313,14 +314,14 @@ const char * FrskyDeviceFirmwareUpdate::doFlashFirmware(const char * filename, P UINT count; if (f_open(&file, filename, FA_READ) != FR_OK) { - return "Error opening file"; + return STR_NEEDS_FILE; } const char * ext = getFileExtension(filename); if (ext && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) { if (f_read(&file, &information, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) { f_close(&file); - return "Format error"; + return STR_DEVICE_FILE_ERROR; } } else { @@ -383,14 +384,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileToHorusXJT(const char * filena uint8_t frame[8]; if (!readBuffer(frame, 8, 100) || frame[0] != 0x01) { - return TR("Not responding", "Device not responding"); + return STR_DEVICE_NO_RESPONSE; } intmoduleSendByte(0x81); readBuffer(frame, 1, 100); if (!readBuffer(frame, 8, 100) || frame[0] != 0x02) { - return TR("Not responding", "Device not responding"); + return STR_DEVICE_NO_RESPONSE; } intmoduleSendByte(0x82); @@ -401,14 +402,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileToHorusXJT(const char * filena progressHandler(getBasename(filename), STR_WRITING, file->fptr, file->obj.objsize); if (f_read(file, buffer, 1024, &count) != FR_OK) { - return "Error reading file"; + return STR_DEVICE_FILE_ERROR; } if (!readBuffer(frame, 2, 100)) - return "Data refused"; + return STR_DEVICE_DATA_REFUSED; if (frame[0] != 0x11 || frame[1] != index) - return "Wrong request"; + return STR_DEVICE_WRONG_REQUEST; if (count == 0) { intmoduleSendByte(0xA1); @@ -456,14 +457,14 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileNormal(const char * filename, while (true) { if (f_read(file, buffer, 1024, &count) != FR_OK) { - return "Error reading file"; + return STR_DEVICE_FILE_ERROR; } count >>= 2; for (uint32_t i=0; i> 2; // 32 bit word offset into buffer @@ -487,11 +488,11 @@ const char * FrskyDeviceFirmwareUpdate::uploadFileNormal(const char * filename, const char * FrskyDeviceFirmwareUpdate::endTransfer() { if (!waitState(SPORT_DATA_REQ, 2000)) - return "Data refused"; + return STR_DEVICE_DATA_REFUSED; startFrame(PRIM_DATA_EOF); sendFrame(); if (!waitState(SPORT_COMPLETE, 2000)) { - return "Firmware rejected"; + return STR_DEVICE_FILE_REJECTED; } return nullptr; } @@ -592,7 +593,7 @@ const char * FrskyChipFirmwareUpdate::waitAnswer(uint8_t & status) break; } if (++retry == CHIP_FIRMWARE_UPDATE_TIMEOUT) { - return "No answer"; + return STR_DEVICE_NO_RESPONSE; } RTOS_WAIT_MS(1); } @@ -679,7 +680,7 @@ const char * FrskyChipFirmwareUpdate::sendUpgradeCommand(char command, uint32_t if (result) return result; - return status == 0x00 ? nullptr : "Upgrade failed"; + return status == 0x00 ? nullptr : STR_FIRMWARE_UPDATE_ERROR; } const char * FrskyChipFirmwareUpdate::sendUpgradeData(uint32_t index, uint8_t * data) @@ -720,7 +721,7 @@ const char * FrskyChipFirmwareUpdate::sendUpgradeData(uint32_t index, uint8_t * if (result) return result; - return status == 0x00 ? nullptr : "Upgrade failed"; + return status == 0x00 ? nullptr : STR_FIRMWARE_UPDATE_ERROR; } const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, ProgressHandler progressHandler) @@ -735,13 +736,13 @@ const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, Pro return result; if (f_open(&file, filename, FA_READ) != FR_OK) { - return "Error opening file"; + return STR_NEEDS_FILE; } FrSkyFirmwareInformation * information = (FrSkyFirmwareInformation *)buffer; if (f_read(&file, buffer, sizeof(FrSkyFirmwareInformation), &count) != FR_OK || count != sizeof(FrSkyFirmwareInformation)) { f_close(&file); - return "Format error"; + return STR_DEVICE_FILE_ERROR; } uint32_t packetsCount = (information->size + sizeof(buffer) - 1) / sizeof(buffer); @@ -756,7 +757,7 @@ const char * FrskyChipFirmwareUpdate::doFlashFirmware(const char * filename, Pro progressHandler(getBasename(filename), STR_FLASH_WRITE, index, packetsCount); if (f_read(&file, buffer, sizeof(buffer), &count) != FR_OK) { f_close(&file); - return "Error reading file"; + return STR_DEVICE_FILE_ERROR; } result = sendUpgradeData(index + 1, buffer); if (result) diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp index 0edea6075..d280e871e 100644 --- a/radio/src/io/multi_firmware_update.cpp +++ b/radio/src/io/multi_firmware_update.cpp @@ -265,21 +265,21 @@ const char * MultiFirmwareUpdateDriver::waitForInitialSync(bool & inverted) cons } while ((byte != STK_INSYNC) && --retries); if (!retries) { - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; } if (byte != STK_INSYNC) { #if defined(DEBUG_EXT_MODULE_FLASH) TRACE("[byte != STK_INSYNC]"); #endif - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; } if (!checkRxByte(STK_OK)) { #if defined(DEBUG_EXT_MODULE_FLASH) TRACE("[!checkRxByte(STK_OK)]"); #endif - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; } // avoids sending STK_READ_SIGN with STK_OK @@ -298,11 +298,11 @@ const char * MultiFirmwareUpdateDriver::getDeviceSignature(uint8_t * signature) clear(); if (!checkRxByte(STK_INSYNC)) - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; for (uint8_t i = 0; i < 4; i++) { if (!getRxByte(signature[i])) { - return "NoSignature"; + return STR_DEVICE_FILE_WRONG_SIG; } } @@ -317,7 +317,7 @@ const char * MultiFirmwareUpdateDriver::loadAddress(uint32_t offset) const sendByte(CRC_EOP); if (!checkRxByte(STK_INSYNC) || !checkRxByte(STK_OK)) { - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; } // avoids sending next page back-to-back with STK_OK @@ -345,7 +345,7 @@ const char * MultiFirmwareUpdateDriver::progPage(uint8_t * buffer, uint16_t size sendByte(CRC_EOP); if (!checkRxByte(STK_INSYNC)) - return "NoSync"; + return STR_DEVICE_NO_RESPONSE; uint8_t byte; uint8_t retries = 4; @@ -355,7 +355,7 @@ const char * MultiFirmwareUpdateDriver::progPage(uint8_t * buffer, uint16_t size } while (!byte && --retries); if (!retries || (byte != STK_OK)) - return "NoPageSync"; + return STR_DEVICE_WRONG_REQUEST; return nullptr; } @@ -410,7 +410,7 @@ const char * MultiFirmwareUpdateDriver::flashFirmware(FIL * file, const char * l if (signature[0] != 0x1E) { leaveProgMode(inverted); - return "Wrong signature"; + return STR_DEVICE_FILE_WRONG_SIG; } if (signature[1] == 0x55 && signature[2] == 0xAA) { @@ -424,7 +424,7 @@ const char * MultiFirmwareUpdateDriver::flashFirmware(FIL * file, const char * l UINT count = 0; memclear(buffer, pageSize); if (f_read(file, buffer, pageSize, &count) != FR_OK) { - result = "Error reading file"; + result = STR_DEVICE_FILE_ERROR; break; } @@ -471,7 +471,7 @@ const char * MultiFirmwareInformation::readV1Signature(const char * buffer) else if (!memcmp(buffer, "multi-orx", 9)) boardType = FIRMWARE_MULTI_ORX; else - return "Wrong format"; + return STR_DEVICE_FILE_WRONG_SIG; if (buffer[MULTI_SIGN_BOOTLOADER_SUPPORT_OFFSET] == 'b') optibootSupport = true; @@ -519,7 +519,7 @@ const char * MultiFirmwareInformation::readV2Signature(const char * buffer) } if (cursor - beg < 8) - return "Invalid signature"; + return STR_DEVICE_FILE_WRONG_SIG; boardType = options & 0x3; optibootSupport = options & 0x80 ? true : false; @@ -539,7 +539,7 @@ const char * MultiFirmwareInformation::readMultiFirmwareInformation(const char * { FIL file; if (f_open(&file, filename, FA_READ) != FR_OK) - return "Error opening file"; + return STR_DEVICE_FILE_ERROR; const char * err = readMultiFirmwareInformation(&file); f_close(&file); @@ -553,11 +553,11 @@ const char * MultiFirmwareInformation::readMultiFirmwareInformation(FIL * file) UINT count; if (f_size(file) < MULTI_SIGN_SIZE) - return "File too small"; + return STR_DEVICE_FILE_ERROR; f_lseek(file, f_size(file) - MULTI_SIGN_SIZE); if (f_read(file, buffer, MULTI_SIGN_SIZE, &count) != FR_OK || count != MULTI_SIGN_SIZE) { - return "Error reading file"; + return STR_DEVICE_FILE_ERROR; } if (!memcmp(buffer, "multi-x", 7)) { @@ -572,7 +572,7 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan FIL file; if (f_open(&file, filename, FA_READ) != FR_OK) { - POPUP_WARNING("Not a valid file"); + POPUP_WARNING(STR_DEVICE_FILE_ERROR); return false; } @@ -580,7 +580,7 @@ bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHan MultiFirmwareInformation firmwareFile; if (firmwareFile.readMultiFirmwareInformation(&file)) { f_close(&file); - POPUP_WARNING("Not a valid file"); + POPUP_WARNING(STR_DEVICE_FILE_ERROR); return false; } f_lseek(&file, 0); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 8b47003aa..2b99b1bd4 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -485,6 +485,7 @@ const char STR_FLASH_EXTERNAL_ELRS[] = TR_FLASH_EXTERNAL_ELRS; const char STR_FIRMWARE_UPDATE_ERROR[] = TR_FIRMWARE_UPDATE_ERROR; const char STR_FIRMWARE_UPDATE_SUCCESS[] = TR_FIRMWARE_UPDATE_SUCCESS; const char STR_WRITING[] = TR_WRITING; +const char STR_FLASH_DEVICE[] = TR_FLASH_DEVICE; const char STR_FLASH_EXTERNAL_DEVICE[] = TR_FLASH_EXTERNAL_DEVICE; const char STR_FLASH_RECEIVER_OTA[] = TR_FLASH_RECEIVER_OTA; const char STR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA[] = TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA; @@ -493,6 +494,12 @@ const char STR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA[] = TR_FLASH_FLIG const char STR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA[] = TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA; const char STR_FLASH_BLUETOOTH_MODULE[] = TR_FLASH_BLUETOOTH_MODULE; const char STR_FLASH_POWER_MANAGEMENT_UNIT[] = TR_FLASH_POWER_MANAGEMENT_UNIT; +const char STR_DEVICE_NO_RESPONSE[] = TR_DEVICE_NO_RESPONSE; +const char STR_DEVICE_FILE_ERROR[] = TR_DEVICE_FILE_ERROR; +const char STR_DEVICE_DATA_REFUSED[] = TR_DEVICE_DATA_REFUSED; +const char STR_DEVICE_WRONG_REQUEST[] = TR_DEVICE_WRONG_REQUEST; +const char STR_DEVICE_FILE_REJECTED[] = TR_DEVICE_FILE_REJECTED; +const char STR_DEVICE_FILE_WRONG_SIG[] = TR_DEVICE_FILE_WRONG_SIG; const char STR_CONFIRM_FORMAT[] = TR_CONFIRM_FORMAT; const char STR_CONFIRMRESET[] = TR_CONFIRMRESET; const char STR_TOO_MANY_LUA_SCRIPTS[] = TR_TOO_MANY_LUA_SCRIPTS; diff --git a/radio/src/translations.h b/radio/src/translations.h index c7835f24b..79c3dfb65 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -714,6 +714,7 @@ extern const char STR_MIXERS_MONITOR[]; extern const char STR_PATH_TOO_LONG[]; extern const char STR_VIEW_TEXT[]; extern const char STR_FLASH_BOOTLOADER[]; +extern const char STR_FLASH_DEVICE[]; extern const char STR_FLASH_EXTERNAL_DEVICE[]; extern const char STR_FLASH_RECEIVER_OTA[]; extern const char STR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA[]; @@ -722,6 +723,12 @@ extern const char STR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA[]; extern const char STR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA[]; extern const char STR_FLASH_BLUETOOTH_MODULE[]; extern const char STR_FLASH_POWER_MANAGEMENT_UNIT[]; +extern const char STR_DEVICE_NO_RESPONSE[]; +extern const char STR_DEVICE_FILE_ERROR[]; +extern const char STR_DEVICE_DATA_REFUSED[]; +extern const char STR_DEVICE_WRONG_REQUEST[]; +extern const char STR_DEVICE_FILE_REJECTED[]; +extern const char STR_DEVICE_FILE_WRONG_SIG[]; extern const char STR_CURRENT_VERSION[]; extern const char STR_FLASH_INTERNAL_MODULE[]; extern const char STR_FLASH_INTERNAL_MULTI[]; diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 5eddcf7ef..95fd0ee3a 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -803,6 +803,7 @@ #define TR_PATH_TOO_LONG "路径太长" #define TR_VIEW_TEXT "查看文本" #define TR_FLASH_BOOTLOADER "更新引导程序" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "从 S.Port 端口更新外设固件") #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -811,6 +812,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新蓝牙模块") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION "当前版本: " #define TR_FLASH_INTERNAL_MODULE "更新内置模块固件" #define TR_FLASH_INTERNAL_MULTI "更新内置多协议模块固件" diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4fbd7770c..1560a6da6 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -848,6 +848,7 @@ #define TR_PATH_TOO_LONG "Cesta je moc dlouhá" #define TR_VIEW_TEXT "Zobrazit text" #define TR_FLASH_BOOTLOADER "Flash bootloaderu" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Portem", "Flash S.Portem") #define TR_FLASH_RECEIVER_OTA "Flash příjímače OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -856,6 +857,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash modulu BT", "Flash modulu Bluetooth") #define TR_FLASH_POWER_MANAGEMENT_UNIT TR("Flash řízení spotř.", "Flash jednotky řízení spotřeby") +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Současná ver. ", "Současná verze: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash vnitř. modulu", "Flash vnitřního modulu") #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 1eb6816e7..75e6a28a9 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -849,7 +849,8 @@ #define TR_MIXERS_MONITOR "==>Mischer Monitor" #define TR_PATH_TOO_LONG "Pfad zu Lang" #define TR_VIEW_TEXT "View Text" -#define TR_FLASH_BOOTLOADER TR("Flash bootloader","Flash bootloader") // +#define TR_FLASH_DEVICE TR("Flash Gerät","Flash Gerät") +#define TR_FLASH_BOOTLOADER TR("Flash bootloader","Flash bootloader") #define TR_FLASH_EXTERNAL_DEVICE TR("Flash ext. Gerät","Flash externes Gerät") #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -858,6 +859,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetoothmodul") #define TR_FLASH_POWER_MANAGEMENT_UNIT TR("Flash pwr mngt unit", "Flash power management unit") +#define TR_DEVICE_NO_RESPONSE TR("Gerät antwortet nicht", "Gerät antwortet nicht") +#define TR_DEVICE_FILE_ERROR TR("G.-Dateiproblem", "G.-Dateiproblem") +#define TR_DEVICE_DATA_REFUSED TR("G.-Daten abg.", "G.-Daten abg.") +#define TR_DEVICE_WRONG_REQUEST TR("G.-Zugriffsfehler", "G.-Zugriffsfehler") +#define TR_DEVICE_FILE_REJECTED TR("G.-Datei abg.", "G.-Datei abg.") +#define TR_DEVICE_FILE_WRONG_SIG TR("G.-Datei Sig.", "G.-Datei Sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash int. XJT","Flash internes XJT-Modul") #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash int. Multimodul") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 4635b8e47..06a73d0a0 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -855,6 +855,7 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "Flash S.Port device") #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -863,6 +864,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Curr Vers: ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "Flash internal module") #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 378e2d136..0d93f9b81 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -852,6 +852,7 @@ #define TR_PATH_TOO_LONG "Path muy largo" #define TR_VIEW_TEXT "Ver texto" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Flash disp. externo" #define TR_FLASH_RECEIVER_OTA "Flash RX OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX por ext. OTA" @@ -860,6 +861,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash módulo BT", "Flash módulo bluetooth") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash unid. pwr mngt" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Vers. actual", "Versión actual: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash módulo int", "Flash módulo interno") #define TR_FLASH_INTERNAL_MULTI TR("Flash Multi int", "Flash Multi interno") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index a45b06b51..b2a1c7c3e 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -866,6 +866,7 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -874,6 +875,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 884bbbce5..623780c90 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -871,6 +871,7 @@ #define TR_PATH_TOO_LONG "Chemin trop long" #define TR_VIEW_TEXT "Voir texte" #define TR_FLASH_BOOTLOADER "Flasher BootLoader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Flasher S.Port", "Flasher S.Port externe") #define TR_FLASH_RECEIVER_OTA "Flasher RX OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -879,6 +880,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash module BT", "Flash module Bluetooth") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flasher pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION "Version courante :" #define TR_FLASH_INTERNAL_MODULE TR("Flasher module int.", "Flasher module interne") #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ecef0cb0d..308fb88aa 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -872,6 +872,7 @@ #define TR_PATH_TOO_LONG "Path troppo lungo" #define TR_VIEW_TEXT "Vedi testo" #define TR_FLASH_BOOTLOADER TR("Prog. bootloader", "Programma bootloader") +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE TR("Prog. disp. est.", "Programma dispositivo esterno") #define TR_FLASH_RECEIVER_OTA TR("Prog. RX OTA", INDENT "Programma RX OTA") #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA TR("Prog. RX da OTA est.", INDENT "Prog. RX da OTA esterno") @@ -880,6 +881,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA TR("Prog. FC da OTA int.", INDENT "Prog. FC da OTA interno") #define TR_FLASH_BLUETOOTH_MODULE TR("Prog. mod. BT", INDENT "Prog. modulo Bluetooth") #define TR_FLASH_POWER_MANAGEMENT_UNIT TR("Prog. PMU", "Programma PMU") +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Vers. currente ", "Versione corrente: ") #define TR_FLASH_EXTERNAL_ELRS TR("Flash Ext. ELRS", "Flash External ELRS") #define TR_FLASH_INTERNAL_MODULE TR("Prog. modulo int.", "Programma modulo interno") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 196e7ebca..6cd7355c6 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -858,6 +858,7 @@ #define TR_PATH_TOO_LONG "Pad te Lang" #define TR_VIEW_TEXT "Lees Tekst" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Flash extern Apparaat" #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -866,6 +867,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash interne XJT-Module" #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 65b17a93e..0315f0225 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -869,6 +869,7 @@ #define TR_PATH_TOO_LONG "Ścieżka za długa" #define TR_VIEW_TEXT "Pokaż tekst" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Sflashuj Moduł Zewnętrzny" #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -877,6 +878,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Sflashuj Moduł Wewnętrzny" #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index dc1c6b09e..cf84f2e62 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -877,6 +877,7 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash bootloader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -885,6 +886,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 1e7b51a91..313d957bf 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -877,6 +877,7 @@ #define TR_PATH_TOO_LONG "För lång sökväg" #define TR_VIEW_TEXT "Visa Text" #define TR_FLASH_BOOTLOADER "Skriv BootLoader" +#define TR_FLASH_DEVICE TR("Flash device","Flash device") #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" #define TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA "Flash RX by ext. OTA" @@ -885,6 +886,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "Flash Bluetooth module") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" +#define TR_DEVICE_NO_RESPONSE TR("Device not responding", "Device not responding") +#define TR_DEVICE_FILE_ERROR TR("Device file prob.", "Device file prob.") +#define TR_DEVICE_DATA_REFUSED TR("Device data refused", "Device data refused") +#define TR_DEVICE_WRONG_REQUEST TR("Device access problem", "Device access problem") +#define TR_DEVICE_FILE_REJECTED TR("Device file refused", "Device file refused") +#define TR_DEVICE_FILE_WRONG_SIG TR("Device file sig.", "Device file sig.") #define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "Flash Internal Multi")