From 4f6828aa1c8a5bc58065a7d7097a3ffe8bd002d9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Tue, 30 Apr 2019 12:34:15 +0200 Subject: [PATCH] Rework failsafe : cosmetics --- radio/src/gui/128x64/model_failsafe.cpp | 4 ++-- radio/src/gui/212x64/model_failsafe.cpp | 2 +- radio/src/gui/480x272/model_failsafe.cpp | 2 +- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- radio/src/translations/cz.h.txt | 4 ++-- radio/src/translations/de.h.txt | 4 ++-- radio/src/translations/en.h.txt | 2 +- radio/src/translations/es.h.txt | 4 ++-- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 4 ++-- radio/src/translations/nl.h.txt | 4 ++-- radio/src/translations/pl.h.txt | 4 ++-- radio/src/translations/pt.h.txt | 4 ++-- radio/src/translations/se.h.txt | 4 ++-- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/radio/src/gui/128x64/model_failsafe.cpp b/radio/src/gui/128x64/model_failsafe.cpp index 3eddfd88e..8c8b6aa3c 100644 --- a/radio/src/gui/128x64/model_failsafe.cpp +++ b/radio/src/gui/128x64/model_failsafe.cpp @@ -37,7 +37,7 @@ void onFailsafeMenu(const char *result) else if (result == STR_CHANNEL2FAILSAFE) { failsafe = channelValue; } - else if (result == STR_OUTPUTS2FAILSAFE) { + else if (result == STR_CHANNELS2FAILSAFE) { setCustomFailsafe(g_moduleIdx); } s_editMode = 0; @@ -69,7 +69,7 @@ void menuModelFailsafe(event_t event) POPUP_MENU_ADD_ITEM(STR_NONE); POPUP_MENU_ADD_ITEM(STR_HOLD); POPUP_MENU_ADD_ITEM(STR_CHANNEL2FAILSAFE); - POPUP_MENU_ADD_ITEM(STR_OUTPUTS2FAILSAFE); + POPUP_MENU_ADD_ITEM(STR_CHANNELS2FAILSAFE); POPUP_MENU_START(onFailsafeMenu); } diff --git a/radio/src/gui/212x64/model_failsafe.cpp b/radio/src/gui/212x64/model_failsafe.cpp index 059e25736..1a32f6482 100644 --- a/radio/src/gui/212x64/model_failsafe.cpp +++ b/radio/src/gui/212x64/model_failsafe.cpp @@ -172,6 +172,6 @@ void menuModelFailsafe(event_t event) if (menuVerticalPosition >= sentModuleChannels(g_moduleIdx)) { // Outputs => Failsafe - lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_OUTPUTS2FAILSAFE, INVERS); + lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_CHANNELS2FAILSAFE, INVERS); } } diff --git a/radio/src/gui/480x272/model_failsafe.cpp b/radio/src/gui/480x272/model_failsafe.cpp index bcc04d7a5..02ae5e6f2 100644 --- a/radio/src/gui/480x272/model_failsafe.cpp +++ b/radio/src/gui/480x272/model_failsafe.cpp @@ -128,7 +128,7 @@ bool menuModelFailsafe(event_t event) // draw that menu at the bottom center flags = CENTERED | (menuVerticalPosition == ch ? INVERS : 0); - lcdDrawSizedText(LCD_W/2, MENU_CONTENT_TOP - FH + 8*(FH+2), STR_OUTPUTS2FAILSAFE, 20, flags); + lcdDrawSizedText(LCD_W/2, MENU_CONTENT_TOP - FH + 8*(FH+2), STR_CHANNELS2FAILSAFE, 20, flags); break; } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index e7002dbf1..82827e03b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -292,7 +292,7 @@ const char STR_THROTTLENOTIDLE[] = TR_THROTTLENOTIDLE; const char STR_ALARMSDISABLED[] = TR_ALARMSDISABLED; const char STR_PRESSANYKEY[] = TR_PRESSANYKEY; const char STR_TRIMS2OFFSETS[] = TR_TRIMS2OFFSETS; -const char STR_OUTPUTS2FAILSAFE[] = TR_OUTPUTS2FAILSAFE; +const char STR_CHANNELS2FAILSAFE[] = TR_CHANNELS2FAILSAFE; const char STR_CHANNEL2FAILSAFE[] = TR_CHANNEL2FAILSAFE; const char STR_MENURADIOSETUP[] = TR_MENURADIOSETUP; diff --git a/radio/src/translations.h b/radio/src/translations.h index ada05b6fc..b04ad4cc0 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -511,7 +511,7 @@ extern const char STR_BAD_RADIO_DATA[]; extern const char STR_STORAGE_FORMAT[]; extern const char STR_EEPROMOVERFLOW[]; extern const char STR_TRIMS2OFFSETS[]; -extern const char STR_OUTPUTS2FAILSAFE[]; +extern const char STR_CHANNELS2FAILSAFE[]; extern const char STR_CHANNEL2FAILSAFE[]; extern const char STR_MENURADIOSETUP[]; extern const char STR_MENUDATEANDTIME[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index e1a4c372a..ba5dd364a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -748,10 +748,10 @@ #define TR_TRIMS2OFFSETS "\006Trimy => Subtrimy" #endif #if defined(COLORLCD) -#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" +#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else -#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" +#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL "MODEL" #define TR_MENUSETUP "NASTAVENÍ" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c9e1b0b37..5b5f6125a 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -759,10 +759,10 @@ #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif #if defined(COLORLCD) -#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" +#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else -#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" +#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL TR("MODELLE", "MODELL WÄHLEN") #define TR_MENUSETUP TR("MODELL-EINSTELLUNG", "MODELL-EINSTELLUNGEN") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index d55b1d27d..e438fb712 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -752,7 +752,7 @@ #else #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif -#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" +#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #define TR_MENUMODELSEL TR("MODELSEL", "MODEL SELECTION") #define TR_MENUSETUP TR("SETUP", "MODEL SETUP") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 04b8d93d4..24f3f41fc 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -752,10 +752,10 @@ #define TR_TRIMS2OFFSETS "\006Trims => Offsets" #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL TR("MODELSEL", "SELECCION MODELO") #define TR_MENUSETUP TR("CONF.", "CONF.MODELO") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 4f4ad7594..c13f4411d 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -743,7 +743,7 @@ #else #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif -#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" +#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION") #define TR_MENUSETUP TR("SETUP","MODEL SETUP") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 07bdd07ed..c88773f74 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -764,7 +764,7 @@ #else #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif -#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" +#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #define TR_MENUMODELSEL "MODELES" #define TR_MENUSETUP TR("CONF. MODELE", "CONFIGURATION") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 1bfea2cbb..4842284f5 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -754,10 +754,10 @@ #define TR_TRIMS2OFFSETS "\006Trim => Offset " #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL "MODELLI" #define TR_MENUSETUP "CONFIGURA" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 53c43da30..01b381e4c 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -755,10 +755,10 @@ TR_GYR_VSRCRAW #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL TR("MODELLEN", "MODEL KIEZEN") #define TR_MENUSETUP TR("MODEL-INSTELLING", "MODEL-INSTELLINGEN") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index b9660e73a..1a1a58c33 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -755,10 +755,10 @@ #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL TR("WYB.MODEL","WYBÓR MODELU") #define TR_MENUSETUP TR("USTAW","USTAW MODELU") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index cd20b31e8..884da125d 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -751,10 +751,10 @@ #define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL "MODELOS" #define TR_MENUSETUP "SETUP" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index b4ce69e42..00353eda2 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -767,10 +767,10 @@ #define TR_TRIMS2OFFSETS "\006[Spara Trimvärden]" #endif #if defined(COLORLCD) - #define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe" + #define TR_CHANNELS2FAILSAFE "Channels=>Failsafe" #define TR_CHANNEL2FAILSAFE "Channel=>Failsafe" #else - #define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe" + #define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe" #endif #define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL") #define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")