From da428b4e5778ef4005fe2cf7a736da8cde9c12c0 Mon Sep 17 00:00:00 2001 From: ulfhedlund <35467815+ulfhedlund@users.noreply.github.com> Date: Tue, 7 Mar 2023 03:39:06 +0100 Subject: [PATCH] chore: Translate pots slider warnings (#3281) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Translations for pot/slider check * Translation for pot/slider check * Add files via upload * Updated da.h * Updated de.h * Update cz.h * Update cn.h * Update en.h * Update es.h * Update fi.h * Update fr.h * Update it.h * Update jp.h * Update nl.h * Update pl.h * Update pt.h * Update tw.h * Added translation for JP * Update cn.h * Translation for TW * Update se.h * TR_PREFLIGHT_POTSLIDER_CHECK translated for PL --- radio/src/gui/128x64/model_setup.cpp | 3 +-- radio/src/gui/212x64/model_setup.cpp | 4 +--- radio/src/gui/colorlcd/preflight_checks.cpp | 2 +- radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/cn.h | 1 + radio/src/translations/cz.h | 1 + radio/src/translations/da.h | 1 + radio/src/translations/de.h | 1 + radio/src/translations/en.h | 1 + radio/src/translations/es.h | 1 + radio/src/translations/fi.h | 1 + radio/src/translations/fr.h | 1 + radio/src/translations/it.h | 1 + radio/src/translations/jp.h | 1 + radio/src/translations/nl.h | 1 + radio/src/translations/pl.h | 1 + radio/src/translations/pt.h | 1 + radio/src/translations/se.h | 5 +++-- radio/src/translations/tw.h | 1 + 20 files changed, 22 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 2e4a2ae89..0dec41adc 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -443,7 +443,6 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event) NUM_SWITCHES - 1, /* Switch warning */ #endif -static const char* _pots_warn_modes[] = { "OFF", "Man", "Auto" }; #if defined(FUNCTION_SWITCHES) static const char* _fct_sw_start[] = { STR_CHAR_UP, STR_CHAR_DOWN, "=" }; #endif @@ -912,7 +911,7 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_POTS_WARNING: lcdDrawTextAlignedLeft(y, STR_POTWARNING); - lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, _pots_warn_modes, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); + lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_PREFLIGHT_POTSLIDER_CHECK, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); if (attr && (menuHorizontalPosition == 0)) { CHECK_INCDEC_MODELVAR(event, g_model.potsWarnMode, POTS_WARN_OFF, POTS_WARN_AUTO); storageDirty(EE_MODEL); diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 8e9c3d8dc..9757dbc90 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -392,8 +392,6 @@ void onBluetoothConnectMenu(const char * result) #include "common/stdlcd/model_setup_afhds3.cpp" #endif -static const char* _pots_warn_modes[] = { "OFF", "Man", "Auto" }; - void menuModelSetup(event_t event) { horzpos_t l_posHorz = menuHorizontalPosition; @@ -822,7 +820,7 @@ void menuModelSetup(event_t event) #endif lcdDrawTextAlignedLeft(y, STR_POTWARNING); - lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, _pots_warn_modes, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); + lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_PREFLIGHT_POTSLIDER_CHECK, g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0); if (attr && (menuHorizontalPosition == 0)) { CHECK_INCDEC_MODELVAR(event, g_model.potsWarnMode, POTS_WARN_OFF, POTS_WARN_AUTO); storageDirty(EE_MODEL); diff --git a/radio/src/gui/colorlcd/preflight_checks.cpp b/radio/src/gui/colorlcd/preflight_checks.cpp index de327c704..afd085497 100644 --- a/radio/src/gui/colorlcd/preflight_checks.cpp +++ b/radio/src/gui/colorlcd/preflight_checks.cpp @@ -142,7 +142,7 @@ PreflightChecks::PreflightChecks() : Page(ICON_MODEL_SETUP) #if NUM_POTS + NUM_SLIDERS line = form->newLine(&grid); new StaticText(line, rect_t{}, STR_POTWARNINGSTATE, 0, COLOR_THEME_PRIMARY1); - auto pots_wm = new Choice(line, rect_t{}, {"OFF", "ON", "AUTO"}, 0, 2, + auto pots_wm = new Choice(line, rect_t{}, {STR_PREFLIGHT_POTSLIDER_CHECK}, 0, 2, GET_SET_DEFAULT(g_model.potsWarnMode)); #if (NUM_POTS) // Pot warnings diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ad397ecea..f064be28b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -100,6 +100,7 @@ ISTR(SPORT_MODES); ISTR(FSGROUPS); ISTR(ADCFILTERVALUES); ISTR(TIMER_DIR); +ISTR(PREFLIGHT_POTSLIDER_CHECK); #if defined(HELI) ISTR(VSWASHTYPE); diff --git a/radio/src/translations.h b/radio/src/translations.h index 50df14f0a..1e800079d 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -937,6 +937,7 @@ extern const char STR_MODULE_PROTOCOL_FCC_WARN_LINE1[]; extern const char STR_MODULE_PROTOCOL_EU_WARN_LINE1[]; extern const char STR_MODULE_PROTOCOL_WARN_LINE2[]; extern const char STR_SET[]; +extern const char* const STR_PREFLIGHT_POTSLIDER_CHECK[]; extern const char STR_PREFLIGHT[]; extern const char STR_CHECKLIST[]; extern const char STR_VIEW_NOTES[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 81ae821bb..4c14948aa 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -962,6 +962,7 @@ #define TR_GLOBALVAR "全局变量" #define TR_MIXSOURCE "混控源" #define TR_CONSTANT "固定值" +#define TR_PREFLIGHT_POTSLIDER_CHECK "关闭","开启","自动" #define TR_PREFLIGHT "初始位置检查" #define TR_CHECKLIST TR(INDENT "显示列表", INDENT "显示列表") #define TR_AUX_SERIAL_MODE "串口" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 5ba87d862..e6d1f9e24 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -966,6 +966,7 @@ #define TR_GLOBALVAR "Glob. proměnná" #define TR_MIXSOURCE "Zdroje mixeru" #define TR_CONSTANT "Konstanta" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Vyp","Zap","Auto" #define TR_PREFLIGHT "Předletová kontrola" #define TR_CHECKLIST TR(INDENT "Poznámky", INDENT "Zobrazit poznámky") #define TR_AUX_SERIAL_MODE "Seriový port" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 3aeb958f9..757ed2281 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -968,6 +968,7 @@ #define TR_GLOBALVAR TR("Global var", "Global variabel") #define TR_MIXSOURCE "Mix kilde" #define TR_CONSTANT "Konstant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Fra","Til","Auto" #define TR_PREFLIGHT "Fly checkliste" #define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Vis checkliste") #define TR_AUX_SERIAL_MODE "Seriel port" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index e125ff945..de8924d01 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -964,6 +964,7 @@ #define TR_GLOBALVAR "Global Var" #define TR_MIXSOURCE "Mixer Quelle" #define TR_CONSTANT "Konstant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Aus","Ein","Auto" #define TR_PREFLIGHT "Vorflug-Checkliste" #define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Checkliste anzeigen") //9XR-Pro #define TR_AUX_SERIAL_MODE "Serieller Port" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index c448dce1d..a8d26434a 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -960,6 +960,7 @@ #define TR_GLOBALVAR "Global var" #define TR_MIXSOURCE "Mixer source" #define TR_CONSTANT "Constant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","AUTO" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display checklist") #define TR_AUX_SERIAL_MODE "Serial port" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index f0d64d394..ab4e65c25 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -968,6 +968,7 @@ #define TR_GLOBALVAR "Var global" #define TR_MIXSOURCE "Entrada mixer" #define TR_CONSTANT "Constante" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Chequeos prevuelo" #define TR_CHECKLIST TR(INDENT "Lista verif", INDENT "Lista verificación") #define TR_AUX_SERIAL_MODE "Puerto serie" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 22b414d38..38b2301cb 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -978,6 +978,7 @@ #define TR_GLOBALVAR "Global Var" #define TR_MIXSOURCE "Mixer Source" #define TR_CONSTANT "Constant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" #define TR_AUX_SERIAL_MODE "Sarjaportti" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index dc3ac26f4..3efa17ff2 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -975,6 +975,7 @@ #define TR_GLOBALVAR "Var. globale" #define TR_MIXSOURCE "Source mixeur" #define TR_CONSTANT "Constante" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Vérifications avant vol" #define TR_CHECKLIST TR(INDENT "Notes", INDENT "Afficher notes") #define TR_AUX_SERIAL_MODE "Port série" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index 6662dcb2f..2adb668e9 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -969,6 +969,7 @@ #define TR_GLOBALVAR "Var Globale" #define TR_MIXSOURCE "Sorgente Mixer" #define TR_CONSTANT "Constante" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Controlli Prevolo" #define TR_CHECKLIST INDENT "Mostra Checklist" #define TR_AUX_SERIAL_MODE "Porta Seriale" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index c5276d2e8..c68a52cde 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -963,6 +963,7 @@ #define TR_GLOBALVAR "グローバル変数" #define TR_MIXSOURCE "ミキサーソース" #define TR_CONSTANT "変化なし" +#define TR_PREFLIGHT_POTSLIDER_CHECK "OFF","ON","自動" #define TR_PREFLIGHT "飛行前チェック" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "チェックリスト表示") #define TR_AUX_SERIAL_MODE "シリアルポート" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 52334fe24..6d9c66c2e 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -970,6 +970,7 @@ #define TR_GLOBALVAR "Globale Var" #define TR_MIXSOURCE "Mixer Bron" #define TR_CONSTANT "Constant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Toon Checklist") #define TR_AUX_SERIAL_MODE "Seriele poort" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 28032d198..1fa8ce853 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -963,6 +963,7 @@ #define TR_GLOBALVAR "Zm.Global." #define TR_MIXSOURCE "Źródło Miks." #define TR_CONSTANT "Stała " +#define TR_PREFLIGHT_POTSLIDER_CHECK "WYŁ","ZAŁ","Auto" #define TR_PREFLIGHT "Lista Ostrzeżeń" #define TR_CHECKLIST TR(INDENT "Czeklista",INDENT "Pokaż Listę Ostrzeżeń") #define TR_AUX_SERIAL_MODE "Port szreg." diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index b1bec2054..f12930507 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -971,6 +971,7 @@ #define TR_GLOBALVAR "Global Var" #define TR_MIXSOURCE "Mixer Source" #define TR_CONSTANT "Constant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Off","On","Auto" #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" #define TR_AUX_SERIAL_MODE "Serial port" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 2d0500acb..cb30c567d 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -262,9 +262,9 @@ #define TR_ROTENC_SWITCHES #if defined(COLORLCD) - #define TR_ROTARY_ENC_OPT "Normal","Inverterad" + #define TR_ROTARY_ENC_OPT "Normal","Inverterad" #else - #define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A" + #define TR_ROTARY_ENC_OPT "Normal","Inverterad","V-I H-N","V-I H-A" #endif #define TR_ON_ONE_SWITCHES "PÅ","Ett" @@ -996,6 +996,7 @@ #define TR_GLOBALVAR "Globala var" #define TR_MIXSOURCE "Mixerkälla" #define TR_CONSTANT "Konstant" +#define TR_PREFLIGHT_POTSLIDER_CHECK "Av","På","Auto" #define TR_PREFLIGHT "Startkontroller" #define TR_CHECKLIST TR(INDENT "Checklista", INDENT "Visa checklista") #define TR_AUX_SERIAL_MODE "Serieport" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 1d724d768..17b66d8af 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -961,6 +961,7 @@ #define TR_GLOBALVAR "全局變量" #define TR_MIXSOURCE "混控源" #define TR_CONSTANT "固定值" +#define TR_PREFLIGHT_POTSLIDER_CHECK "關閉","開啟","自動" #define TR_PREFLIGHT "初始位置檢查" #define TR_CHECKLIST TR(INDENT "顯示列表", INDENT "顯示列表") #define TR_AUX_SERIAL_MODE "端口"