diff --git a/companion/src/constants.h b/companion/src/constants.h index 55638d5db..aa49091ca 100644 --- a/companion/src/constants.h +++ b/companion/src/constants.h @@ -43,17 +43,19 @@ #define CPN_MAX_KEYS 32 #define CPN_MAX_MOUSE_ANALOGS 2 -#define HEX_FILES_FILTER "HEX files (*.hex);;" -#define BIN_FILES_FILTER "BIN files (*.bin);;" -#define DFU_FILES_FILTER "DFU files (*.dfu);;" -#define EEPE_FILES_FILTER "EEPE files (*.eepe);;" -#define OTX_FILES_FILTER "OpenTX files (*.otx);;" -#define EEPROM_FILES_FILTER "Radio and Models settings files (*.otx *.eepe *.bin *.hex);;" OTX_FILES_FILTER EEPE_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER -#define FLASH_FILES_FILTER "FLASH files (*.bin *.hex *.dfu);;" BIN_FILES_FILTER HEX_FILES_FILTER DFU_FILES_FILTER -#define EXTERNAL_EEPROM_FILES_FILTER "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER -#define ER9X_EEPROM_FILE_TYPE "ER9X_EEPROM_FILE" -#define EEPE_EEPROM_FILE_HEADER "EEPE EEPROM FILE" -#define EEPE_MODEL_FILE_HEADER "EEPE MODEL FILE" +#define CPN_STR_FILES QT_TRANSLATE_NOOP("CompanionMacros", "files") +#define CPN_STR_RAD_MOD_SETTINGS QT_TRANSLATE_NOOP("CompanionMacros", "Radio and Models settings") +#define HEX_FILES_FILTER "HEX " CPN_STR_FILES " (*.hex);;" +#define BIN_FILES_FILTER "BIN " CPN_STR_FILES " (*.bin);;" +#define DFU_FILES_FILTER "DFU " CPN_STR_FILES " (*.dfu);;" +#define EEPE_FILES_FILTER "EEPE " CPN_STR_FILES " (*.eepe);;" +#define OTX_FILES_FILTER "OpenTX " CPN_STR_FILES " (*.otx);;" +#define EEPROM_FILES_FILTER CPN_STR_RAD_MOD_SETTINGS " " CPN_STR_FILES " (*.otx *.eepe *.bin *.hex);;" OTX_FILES_FILTER EEPE_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER +#define FLASH_FILES_FILTER "FLASH " CPN_STR_FILES " (*.bin *.hex *.dfu);;" BIN_FILES_FILTER HEX_FILES_FILTER DFU_FILES_FILTER +#define EXTERNAL_EEPROM_FILES_FILTER "EEPROM " CPN_STR_FILES " (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER +#define ER9X_EEPROM_FILE_TYPE "ER9X_EEPROM_FILE" +#define EEPE_EEPROM_FILE_HEADER "EEPE EEPROM FILE" +#define EEPE_MODEL_FILE_HEADER "EEPE MODEL FILE" const char * const ARROW_LEFT = "\xE2\x86\x90"; const char * const ARROW_UP = "\xE2\x86\x91"; diff --git a/companion/src/flasheepromdialog.h b/companion/src/flasheepromdialog.h index 0cb2ae1d0..e7973bce6 100644 --- a/companion/src/flasheepromdialog.h +++ b/companion/src/flasheepromdialog.h @@ -21,12 +21,9 @@ #ifndef _FLASHEEPROMDIALOG_H_ #define _FLASHEEPROMDIALOG_H_ +#include #include -#define HEX_FILES_FILTER "HEX files (*.hex);;" -#define BIN_FILES_FILTER "BIN files (*.bin);;" -#define EXTERNAL_EEPROM_FILES_FILTER "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER - namespace Ui { class FlashEEpromDialog; diff --git a/companion/src/multiprotocols.cpp b/companion/src/multiprotocols.cpp index 1e8394044..502abeed2 100644 --- a/companion/src/multiprotocols.cpp +++ b/companion/src/multiprotocols.cpp @@ -23,10 +23,19 @@ #include "multiprotocols.h" #include "radiodata.h" -#define tr QObject::tr +#define STR_MULTI_SUBTYPE QT_TRANSLATE_NOOP("Multiprotocols", "Subtype") +#define STR_MULTI_VIDFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Video TX frequency") +#define STR_MULTI_RFTUNE QT_TRANSLATE_NOOP("Multiprotocols", "C2500 frequency fine tune") +#define STR_MULTI_TELEMETRY QT_TRANSLATE_NOOP("Multiprotocols", "Telemetry") +#define STR_MULTI_RFPOWER QT_TRANSLATE_NOOP("Multiprotocols", "Radio output power") +#define STR_MULTI_SERVOFREQ QT_TRANSLATE_NOOP("Multiprotocols", "Servo output frequency") +#define STR_MULTI_OPTION QT_TRANSLATE_NOOP("Multiprotocols", "Option value") +#define STR_MULTI_DEFAULT QT_TRANSLATE_NOOP("Multiprotocols", "DEFAULT") -static const QStringList STR_SUBTYPE_CUSTOM ({tr("Subtype 0"), tr("Subtype 1"), tr("Subtype 2"), tr("Subtype 3"), - tr("Subtype 4"), tr("Subtype 5"), tr("Subtype 6"), tr("Subtype 7")}); +static const QStringList STR_SUBTYPE_CUSTOM ({ + STR_MULTI_SUBTYPE " 0", STR_MULTI_SUBTYPE " 1", STR_MULTI_SUBTYPE " 2", STR_MULTI_SUBTYPE " 3", + STR_MULTI_SUBTYPE " 4", STR_MULTI_SUBTYPE " 5", STR_MULTI_SUBTYPE " 6", STR_MULTI_SUBTYPE " 7" + }); static const QStringList STR_SUBTYPE_FLYSKY {"Standard", "V9x9", "V6x6", "V912", "CX20"}; static const QStringList STR_SUBTYPE_FRSKY {"D16", "D8", "D16 8ch", "V8", "D16 EU-LBT", "D16 EU-LBT 8ch"}; static const QStringList STR_SUBTYPE_HISKY {"HiSky", "HK310"}; @@ -47,14 +56,7 @@ static const QStringList STR_SUBTYPE_AFHDS2A {"PWM and IBUS", "PPM and IBUS", "P static const QStringList STR_SUBTYPE_Q2X2 {"Q222", "Q242", "Q282"}; static const QStringList STR_SUBTYPE_WK2x01 {"WK2801", "WK2401", "W6_5_1", "W6_6_1", "W6_HEL", "W6_HEL_I"}; static const QStringList STR_SUBTYPE_Q303 {"Q303", "CX35", "CX10D", "CX10WD"}; -static const QStringList NO_SUBTYPE {tr("DEFAULT")}; - -static const QString STR_MULTI_VIDFREQ = tr("Video TX frequency"); -static const QString STR_MULTI_RFTUNE = tr("C2500 frequency fine tune"); -static const QString STR_MULTI_TELEMETRY = tr("Telemetry"); -static const QString STR_MULTI_RFPOWER = tr("Radio output power"); -static const QString STR_MULTI_SERVOFREQ = tr("Servo output frequency"); -static const QString STR_MULTI_OPTION= tr("Option value"); +static const QStringList NO_SUBTYPE {STR_MULTI_DEFAULT}; // Table is designed to be shared with gui_common_arm.cpp