diff --git a/radio/src/gui/9x/menu_model_setup.cpp b/radio/src/gui/9x/menu_model_setup.cpp index 75b554bf0..7cd7b247e 100644 --- a/radio/src/gui/9x/menu_model_setup.cpp +++ b/radio/src/gui/9x/menu_model_setup.cpp @@ -596,11 +596,11 @@ void menuModelSetup(uint8_t event) coord_t xOffsetBind = MODEL_SETUP_BIND_OFS; if (IS_MODULE_XJT(moduleIdx) && IS_D8_RX(moduleIdx)) { xOffsetBind = 0; - lcd_putsLeft(y, INDENT "Receiver"); + lcd_putsLeft(y, STR_RECEIVER); if (attr) l_posHorz += 1; } else { - lcd_putsLeft(y, STR_RXNUM); + lcd_putsLeft(y, STR_RECEIVER_NUM); } if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) { if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2); @@ -773,7 +773,7 @@ void menuModelSetup(uint8_t event) if (attr && menuHorizontalPosition > 1) { REPEAT_LAST_CURSOR_MOVE(); // limit 3 column row to 2 colums (Rx_Num and RANGE fields) } - lcd_putsLeft(y, STR_RXNUM); + lcd_putsLeft(y, STR_RECEIVER_NUM); lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[0], (menuHorizontalPosition<=0 ? attr : 0) | LEADING0|LEFT, 2); if (attr && (menuHorizontalPosition==0 && (editMode>0 || p1valdiff))) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[0], 99); diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp index 858dd478c..228e927f5 100644 --- a/radio/src/gui/horus/menu_model_setup.cpp +++ b/radio/src/gui/horus/menu_model_setup.cpp @@ -662,11 +662,11 @@ bool menuModelSetup(evt_t event) coord_t xOffsetBind = MODEL_SETUP_BIND_OFS; if (IS_MODULE_XJT(moduleIdx) && IS_D8_RX(moduleIdx)) { xOffsetBind = 0; - lcdDrawText(MENUS_MARGIN_LEFT, y, INDENT "Receiver"); + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RECEIVER); if (attr) l_posHorz += 1; } else { - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RXNUM); + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_RECEIVER_NUM); } if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) { if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0 | LEFT, 2); diff --git a/radio/src/gui/taranis/menu_model_setup.cpp b/radio/src/gui/taranis/menu_model_setup.cpp index 08182e92d..07936524d 100644 --- a/radio/src/gui/taranis/menu_model_setup.cpp +++ b/radio/src/gui/taranis/menu_model_setup.cpp @@ -894,11 +894,11 @@ void menuModelSetup(uint8_t event) coord_t xOffsetBind = MODEL_SETUP_BIND_OFS; if (IS_MODULE_XJT(moduleIdx) && g_model.moduleData[moduleIdx].rfProtocol == RF_PROTO_D8) { xOffsetBind = 0; - lcd_putsLeft(y, INDENT "Receiver"); + lcd_putsLeft(y, STR_RECEIVER); if (attr) l_posHorz += 1; } else { - lcd_putsLeft(y, STR_RXNUM); + lcd_putsLeft(y, STR_RECEIVER_NUM); } if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx) || IS_MODULE_MULTIMODULE(moduleIdx)) { if (xOffsetBind) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2); @@ -1105,21 +1105,22 @@ void menuModelFailsafe(uint8_t event) uint8_t wbar = (longNames ? SLIDER_W-10 : SLIDER_W); #endif + uint8_t xValue = x+COL_W-4-wbar-ofs; if (failsafeValue == FAILSAFE_CHANNEL_HOLD) { - lcdDrawText(x+COL_W-4-wbar-ofs-16, y, "HOLD", flags); + lcdDrawText(xValue, y, STR_HOLD, RIGHT|flags); failsafeValue = 0; } else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { - lcdDrawText(x+COL_W-4-wbar-ofs-16, y, "NONE", flags); + lcdDrawText(xValue, y, STR_NONE, RIGHT|flags); failsafeValue = 0; } else { #if defined(PPM_UNIT_US) - lcdDrawNumber(x+COL_W-4-wbar-ofs, y, PPM_CH_CENTER(ch)+failsafeValue/2, flags); + lcdDrawNumber(xValue, y, PPM_CH_CENTER(ch)+failsafeValue/2, RIGHT|flags); #elif defined(PPM_UNIT_PERCENT_PREC1) - lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue), PREC1|flags); + lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue), RIGHT|PREC1|flags); #else - lcdDrawNumber(x+COL_W-4-wbar-ofs, y, calcRESXto1000(failsafeValue)/10, flags); + lcdDrawNumber(xValue, y, calcRESXto1000(failsafeValue)/10, RIGHT|flags); #endif } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index f6143da75..5c9f115fb 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -368,7 +368,8 @@ const pm_char STR_MENUDEBUG[] PROGMEM = TR_MENUDEBUG; const pm_char STR_MENUGLOBALVARS[] PROGMEM = TR_MENUGLOBALVARS; #if defined(DSM2) || defined(PXX) -const pm_char STR_RXNUM[] PROGMEM = TR_RXNUM; +const pm_char STR_RECEIVER_NUM[] PROGMEM = TR_RECEIVER_NUM; +const pm_char STR_RECEIVER[] PROGMEM = TR_RECEIVER; #endif #if defined(PXX) || defined(CPUARM) @@ -378,6 +379,8 @@ const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF; const pm_char STR_COUNTRYCODE[] PROGMEM = TR_COUNTRYCODE; const pm_char STR_FAILSAFE[] PROGMEM = TR_FAILSAFE; const pm_char STR_FAILSAFESET[] PROGMEM = TR_FAILSAFESET; +const pm_char STR_HOLD[] PROGMEM = TR_HOLD; +const pm_char STR_NONE[] PROGMEM = TR_NONE; const pm_char STR_MENUSENSOR[] PROGMEM = TR_MENUSENSOR; const pm_char STR_SENSOR[] PROGMEM = TR_SENSOR; #endif diff --git a/radio/src/translations.h b/radio/src/translations.h index b7d068a29..328dec01c 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -583,7 +583,8 @@ extern const pm_char STR_MULTI_LOWPOWER[]; extern const pm_char STR_MULTI_DSMFRAME[]; #endif #if defined(DSM2) || defined(PXX) -extern const pm_char STR_RXNUM[]; +extern const pm_char STR_RECEIVER_NUM[]; +extern const pm_char STR_RECEIVER[]; #endif #if defined(PXX) || defined(CPUARM) @@ -592,6 +593,8 @@ extern const pm_char STR_INTERNALRF[]; extern const pm_char STR_EXTERNALRF[]; extern const pm_char STR_FAILSAFE[]; extern const pm_char STR_FAILSAFESET[]; +extern const pm_char STR_HOLD[]; +extern const pm_char STR_NONE[]; extern const pm_char STR_MENUSENSOR[]; extern const pm_char STR_SENSOR[]; extern const pm_char STR_COUNTRYCODE[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 076a29894..a56e0f7b4 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -848,9 +848,10 @@ #define TR_MENUSTAT "STATISTIKA" #define TR_MENUDEBUG "DIAG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "RX číslo", INDENT "Číslo přijímače") + #define TR_RECEIVER_NUM TR(INDENT "RX číslo", INDENT "Číslo přijímače") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "RX číslo" + #define TR_RECEIVER_NUM "RX číslo" #endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -968,6 +969,8 @@ #define TR_EXTERNALRF "Externí RF modul" #define TR_FAILSAFE "Mód Failsafe" #define TR_FAILSAFESET "NASTAVENÍ FAILSAFE" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENZOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Kód regionu" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 8ceb13402..a00f57b84 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -852,9 +852,10 @@ #define TR_MENUSTAT "STAT" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "Empf Nr.", INDENT "Modell-Match-Nr.") + #define TR_RECEIVER_NUM TR(INDENT "Empf Nr.", INDENT "Modell-Match-Nr.") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "Empf Nr." + #define TR_RECEIVER_NUM "Empf Nr." #endif #define TR_MULTI_RFTUNE INDENT "Frequenzfeineinst." #define TR_MULTI_VIDFREQ INDENT "Videofrequenz" @@ -972,6 +973,8 @@ #define TR_EXTERNALRF TR("---Externes HF-Modul---", "----Externes HF-Modul----------") //9XR-Pro #define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Mode") #define TR_FAILSAFESET "Failsafe setzen" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Landescode" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index ed72ef5d2..84e7d5e9a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -862,9 +862,11 @@ #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "RxNum", INDENT "Receiver No.") + #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.") + #define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "RxNum" + #define TR_RECEIVER_NUM "RxNum" + #define TR_RECEIVER "RxNum" #endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -982,6 +984,8 @@ #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe mode") #define TR_FAILSAFESET "FAILSAFE SETTINGS" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSORS" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Country code" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 6d086875b..eb1de1804 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -815,7 +815,8 @@ #define TR_MENUTEMPLATES "PLANTILLAS" #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receptor No.") +#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receptor No.") +#define TR_RECEIVER INDENT "Receiver" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" #define TR_MULTI_DSMFRAME INDENT "DSM frame format" @@ -932,6 +933,8 @@ #define TR_EXTERNALRF "Externa RF" #define TR_FAILSAFE INDENT"Modo sgdad." #define TR_FAILSAFESET "AJUSTES SGDAD." +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Codigo Pais" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8e7c06bae..70462bcd6 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -815,7 +815,8 @@ #define TR_MENUTEMPLATES "TEMPLATES" #define TR_MENUSTAT "STATS" #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR("RxNum", INDENT"Receiver No.") +#define TR_RECEIVER_NUM TR("RxNum", INDENT"Receiver No.") +#define TR_RECEIVER INDENT "Receiver" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" #define TR_MULTI_DSMFRAME INDENT "DSM frame format" @@ -932,6 +933,8 @@ #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE INDENT "Failsafe mode" #define TR_FAILSAFESET "FAILSAFE SETTINGS" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Country Code" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 29ba6a0e7..b27bce803 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -842,7 +842,13 @@ #define TR_MENUTEMPLATES "GABARITS" #define TR_MENUSTAT TR("STATS", "STATISTIQUES") #define TR_MENUDEBUG "DEBUG" -#define TR_RXNUM TR(INDENT "NumRx", INDENT "No. récepteur") +#if defined(CPUARM) + #define TR_RECEIVER_NUM TR(INDENT "NumRx", INDENT "No. récepteur") + #define TR_RECEIVER INDENT "Récepteur" +#else + #define TR_RECEIVER_NUM "Récepteur" + #define TR_RECEIVER "Récepteur" +#endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" #define TR_MULTI_DSMFRAME INDENT "DSM frame format" @@ -959,6 +965,8 @@ #define TR_EXTERNALRF "HF externe" #define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Type failsafe") #define TR_FAILSAFESET "REGLAGES FAILSAFE" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "CAPTEUR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE TR("Zone géo.","Zone géographique") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 422ea8c0c..ab36ccc8f 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -847,9 +847,10 @@ #define TR_MENUSTAT "STATO" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "RxNum", INDENT "Ricevente No.") + #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Ricevente No.") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "RxNum" + #define TR_RECEIVER_NUM "RxNum" #endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -967,6 +968,8 @@ #define TR_EXTERNALRF "Modulo esterno" #define TR_FAILSAFE "Modo failsafe" #define TR_FAILSAFESET TR("FAILSAFE","IMPOSTAZIONI FAILSAFE") +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE TR("Codice Paese","Standard 2.4Ghz") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index cb01fe933..38031bf16 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -861,9 +861,10 @@ #define TR_MENUSTAT "STAT" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "RxNum", INDENT "Receiver No.") + #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Receiver No.") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "RxNum" + #define TR_RECEIVER_NUM "RxNum" #endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -981,6 +982,8 @@ #define TR_EXTERNALRF "Externe RF" #define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafe Modus") #define TR_FAILSAFESET "Failsafe instellen" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Landcode" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 389bdcaa0..b58c407f4 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -849,9 +849,10 @@ #define TR_MENUSTAT "STAT" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR( INDENT "Nr RX",INDENT "Nr odbiornika") + #define TR_RECEIVER_NUM TR( INDENT "Nr RX",INDENT "Nr odbiornika") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "NumOdb" + #define TR_RECEIVER_NUM "NumOdb" #endif #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -969,6 +970,8 @@ #define TR_EXTERNALRF "Zewn.Moduł RF" #define TR_FAILSAFE TR(INDENT"Failsafe",INDENT"Tryb Failsafe") #define TR_FAILSAFESET "USTAWIENIE FAILSAFE" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "CZUJNIK" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Kod regionu" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 62865af4b..7cab3ff64 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -811,7 +811,8 @@ #define TR_MENUTEMPLATES "MODELOS" #define TR_MENUSTAT "REGISTROS" #define TR_MENUDEBUG "DEPURAR" -#define TR_RXNUM "RxNum" +#define TR_RECEIVER_NUM "RxNum" +#define TR_RECEIVER INDENT "Receiver" #define TR_SYNCMENU "Sync [MENU]" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" #define TR_MULTI_VIDFREQ INDENT "Video frequency" @@ -928,6 +929,8 @@ #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" #define TR_FAILSAFESET "FAILSAFE SETTINGS" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Country Code" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 98eaff76a..30ae9b7c1 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -860,9 +860,10 @@ #define TR_MENUSTAT "STATISTIK" #define TR_MENUDEBUG "DEBUG" #if defined(CPUARM) - #define TR_RXNUM TR(INDENT "RxNum", INDENT "Mottagare Nr.") + #define TR_RECEIVER_NUM TR(INDENT "RxNum", INDENT "Mottagare Nr.") +#define TR_RECEIVER INDENT "Receiver" #else - #define TR_RXNUM "RxNum" + #define TR_RECEIVER_NUM "RxNum" #endif #define TR_SYNCMENU "Synk [MENU]" #define TR_MULTI_RFTUNE INDENT "RF Freq. fine tune" @@ -980,6 +981,8 @@ #define TR_EXTERNALRF "Extern Radiomodul" #define TR_FAILSAFE TR(INDENT "Failsafe", INDENT "Failsafeläge") #define TR_FAILSAFESET "FailsafeInställning" +#define TR_HOLD "HOLD" +#define TR_NONE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_SENSOR "SENSOR" #define TR_COUNTRYCODE "Landskod"