From 335c0a3a0a0cf69278f0425d802eea859d7fd02e Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Thu, 23 Mar 2023 11:53:27 +1000 Subject: [PATCH] chore(colorlcd): Page header unification and other cosmetics (#3326) * chore: Change Radio setup page headers * chore: Model Setup page header changes * Main menu, Model Manager, Model Templates Including needed translation strings * Model telemetry sensor edit page Taking into account sensor value shown in header * chore: Change "Edit Labels" Resolves #3014 * fix(b&w): "Rx channel ord" -> "Def chan order" Resolves #3348 * chore: Update translations * chore: Change to prefered "Manage Models" * chore: Cleanup * chore: Move some colorlcd-only strings May or may not save some flash memory * fix: Missed a translation string rename --- radio/src/gui/128x64/radio_setup.cpp | 2 +- radio/src/gui/212x64/radio_setup.cpp | 2 +- radio/src/gui/colorlcd/curveedit.cpp | 2 +- radio/src/gui/colorlcd/input_edit.cpp | 7 ++-- radio/src/gui/colorlcd/input_edit_adv.cpp | 7 ++-- radio/src/gui/colorlcd/mixer_edit.cpp | 7 ++-- radio/src/gui/colorlcd/model_flightmodes.cpp | 6 ++-- radio/src/gui/colorlcd/model_gvars.cpp | 2 +- radio/src/gui/colorlcd/model_select.cpp | 13 ++++---- radio/src/gui/colorlcd/model_telemetry.cpp | 14 +++++--- radio/src/gui/colorlcd/model_templates.cpp | 6 ++-- radio/src/gui/colorlcd/module_setup.cpp | 5 +-- radio/src/gui/colorlcd/output_edit.cpp | 6 ++-- radio/src/gui/colorlcd/preflight_checks.cpp | 3 +- radio/src/gui/colorlcd/radio_diagkeys.cpp | 3 +- radio/src/gui/colorlcd/radio_setup.cpp | 28 +++++++++++++--- .../gui/colorlcd/radio_spectrum_analyser.cpp | 3 +- radio/src/gui/colorlcd/throttle_params.cpp | 3 +- radio/src/gui/colorlcd/timer_setup.cpp | 5 +-- radio/src/gui/colorlcd/trainer_setup.cpp | 3 +- radio/src/gui/colorlcd/trims_setup.cpp | 3 +- radio/src/gui/colorlcd/view_main_menu.cpp | 2 +- radio/src/translations.cpp | 31 +++++++++--------- radio/src/translations.h | 32 +++++++++---------- radio/src/translations/cn.h | 6 +++- radio/src/translations/cz.h | 6 +++- radio/src/translations/da.h | 6 +++- radio/src/translations/de.h | 6 +++- radio/src/translations/en.h | 6 +++- radio/src/translations/es.h | 6 +++- radio/src/translations/fi.h | 6 +++- radio/src/translations/fr.h | 6 +++- radio/src/translations/it.h | 6 +++- radio/src/translations/jp.h | 6 +++- radio/src/translations/nl.h | 6 +++- radio/src/translations/pl.h | 6 +++- radio/src/translations/pt.h | 6 +++- radio/src/translations/se.h | 6 +++- radio/src/translations/tw.h | 6 +++- 39 files changed, 188 insertions(+), 97 deletions(-) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 57da3de7a..529f14bad 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -640,7 +640,7 @@ void menuRadioSetup(event_t event) #endif case ITEM_RADIO_SETUP_RX_CHANNEL_ORD: - lcdDrawTextAlignedLeft(y, STR_RXCHANNELORD); // RAET->AETR + lcdDrawTextAlignedLeft(y, STR_DEF_CHAN_ORD); // RAET->AETR for (uint8_t i=1; i<=4; i++) { putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channelOrder(i), attr); } diff --git a/radio/src/gui/212x64/radio_setup.cpp b/radio/src/gui/212x64/radio_setup.cpp index 2bfc8bc8b..de17bc68f 100644 --- a/radio/src/gui/212x64/radio_setup.cpp +++ b/radio/src/gui/212x64/radio_setup.cpp @@ -582,7 +582,7 @@ void menuRadioSetup(event_t event) break; case ITEM_RADIO_SETUP_RX_CHANNEL_ORD: - lcdDrawTextAlignedLeft(y, STR_RXCHANNELORD); // RAET->AETR + lcdDrawTextAlignedLeft(y, STR_DEF_CHAN_ORD); // RAET->AETR for (uint8_t i=1; i<=4; i++) { putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channelOrder(i), attr); } diff --git a/radio/src/gui/colorlcd/curveedit.cpp b/radio/src/gui/colorlcd/curveedit.cpp index 3d0ff9e9b..31cc75776 100644 --- a/radio/src/gui/colorlcd/curveedit.cpp +++ b/radio/src/gui/colorlcd/curveedit.cpp @@ -371,7 +371,7 @@ CurveEditWindow::CurveEditWindow(uint8_t index): void CurveEditWindow::buildHeader(Window * window) { - header.setTitle(STR_MENUCURVE); + header.setTitle(STR_MENUCURVES); char s[16]; strAppendStringWithIndex(s, STR_CV, index + 1); header.setTitle2(s); diff --git a/radio/src/gui/colorlcd/input_edit.cpp b/radio/src/gui/colorlcd/input_edit.cpp index aa432d7fe..744e55202 100644 --- a/radio/src/gui/colorlcd/input_edit.cpp +++ b/radio/src/gui/colorlcd/input_edit.cpp @@ -36,10 +36,9 @@ InputEditWindow::InputEditWindow(int8_t input, uint8_t index) : input(input), index(index) { - std::string title(STR_MENUINPUTS); - title += "\n"; - title += getSourceString(MIXSRC_FIRST_INPUT + input); - header.setTitle(title); + std::string title2(getSourceString(MIXSRC_FIRST_INPUT + input)); + header.setTitle(STR_MENUINPUTS); + header.setTitle2(title2); auto body_obj = body.getLvObj(); #if LCD_H > LCD_W // portrait diff --git a/radio/src/gui/colorlcd/input_edit_adv.cpp b/radio/src/gui/colorlcd/input_edit_adv.cpp index c475afd67..898d925f6 100644 --- a/radio/src/gui/colorlcd/input_edit_adv.cpp +++ b/radio/src/gui/colorlcd/input_edit_adv.cpp @@ -33,10 +33,9 @@ static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST}; InputEditAdvanced::InputEditAdvanced(uint8_t input_n, uint8_t index) : Page(ICON_MODEL_INPUTS) { - std::string title(STR_MENUINPUTS); - title += "\n"; - title += getSourceString(MIXSRC_FIRST_INPUT + input_n); - header.setTitle(title); + std::string title2(getSourceString(MIXSRC_FIRST_INPUT + input_n)); + header.setTitle(STR_MENUINPUTS); + header.setTitle2(title2); rect_t r = rect_t{0, 0, body.width(), body.height()}; auto form = new FormWindow(&body, r); diff --git a/radio/src/gui/colorlcd/mixer_edit.cpp b/radio/src/gui/colorlcd/mixer_edit.cpp index ef37c0057..154046a1a 100644 --- a/radio/src/gui/colorlcd/mixer_edit.cpp +++ b/radio/src/gui/colorlcd/mixer_edit.cpp @@ -72,10 +72,9 @@ MixEditWindow::MixEditWindow(int8_t channel, uint8_t index) : void MixEditWindow::buildHeader(Window *window) { - std::string title(STR_MIXES); - title += "\n"; - title += getSourceString(MIXSRC_CH1 + channel); - header.setTitle(title); + std::string title2(getSourceString(MIXSRC_CH1 + channel)); + header.setTitle(STR_MIXES); + header.setTitle2(title2); new MixerEditStatusBar( window, diff --git a/radio/src/gui/colorlcd/model_flightmodes.cpp b/radio/src/gui/colorlcd/model_flightmodes.cpp index 001ed086b..da8894897 100644 --- a/radio/src/gui/colorlcd/model_flightmodes.cpp +++ b/radio/src/gui/colorlcd/model_flightmodes.cpp @@ -146,9 +146,9 @@ struct FMTrimSettings : public Dialog { FlightModeEdit::FlightModeEdit(uint8_t index) : Page(ICON_MODEL_FLIGHT_MODES) { - std::string title = std::string(TR_MENUFLIGHTMODE) - + " " + std::to_string(index); - header.setTitle(title); + std::string title2 = std::string(STR_FM) + std::to_string(index); + header.setTitle(STR_MENUFLIGHTMODES); + header.setTitle2(title2); FlexGridLayout grid(line_col_dsc, line_row_dsc, 2); auto form = new FormWindow(&body, rect_t{}); diff --git a/radio/src/gui/colorlcd/model_gvars.cpp b/radio/src/gui/colorlcd/model_gvars.cpp index 50604c024..f6dff8b04 100644 --- a/radio/src/gui/colorlcd/model_gvars.cpp +++ b/radio/src/gui/colorlcd/model_gvars.cpp @@ -193,7 +193,7 @@ class GVarEditWindow : public Page void buildHeader(Window* window) { - header.setTitle(STR_GLOBAL_VAR); + header.setTitle(STR_MENU_GLOBAL_VARS); gVarInHeader = header.setTitle2(""); } diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp index de19bfe3b..6e99eaf96 100644 --- a/radio/src/gui/colorlcd/model_select.cpp +++ b/radio/src/gui/colorlcd/model_select.cpp @@ -516,7 +516,7 @@ void ModelsPageBody::openMenu() menu->addLine(STR_SELECT_MODEL, [=]() { selectModel(focusedModel); }); } menu->addLine(STR_DUPLICATE_MODEL, [=]() { duplicateModel(focusedModel); }); - menu->addLine(STR_EDIT_LABELS, [=]() { editLabels(focusedModel); }); + menu->addLine(STR_LABEL_MODEL, [=]() { editLabels(focusedModel); }); menu->addLine(STR_SAVE_TEMPLATE, [=]() { saveAsTemplate(focusedModel);}); if (focusedModel != modelslist.getCurrentModel()) { menu->addLine(STR_DELETE_MODEL, [=]() { deleteModel(focusedModel); }); @@ -982,13 +982,12 @@ void ModelLabelsWindow::setTitle() auto curModel = modelslist.getCurrentModel(); auto modelName = curModel != nullptr ? curModel->modelName : STR_NONE; - std::string titleName = STR_SELECT_MODEL; - titleName += "\n"; - titleName += STR_CURRENT_MODEL; - titleName += ": "; - titleName += modelName; + std::string title2 = STR_ACTIVE; + title2 += ": "; + title2 += modelName; - header.setTitle(titleName); + header.setTitle(STR_MANAGE_MODELS); + header.setTitle2(title2); } //----------------------------------------------------------------------------- diff --git a/radio/src/gui/colorlcd/model_telemetry.cpp b/radio/src/gui/colorlcd/model_telemetry.cpp index 41a82f719..b22259135 100644 --- a/radio/src/gui/colorlcd/model_telemetry.cpp +++ b/radio/src/gui/colorlcd/model_telemetry.cpp @@ -259,9 +259,10 @@ class SensorEditWindow : public Page { void buildHeader(Window * window) { - header.setTitle(STR_SENSOR + std::to_string(index + 1)); + std::string title2 = STR_SENSOR + std::to_string(index + 1) + " = " + STR_NA; + header.setTitle(STR_MENUTELEMETRY); - headerValue = header.setTitle2(""); + headerValue = header.setTitle2(title2); lv_obj_set_style_text_color(headerValue->getLvObj(), makeLvColor(COLOR_THEME_WARNING), LV_STATE_USER_1); } @@ -280,9 +281,14 @@ class SensorEditWindow : public Page { if (telemetryItem.isAvailable()) { if (telemetryItem.isOld()) lv_obj_add_state(headerValue->getLvObj(), LV_STATE_USER_1); - headerValue->setText(getSensorCustomValue(index, getValue(MIXSRC_FIRST_TELEM + 3 * index), LEFT)); + std::string title2 = + STR_SENSOR + std::to_string(index + 1) + " = " + + getSensorCustomValue( + index, getValue(MIXSRC_FIRST_TELEM + 3 * index), LEFT); + headerValue->setText(title2); } else { - headerValue->setText("---"); + headerValue->setText(STR_SENSOR + std::to_string(index + 1) + " = " + + STR_NA); } } } diff --git a/radio/src/gui/colorlcd/model_templates.cpp b/radio/src/gui/colorlcd/model_templates.cpp index b3a8f749e..9d24db9cb 100644 --- a/radio/src/gui/colorlcd/model_templates.cpp +++ b/radio/src/gui/colorlcd/model_templates.cpp @@ -96,7 +96,8 @@ class SelectTemplate : public TemplatePage public: SelectTemplate(SelectTemplateFolder* tp, std::string folder) : templateFolderPage(tp) { - header.setTitle(STR_SELECT_TEMPLATE); + header.setTitle(STR_MANAGE_MODELS); + header.setTitle2(STR_NEW_MODEL); char path[LEN_PATH + 1]; snprintf(path, LEN_PATH, "%s/%s", TEMPLATES_PATH, folder.c_str()); @@ -170,7 +171,8 @@ SelectTemplateFolder::SelectTemplateFolder(std::functionupdate = update; - header.setTitle(STR_SELECT_TEMPLATE_FOLDER); + header.setTitle(STR_MANAGE_MODELS); + header.setTitle2(STR_NEW_MODEL); auto tfb = new TextButton(listWindow, rect_t{0, 0, lv_pct(100), PAGE_LINE_HEIGHT * 2}, diff --git a/radio/src/gui/colorlcd/module_setup.cpp b/radio/src/gui/colorlcd/module_setup.cpp index 57fdf0e0f..d6ebf7cde 100644 --- a/radio/src/gui/colorlcd/module_setup.cpp +++ b/radio/src/gui/colorlcd/module_setup.cpp @@ -732,9 +732,10 @@ static void update_module_window(lv_event_t* e) ModulePage::ModulePage(uint8_t moduleIdx) : Page(ICON_MODEL_SETUP) { - const char* title = moduleIdx == INTERNAL_MODULE ? + const char* title2 = moduleIdx == INTERNAL_MODULE ? STR_INTERNALRF : STR_EXTERNALRF; - header.setTitle(title); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(title2); auto form = new FormGroup(&body, rect_t{}); form->setFlexLayout(); diff --git a/radio/src/gui/colorlcd/output_edit.cpp b/radio/src/gui/colorlcd/output_edit.cpp index bdd258616..ec46b1cca 100644 --- a/radio/src/gui/colorlcd/output_edit.cpp +++ b/radio/src/gui/colorlcd/output_edit.cpp @@ -62,9 +62,9 @@ class OutputEditStatusBar : public Window OutputEditWindow::OutputEditWindow(uint8_t channel) : Page(ICON_MODEL_OUTPUTS), channel(channel) { - std::string title(STR_MENULIMITS); - title += "\n"; - title += getSourceString(MIXSRC_CH1 + channel); + std::string title2(getSourceString(MIXSRC_CH1 + channel)); + header.setTitle(STR_MENULIMITS); + header.setTitle2(title2); auto form = new FormWindow(&body, rect_t{}); auto form_obj = form->getLvObj(); diff --git a/radio/src/gui/colorlcd/preflight_checks.cpp b/radio/src/gui/colorlcd/preflight_checks.cpp index 02bed9eb8..815325546 100644 --- a/radio/src/gui/colorlcd/preflight_checks.cpp +++ b/radio/src/gui/colorlcd/preflight_checks.cpp @@ -102,7 +102,8 @@ private: PreflightChecks::PreflightChecks() : Page(ICON_MODEL_SETUP) { - header.setTitle(STR_PREFLIGHT); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(STR_PREFLIGHT); body.padAll(8); diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp index cf89e32f2..4a9d254b7 100644 --- a/radio/src/gui/colorlcd/radio_diagkeys.cpp +++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp @@ -125,7 +125,8 @@ class RadioKeyDiagsWindow : public Window void RadioKeyDiagsPage::buildHeader(Window * window) { - header.setTitle(STR_MENU_RADIO_SWITCHES); + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_MENU_RADIO_SWITCHES); } void RadioKeyDiagsPage::buildBody(Window * window) diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp index 422bfefe1..bea8ed635 100644 --- a/radio/src/gui/colorlcd/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio_setup.cpp @@ -215,7 +215,7 @@ class WindowButtonGroup : public FormGroup typedef std::function PageFct; typedef std::pair PageDef; typedef std::list PageDefs; - + WindowButtonGroup( Window* parent, const rect_t& rect, PageDefs pages) : FormGroup(parent, rect), @@ -254,6 +254,9 @@ class SoundPage : public SubPage { public: SoundPage() : SubPage(ICON_RADIO_SETUP, STR_SOUND_LABEL) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_SOUND_LABEL); + FlexGridLayout grid(col_two_dsc, row_dsc, 3); auto line = body.newLine(&grid); @@ -308,6 +311,9 @@ class VarioPage : public SubPage { public: VarioPage() : SubPage(ICON_RADIO_SETUP, STR_VARIO) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_VARIO); + FlexGridLayout grid(col_two_dsc, row_dsc, 4); auto line = body.newLine(&grid); @@ -349,6 +355,9 @@ class HapticPage : public SubPage { public: HapticPage() : SubPage(ICON_RADIO_SETUP, STR_HAPTIC_LABEL) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_HAPTIC_LABEL); + FlexGridLayout grid(col_two_dsc, row_dsc, 4); auto line = body.newLine(&grid); @@ -375,6 +384,9 @@ class AlarmsPage : public SubPage { public: AlarmsPage() : SubPage(ICON_RADIO_SETUP, STR_ALARMS_LABEL) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_ALARMS_LABEL); + FlexGridLayout grid(col_two_dsc, row_dsc, 4); auto line = body.newLine(&grid); @@ -433,6 +445,9 @@ class BacklightPage : public SubPage { public: BacklightPage() : SubPage(ICON_RADIO_SETUP, STR_BACKLIGHT_LABEL) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_BACKLIGHT_LABEL); + FlexGridLayout grid(col_two_dsc, row_dsc, 4); auto line = body.newLine(&grid); @@ -547,6 +562,9 @@ class GpsPage : public SubPage { public: GpsPage() : SubPage(ICON_RADIO_SETUP, STR_GPS) { + header.setTitle(STR_RADIO_SETUP); + header.setTitle2(STR_GPS); + FlexGridLayout grid(col_two_dsc, row_dsc, 4); auto line = body.newLine(&grid); @@ -589,7 +607,7 @@ void RadioSetupPage::build(FormWindow * window) #if defined(HAPTIC) {STR_HAPTIC_LABEL, []() { new HapticPage(); }}, #endif - {STR_ALARM, []() { new AlarmsPage(); }}, + {STR_ALARMS_LABEL, []() { new AlarmsPage(); }}, {STR_BACKLIGHT_LABEL, []() { new BacklightPage(); }}, {STR_GPS, [](){new GpsPage();}}, }); @@ -610,7 +628,7 @@ void RadioSetupPage::build(FormWindow * window) }); } #endif - + #if defined(PXX2) // Owner ID { @@ -682,9 +700,9 @@ void RadioSetupPage::build(FormWindow * window) GET_SET_DEFAULT(g_eeGeneral.rotEncMode)); #endif - // RX channel order + // Default channel order line = window->newLine(&grid); - new StaticText(line, rect_t{}, STR_RXCHANNELORD, 0, + new StaticText(line, rect_t{}, STR_DEF_CHAN_ORD, 0, COLOR_THEME_PRIMARY1); // RAET->AETR choice = new Choice(line, rect_t{}, 0, 4 * 3 * 2 - 1, GET_SET_DEFAULT(g_eeGeneral.templateSetup)); diff --git a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp index e131849c7..9ec0d2ab0 100644 --- a/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/colorlcd/radio_spectrum_analyser.cpp @@ -221,7 +221,8 @@ RadioSpectrumAnalyser::RadioSpectrumAnalyser(uint8_t moduleIdx) : void RadioSpectrumAnalyser::buildHeader(Window * window) { - header.setTitle(STR_MENU_SPECTRUM_ANALYSER); + header.setTitle(STR_MENUTOOLS); + header.setTitle2(STR_MENU_SPECTRUM_ANALYSER); } void RadioSpectrumAnalyser::buildBody(FormWindow * window) diff --git a/radio/src/gui/colorlcd/throttle_params.cpp b/radio/src/gui/colorlcd/throttle_params.cpp index faaaef79f..cbd1ef4c2 100644 --- a/radio/src/gui/colorlcd/throttle_params.cpp +++ b/radio/src/gui/colorlcd/throttle_params.cpp @@ -55,7 +55,8 @@ static void setThrottleTrimSource(int16_t src) ThrottleParams::ThrottleParams() : Page(ICON_MODEL_SETUP) { - header.setTitle(STR_THROTTLE_LABEL); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(STR_THROTTLE_LABEL); body.setFlexLayout(); body.padAll(8); diff --git a/radio/src/gui/colorlcd/timer_setup.cpp b/radio/src/gui/colorlcd/timer_setup.cpp index 3000b2df3..cea2cf8bd 100644 --- a/radio/src/gui/colorlcd/timer_setup.cpp +++ b/radio/src/gui/colorlcd/timer_setup.cpp @@ -56,8 +56,9 @@ static void timer_start_changed(lv_event_t* e) TimerWindow::TimerWindow(uint8_t timer) : Page(ICON_STATS_TIMERS) { - std::string title = std::string(STR_TIMER) + std::to_string(timer + 1); - header.setTitle(title); + std::string title2 = std::string(STR_TIMER) + std::to_string(timer + 1); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(title2); auto form = new FormGroup(&body, rect_t{}); form->setFlexLayout(); diff --git a/radio/src/gui/colorlcd/trainer_setup.cpp b/radio/src/gui/colorlcd/trainer_setup.cpp index 8dfa2810c..456e96ca6 100644 --- a/radio/src/gui/colorlcd/trainer_setup.cpp +++ b/radio/src/gui/colorlcd/trainer_setup.cpp @@ -140,7 +140,8 @@ void TrainerModuleWindow::update() TrainerPage::TrainerPage() : Page(ICON_MODEL_SETUP) { - header.setTitle(STR_TRAINER); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(STR_TRAINER); auto form = new FormGroup(&body, rect_t{}); form->setFlexLayout(); diff --git a/radio/src/gui/colorlcd/trims_setup.cpp b/radio/src/gui/colorlcd/trims_setup.cpp index f0e50a097..6a593a49d 100644 --- a/radio/src/gui/colorlcd/trims_setup.cpp +++ b/radio/src/gui/colorlcd/trims_setup.cpp @@ -38,7 +38,8 @@ static void resetTrims() TrimsSetup::TrimsSetup() : Page(ICON_MODEL_SETUP) { - header.setTitle(STR_TRIMS); + header.setTitle(STR_MENU_MODEL_SETUP); + header.setTitle2(STR_TRIMS); body.setFlexLayout(); body.padAll(8); diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp index e758274ce..1ed705501 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/view_main_menu.cpp @@ -46,7 +46,7 @@ ViewMainMenu::ViewMainMenu(Window* parent, std::function closeHandler) : setHeight(parent->height()); auto carousel = new SelectFabCarousel(this); - carousel->addButton(ICON_MODEL_SELECT, STR_MAIN_MENU_SELECT_MODEL, [=]() -> uint8_t { + carousel->addButton(ICON_MODEL_SELECT,STR_MAIN_MENU_MANAGE_MODELS, [=]() -> uint8_t { deleteLater(); new ModelLabelsWindow(); return 0; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index bca436953..3cafb464b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -218,7 +218,7 @@ const char STR_BACKLIGHT_LABEL[] = TR_BACKLIGHT_LABEL; const char STR_GHOST_MENU_LABEL[] = TR_GHOST_MENU_LABEL; const char STR_STATUS[] = TR_STATUS; const char STR_BLDELAY[] = TR_BLDELAY; -const char STR_RXCHANNELORD[] = TR_RXCHANNELORD; +const char STR_DEF_CHAN_ORD[] = TR_DEF_CHAN_ORD; const char STR_STICKS[] = TR_STICKS; const char STR_POTS[] = TR_POTS; const char STR_SWITCHES[] = TR_SWITCHES; @@ -352,7 +352,6 @@ const char STR_FAVORITE_LABEL[] = TR_FAVORITE_LABEL; const char STR_MODELS_MOVED[] = TR_MODELS_MOVED; const char STR_NEW_MODEL[] = TR_NEW_MODEL; const char STR_INVALID_MODEL[] = TR_INVALID_MODEL; -const char STR_EDIT_LABELS[] = TR_EDIT_LABELS; const char STR_MOVE_UP[] = TR_MOVE_UP; const char STR_MOVE_DOWN[] = TR_MOVE_DOWN; const char STR_DUPLICATE_MODEL[] = TR_DUPLICATE_MODEL; @@ -869,14 +868,6 @@ const char STR_MODELS_PATH[] = MODELS_PATH; const char STR_MODELS_EXT[] = MODELS_EXT; const char STR_BACKUP_PATH[] = BACKUP_PATH; const char STR_YAML_EXT[] = YAML_EXT; -const char STR_SELECT_TEMPLATE[] = TR_SELECT_TEMPLATE; -const char STR_SELECT_TEMPLATE_FOLDER[] = TR_SELECT_TEMPLATE_FOLDER; -const char STR_NO_TEMPLATES[] = TR_NO_TEMPLATES; -const char STR_SAVE_TEMPLATE[] = TR_SAVE_TEMPLATE; -const char STR_BLANK_MODEL[] = TR_BLANK_MODEL; -const char STR_BLANK_MODEL_INFO[] = TR_BLANK_MODEL_INFO; -const char STR_FILE_EXISTS[] = TR_FILE_EXISTS; -const char STR_ASK_OVERWRITE[] = TR_ASK_OVERWRITE; const char STR_TEST_WARNING[] = TR_TEST_WARNING; const char STR_TEST_NOTSAFE[] = TR_TEST_NOTSAFE; @@ -910,6 +901,16 @@ const char STR_RACING_MODE[] = TR_RACING_MODE; ISTR(RFPOWER_AFHDS2); #endif +#if defined(COLORLCD) +const char STR_SELECT_TEMPLATE[] = TR_SELECT_TEMPLATE; +const char STR_SELECT_TEMPLATE_FOLDER[] = TR_SELECT_TEMPLATE_FOLDER; +const char STR_NO_TEMPLATES[] = TR_NO_TEMPLATES; +const char STR_SAVE_TEMPLATE[] = TR_SAVE_TEMPLATE; +const char STR_BLANK_MODEL[] = TR_BLANK_MODEL; +const char STR_BLANK_MODEL_INFO[] = TR_BLANK_MODEL_INFO; +const char STR_FILE_EXISTS[] = TR_FILE_EXISTS; +const char STR_ASK_OVERWRITE[] = TR_ASK_OVERWRITE; + const char STR_USE_THEME_COLOR[] = TR_USE_THEME_COLOR; const char STR_DUPLICATE[] = TR_DUPLICATE; @@ -927,18 +928,18 @@ const char STR_EDIT_THEME[] = TR_EDIT_THEME; const char STR_DETAILS[] = TR_DETAILS; const char STR_THEME_EDITOR[] = TR_THEME_EDITOR; - -#if defined(COLORLCD) - +const char STR_EDIT_LABELS[] = TR_EDIT_LABELS; +const char STR_LABEL_MODEL[] = TR_LABEL_MODEL; const char STR_ENTER_LABEL[] = TR_ENTER_LABEL; const char STR_LABEL[] = TR_LABEL; const char STR_LABELS[] = TR_LABELS; -const char STR_CURRENT_MODEL[] = TR_CURRENT_MODEL; +const char STR_ACTIVE[] = TR_ACTIVE; const char STR_NEW[] = TR_NEW; const char STR_NEW_LABEL[] = TR_NEW_LABEL; const char STR_RENAME_LABEL[] = TR_RENAME_LABEL; const char STR_DELETE_LABEL[] = TR_DELETE_LABEL; const char STR_MAIN_MENU_SELECT_MODEL[] = TR_MAIN_MENU_SELECT_MODEL; +const char STR_MAIN_MENU_MANAGE_MODELS[] = TR_MAIN_MENU_MANAGE_MODELS; const char STR_MAIN_MENU_MODEL_NOTES[] = TR_MAIN_MENU_MODEL_NOTES; const char STR_MAIN_MENU_CHANNEL_MONITOR[] = TR_MAIN_MENU_CHANNEL_MONITOR; const char STR_MAIN_MENU_MODEL_SETTINGS[] = TR_MAIN_MENU_MODEL_SETTINGS; @@ -947,7 +948,7 @@ const char STR_MAIN_MENU_SCREEN_SETTINGS[] = TR_MAIN_MENU_SCREEN_SETTINGS; const char STR_MAIN_MENU_RESET_TELEMETRY[] = TR_MAIN_MENU_RESET_TELEMETRY; const char STR_MAIN_MENU_STATISTICS[] = TR_MAIN_MENU_STATISTICS; const char STR_MAIN_MENU_ABOUT_EDGETX[] = TR_MAIN_MENU_ABOUT_EDGETX; - +const char STR_MANAGE_MODELS[] = TR_MANAGE_MODELS; #endif #if defined(USBJ_EX) diff --git a/radio/src/translations.h b/radio/src/translations.h index d2d889eb8..cc4aecd9d 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -388,7 +388,7 @@ extern const char STR_FLYSKY_TELEMETRY[]; extern const char STR_PITCH_AT_ZERO[]; extern const char STR_PITCH_AT_MAX[]; extern const char STR_REPEAT_AT_ZERO[]; -extern const char STR_RXCHANNELORD[]; +extern const char STR_DEF_CHAN_ORD[]; extern const char STR_STICKS[]; extern const char STR_POTS[]; extern const char STR_SWITCHES[]; @@ -566,7 +566,6 @@ extern const char STR_FAVORITE_LABEL[]; extern const char STR_MODELS_MOVED[]; extern const char STR_NEW_MODEL[]; extern const char STR_INVALID_MODEL[]; -extern const char STR_EDIT_LABELS[]; extern const char STR_MOVE_UP[]; extern const char STR_MOVE_DOWN[]; extern const char STR_DUPLICATE_MODEL[]; @@ -648,14 +647,6 @@ extern const char STR_MODELS_PATH[]; extern const char STR_MODELS_EXT[]; extern const char STR_BACKUP_PATH[]; extern const char STR_YAML_EXT[]; -extern const char STR_SELECT_TEMPLATE[]; -extern const char STR_SELECT_TEMPLATE_FOLDER[]; -extern const char STR_NO_TEMPLATES[]; -extern const char STR_SAVE_TEMPLATE[]; -extern const char STR_BLANK_MODEL[]; -extern const char STR_BLANK_MODEL_INFO[]; -extern const char STR_FILE_EXISTS[]; -extern const char STR_ASK_OVERWRITE[]; #define STR_UPDATE_LIST STR_DELAYDOWN extern const char STR_NEEDS_FILE[]; @@ -1079,6 +1070,16 @@ extern const char STR_AUTH_FAILURE[]; extern const char STR_PROTOCOL[]; extern const char STR_RACING_MODE[]; +#if defined(COLORLCD) +extern const char STR_SELECT_TEMPLATE[]; +extern const char STR_SELECT_TEMPLATE_FOLDER[]; +extern const char STR_NO_TEMPLATES[]; +extern const char STR_SAVE_TEMPLATE[]; +extern const char STR_BLANK_MODEL[]; +extern const char STR_BLANK_MODEL_INFO[]; +extern const char STR_FILE_EXISTS[]; +extern const char STR_ASK_OVERWRITE[]; + extern const char STR_USE_THEME_COLOR[]; extern const char STR_DUPLICATE[]; @@ -1096,21 +1097,20 @@ extern const char STR_EDIT_THEME[]; extern const char STR_DETAILS[]; extern const char STR_THEME_EDITOR[]; - - -#if defined(COLORLCD) - +extern const char STR_EDIT_LABELS[]; +extern const char STR_LABEL_MODEL[]; extern const char STR_ENTER_LABEL[]; extern const char STR_LABEL[]; extern const char STR_LABELS[]; extern const char STR_SELECT_MODEL[]; extern const char STR_NONE[]; -extern const char STR_CURRENT_MODEL[]; +extern const char STR_ACTIVE[]; extern const char STR_NEW[]; extern const char STR_NEW_LABEL[]; extern const char STR_RENAME_LABEL[]; extern const char STR_DELETE_LABEL[]; extern const char STR_MAIN_MENU_SELECT_MODEL[]; +extern const char STR_MAIN_MENU_MANAGE_MODELS[]; extern const char STR_MAIN_MENU_MODEL_NOTES[]; extern const char STR_MAIN_MENU_CHANNEL_MONITOR[]; extern const char STR_MAIN_MENU_MODEL_SETTINGS[]; @@ -1119,7 +1119,7 @@ extern const char STR_MAIN_MENU_SCREEN_SETTINGS[]; extern const char STR_MAIN_MENU_RESET_TELEMETRY[]; extern const char STR_MAIN_MENU_STATISTICS[]; extern const char STR_MAIN_MENU_ABOUT_EDGETX[]; - +extern const char STR_MANAGE_MODELS[]; #endif #if defined(USBJ_EX) diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 59e9521bc..daa7ea555 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -455,7 +455,7 @@ #define TR_TIMEZONE "时区" #define TR_ADJUST_RTC "时钟设置" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("通道顺序", "默认通道顺序") +#define TR_DEF_CHAN_ORD TR("通道顺序", "默认通道顺序") #define TR_STICKS "摇杆" #define TR_POTS "电位器" #define TR_SWITCHES "开关" @@ -608,6 +608,7 @@ #define TR_CURRENT_CALIB "电流校准" #define TR_VOLTAGE TR(INDENT "电压源", INDENT "电压来源") #define TR_SELECT_MODEL "选择模型" +#define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "个模型" #define TR_SELECT_MODE "选择模式" #define TR_CREATE_MODEL "创建模型" @@ -616,12 +617,14 @@ #define TR_NEW_MODEL "新建模型" #define TR_INVALID_MODEL "无效模型" #define TR_EDIT_LABELS "编辑分组" +#define TR_LABEL_MODEL "模型标签" #define TR_MOVE_UP "上移" #define TR_MOVE_DOWN "下移" #define TR_ENTER_LABEL "输入分组名称" #define TR_LABEL "分组" #define TR_LABELS "分组" #define TR_CURRENT_MODEL "当前模型" +#define TR_ACTIVE "当前模型" #define TR_NEW "新建分组" #define TR_NEW_LABEL "新建分组" #define TR_RENAME_LABEL "分组改名" @@ -1206,6 +1209,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "模型选择" +#define TR_MAIN_MENU_MANAGE_MODELS "模型\n管理" #define TR_MAIN_MENU_MODEL_NOTES "模型说明" #define TR_MAIN_MENU_CHANNEL_MONITOR "通道查看" #define TR_MAIN_MENU_MODEL_SETTINGS "模型设置" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 28e268be1..a95ef52ad 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -460,7 +460,7 @@ #define TR_TIMEZONE "Časové pásmo" #define TR_ADJUST_RTC TR3("Čas z GPS", "Použít čas z GPS", "Použít čas z GPS") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Pořadí kanálů", "Výchozí pořadí kanálů") +#define TR_DEF_CHAN_ORD TR("Def řaz kanálu", "Defaultní řazení kanálu") #define TR_STICKS "Páky" #define TR_POTS "Potenciometry" #define TR_SWITCHES "Spínače" @@ -608,6 +608,7 @@ #define TR_CURRENT_CALIB "+=\006Proud" #define TR_VOLTAGE INDENT"Napětí" #define TR_SELECT_MODEL "Vyber model" +#define TR_MANAGE_MODELS "NASTAVENÍ MODELU" #define TR_MODELS "Modely" #define TR_SELECT_MODE "Vybrat mód" #define TR_CREATE_MODEL "Nový model" @@ -616,12 +617,14 @@ #define TR_NEW_MODEL "Nový model" #define TR_INVALID_MODEL "Neplatný model" #define TR_EDIT_LABELS "Upravit štítek" +#define TR_LABEL_MODEL "Štítek modelu" #define TR_MOVE_UP "Posunout nahoru" #define TR_MOVE_DOWN "Posunout dolů" #define TR_ENTER_LABEL "Vložit štítek" #define TR_LABEL "Štítek" #define TR_LABELS "Štítky" #define TR_CURRENT_MODEL "Aktuální" +#define TR_ACTIVE "Aktivní" #define TR_NEW "Nový" #define TR_NEW_LABEL "Nový štítek" #define TR_RENAME_LABEL "Přejmenovat štítek" @@ -1211,6 +1214,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Vybrat\nmodel" +#define TR_MAIN_MENU_MANAGE_MODELS "Nastavení\nmodelu" #define TR_MAIN_MENU_MODEL_NOTES "Poznámky\nmodelu" #define TR_MAIN_MENU_CHANNEL_MONITOR "Monitor\nkanálů" #define TR_MAIN_MENU_MODEL_SETTINGS "Nastavení\nmodelu" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index d7f55298e..ef8869203 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -461,7 +461,7 @@ #define TR_TIMEZONE "Tids zone" #define TR_ADJUST_RTC "Juster RTC" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Rx kanal ræk.", "Standard kanal rækkefølge") +#define TR_DEF_CHAN_ORD "Kanalrækkefølge" #define TR_STICKS "Pinde" #define TR_POTS "Drejekontakt" #define TR_SWITCHES "Kontakter" @@ -613,6 +613,7 @@ #define TR_CURRENT_CALIB "Aktuel kalib" #define TR_VOLTAGE TR(INDENT "Spænding", INDENT "Spænding kilde") #define TR_SELECT_MODEL "Vælg model" +#define TR_MANAGE_MODELS "Vælg Model" #define TR_MODELS "Modeller" #define TR_SELECT_MODE "Vælg tilstand" #define TR_CREATE_MODEL "Opret model" @@ -621,12 +622,14 @@ #define TR_NEW_MODEL "Ny model" #define TR_INVALID_MODEL "Ingen billede" #define TR_EDIT_LABELS "Ret type" +#define TR_LABEL_MODEL "Navngiv model" #define TR_MOVE_UP "Ingen billede" #define TR_MOVE_DOWN "Flyt ned" #define TR_ENTER_LABEL "Vælg type" #define TR_LABEL "Type" #define TR_LABELS "Typer" #define TR_CURRENT_MODEL "Aktuel" +#define TR_ACTIVE "Aktiv" #define TR_NEW "Ny" #define TR_NEW_LABEL "Ny type" #define TR_RENAME_LABEL "Omdøb type" @@ -1224,6 +1227,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Vælg\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Vælg\nModel" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNoter" #define TR_MAIN_MENU_CHANNEL_MONITOR "Kanal\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nIndstilling" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 983f3dd08..3c10fd581 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -460,7 +460,7 @@ #define TR_TIMEZONE TR("Zeitzone", "GPS-Zeitzone +/-Std") #define TR_ADJUST_RTC TR("GPSzeit setzen", "Uhrzeit per GPS setzen") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Kanal CH1-4", "Kanalvoreinstellung") +#define TR_DEF_CHAN_ORD TR("Std.Kanal Folge", "Std. Kanal Reihenfolge") #define TR_STICKS "Knüppel" #define TR_POTS "Potis" #define TR_SWITCHES "Schalter" @@ -605,6 +605,7 @@ #define TR_CURRENT_CALIB "Strom abgl." #define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spannungsquelle") //9XR-Pro #define TR_SELECT_MODEL "Modell auswählen" +#define TR_MANAGE_MODELS "MODELL MANAGER" #define TR_MODELS "Modelle" #define TR_SELECT_MODE "Wähle Mode" #define TR_CREATE_MODEL TR("Neues Modell" , "Neues Modell erstellen") @@ -613,12 +614,14 @@ #define TR_NEW_MODEL "Neues Modell" #define TR_INVALID_MODEL "ungültiges Modell" #define TR_EDIT_LABELS "Label ändern" +#define TR_LABEL_MODEL "Label zuordnen" #define TR_MOVE_UP "Verschiebe nach oben" #define TR_MOVE_DOWN "Verschiebe nach unten" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "aktuell" +#define TR_ACTIVE "Aktiv" #define TR_NEW "Neu" #define TR_NEW_LABEL "Neues Label" #define TR_RENAME_LABEL "Label umbenennen" @@ -1210,6 +1213,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Wähle\nModell" +#define TR_MAIN_MENU_MANAGE_MODELS "Modell\nManager" #define TR_MAIN_MENU_MODEL_NOTES "Modell\nNotizen" #define TR_MAIN_MENU_CHANNEL_MONITOR "Kanal\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Modell\nKonfig." diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 97ffee0d8..cfe10629b 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -454,7 +454,7 @@ #define TR_TIMEZONE "Time zone" #define TR_ADJUST_RTC "Adjust RTC" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Rx channel ord", "Default channel order") +#define TR_DEF_CHAN_ORD TR("Def chan order", "Default channel order") #define TR_STICKS "Sticks" #define TR_POTS "Pots" #define TR_SWITCHES "Switches" @@ -606,6 +606,7 @@ #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR(INDENT "Voltage", INDENT "Voltage source") #define TR_SELECT_MODEL "Select model" +#define TR_MANAGE_MODELS "MANAGE MODELS" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Create model" @@ -614,12 +615,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Label model" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Active" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1203,6 +1206,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Manage\nModels" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index 4d8dc4af0..923f2e75d 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -456,7 +456,7 @@ #define TR_TIMEZONE TR("Zona horaria", INDENT "Zona horaria") #define TR_ADJUST_RTC TR("Ajustar RTC", "Ajustar RTC") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Rx Orden canal", "Orden habitual canales") +#define TR_DEF_CHAN_ORD TR("Rx Orden canal", "Orden habitual canales") #define TR_STICKS "Sticks" #define TR_POTS "Pots" #define TR_SWITCHES "Switches" @@ -607,6 +607,7 @@ #define TR_CURRENT_CALIB "Calib. actual" #define TR_VOLTAGE INDENT"Voltaje" #define TR_SELECT_MODEL TR("Selec. modelo", "Seleccionar modelo") +#define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Crear modelo" @@ -615,12 +616,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Label model" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Active" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1214,6 +1217,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Model\nManager" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 9a7211a48..15e1e0f52 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -468,7 +468,7 @@ #define TR_TIMEZONE TR("Time Zone","GPS Time zone") #define TR_ADJUST_RTC TR("Adjust RTC", "Adjust RTC") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order") +#define TR_DEF_CHAN_ORD TR("Def chan order","Default channel order") #define TR_STICKS "Sticks" #define TR_POTS "Pots" #define TR_SWITCHES "Switches" @@ -619,6 +619,7 @@ #define TR_CURRENT_CALIB "Current Calib" #define TR_VOLTAGE INDENT"Jännite" #define TR_SELECT_MODEL "Select Model" +#define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Create Model" @@ -627,12 +628,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Label model" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Active" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1226,6 +1229,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Model\nManager" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 64426be1e..94d8bb6b8 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -468,7 +468,7 @@ #define TR_TIMEZONE "Fuseau horaire" #define TR_ADJUST_RTC TR("Ajust. RTC", "Ajust. heure auto") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Ordre voies RX","Ordre des voies préféré") +#define TR_DEF_CHAN_ORD TR("Ordre can. prédéf.", "Ordre canaux prédéfinis") #define TR_STICKS "Manches" #define TR_POTS "Potentiomètres" #define TR_SWITCHES "Inters" @@ -616,6 +616,7 @@ #define TR_CURRENT_CALIB "Calib. cour" #define TR_VOLTAGE TR(INDENT "Tension",INDENT "Source tension") #define TR_SELECT_MODEL "Sélect. modèle" +#define TR_MANAGE_MODELS "GESTION MODELES" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Créer modèle" @@ -624,12 +625,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Etiquete modèle" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Actif" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1232,6 +1235,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Gestion\nModèles" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index bec6b78e5..3b5ea3e43 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -462,7 +462,7 @@ #define TR_TIMEZONE "Ora locale" #define TR_ADJUST_RTC TR(INDENT "Agg. RTC", "Aggiusta RTC") #define TR_GPS "GPS" -#define TR_RXCHANNELORD "Ordine CH RX" +#define TR_DEF_CHAN_ORD TR("Ord. can. pred.", "Ordine canali predefinito") #define TR_STICKS "Sticks" #define TR_POTS "Pot." #define TR_SWITCHES "Interutt." @@ -608,6 +608,7 @@ #define TR_CURRENT_CALIB "Calibra corr." #define TR_VOLTAGE TR(INDENT "Voltagg.",INDENT "Voltaggio") #define TR_SELECT_MODEL TR("Scegli mod.", "Scegli Modello") +#define TR_MANAGE_MODELS "GESTIONE MODELLI" #define TR_MODELS "Modelli" #define TR_SELECT_MODE "Seleziona modo" #define TR_CREATE_MODEL "Crea Modello" @@ -616,12 +617,14 @@ #define TR_NEW_MODEL "Nuovo Modello" #define TR_INVALID_MODEL "Modello invalido" #define TR_EDIT_LABELS "Edita Etichette" +#define TR_LABEL_MODEL "Etichetta modello" #define TR_MOVE_UP "Muovi Su" #define TR_MOVE_DOWN "Muovi Giù" #define TR_ENTER_LABEL "Edita Etichetta" #define TR_LABEL "Etichetta" #define TR_LABELS "Etichette" #define TR_CURRENT_MODEL "Corrente" +#define TR_ACTIVE "Attivo" #define TR_NEW "Nuovo" #define TR_NEW_LABEL "Nuova Etichetta" #define TR_RENAME_LABEL "Rinomina Etichetta" @@ -1219,6 +1222,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Seleziona\nModello" +#define TR_MAIN_MENU_MANAGE_MODELS "Gestione\nModelli" #define TR_MAIN_MENU_MODEL_NOTES "Note\nModello" #define TR_MAIN_MENU_CHANNEL_MONITOR "Monitor\nCanali" #define TR_MAIN_MENU_MODEL_SETTINGS "Settaggi\nModello" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index 317399cf8..783c41dac 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -454,7 +454,7 @@ #define TR_TIMEZONE "タイムゾーン" #define TR_ADJUST_RTC "内蔵時計修正" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Rx channel ord", "チャンネルマップ初期値") +#define TR_DEF_CHAN_ORD TR("Def chan order", "チャンネルマップ初期値") #define TR_STICKS "スティック" #define TR_POTS "ダイヤル" #define TR_SWITCHES "スイッチ" @@ -606,6 +606,7 @@ #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR(INDENT "Voltage", INDENT "電圧ソース") #define TR_SELECT_MODEL "モデル選択" +#define TR_MANAGE_MODELS "モデル管理" #define TR_MODELS "モデル" #define TR_SELECT_MODE "モード選択" #define TR_CREATE_MODEL "モデル作成" @@ -614,12 +615,14 @@ #define TR_NEW_MODEL "新規モデル" #define TR_INVALID_MODEL "無効なモデル" #define TR_EDIT_LABELS "ラベル編集" +#define TR_LABEL_MODEL "モデルラベル" #define TR_MOVE_UP "上へ移動" #define TR_MOVE_DOWN "下へ移動" #define TR_ENTER_LABEL "ラベル適用" #define TR_LABEL "ラベル" #define TR_LABELS "ラベル" #define TR_CURRENT_MODEL "現在のモデル" +#define TR_ACTIVE "有効" #define TR_NEW "新規" #define TR_NEW_LABEL "新規ラベル" #define TR_RENAME_LABEL "ラベル名変更" @@ -1204,6 +1207,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "モデル\n選択" +#define TR_MAIN_MENU_MANAGE_MODELS "モデル\n管理" #define TR_MAIN_MENU_MODEL_NOTES "モデル\nノート" #define TR_MAIN_MENU_CHANNEL_MONITOR "チャンネル\nモニター" #define TR_MAIN_MENU_MODEL_SETTINGS "モデル\n設定" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 20fe71e99..a6fd5e0d9 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -459,7 +459,7 @@ #define TR_TIMEZONE TR("Tijdzone", "GPS-Tijdzone +/-Std") #define TR_ADJUST_RTC TR("Klok instellen", "Klok middels GPS instellen") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Kan.Volgorde", "Kanaalvolgorde") +#define TR_DEF_CHAN_ORD TR("Kan.Volgorde", "Kanaalvolgorde") #define TR_STICKS "Sticks" #define TR_POTS "Pots" #define TR_SWITCHES TR("Switches","Schakelaars") @@ -611,6 +611,7 @@ #define TR_CURRENT_CALIB "Stroom Calib" #define TR_VOLTAGE TR(INDENT "Spg", INDENT "Spanningsbron") //9XR-Pro #define TR_SELECT_MODEL "Kies Model" +#define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Nieuw Model" @@ -619,12 +620,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Label model" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Active" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1224,6 +1227,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Model\nManager" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index f435ffd69..ed7dcff87 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -457,7 +457,7 @@ #define TR_TIMEZONE TR("Strefa czasowa" ,"Strefa czasowa GPS") #define TR_ADJUST_RTC TR("RegulujRTC", "RegulujRTC") #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("KolejnKan.RX", "Bazowa kolejność kanałów") +#define TR_DEF_CHAN_ORD TR("Baz.kolejn.kan.", "Bazowa kolejność kanałów") #define TR_STICKS "Drążki" #define TR_POTS "Pots" #define TR_SWITCHES "Przełącz" @@ -604,6 +604,7 @@ #define TR_CURRENT_CALIB " +=\006Kalibracja prądu" #define TR_VOLTAGE TR (INDENT"Napięcie",INDENT"Źródło Napięcia") #define TR_SELECT_MODEL "Wybór modelu" +#define TR_MANAGE_MODELS "MENADŻER MODELI" #define TR_MODELS "Modele" #define TR_SELECT_MODE "Wybierz tryb" #define TR_CREATE_MODEL "Nowy model" @@ -612,12 +613,14 @@ #define TR_NEW_MODEL "Nowy model" #define TR_INVALID_MODEL "Nieprawid. model" #define TR_EDIT_LABELS "Edyt. etykiety" +#define TR_LABEL_MODEL "Etykietuj model" #define TR_MOVE_UP "Wyżej" #define TR_MOVE_DOWN "Niżej" #define TR_ENTER_LABEL "Wpisz etykietę" #define TR_LABEL "Etykieta" #define TR_LABELS "Etykiety" #define TR_CURRENT_MODEL "Wybrany" +#define TR_ACTIVE "Aktywny" #define TR_NEW "Nowy" #define TR_NEW_LABEL "Nowa etyk." #define TR_RENAME_LABEL "Zmień etyk." @@ -1208,6 +1211,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Wybierz\nmodel" +#define TR_MAIN_MENU_MANAGE_MODELS "Menadżer\nmodeli" #define TR_MAIN_MENU_MODEL_NOTES "Notatki\nmodelu" #define TR_MAIN_MENU_CHANNEL_MONITOR "Monitor\nkanałów" #define TR_MAIN_MENU_MODEL_SETTINGS "Ustawienia\nmodelu" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index c327708c7..931b69e17 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -460,7 +460,7 @@ #define TR_TIMEZONE "Time Zone" #define TR_ADJUST_RTC TR("Adjust RTC", "Adjust RTC") #define TR_GPS "GPS" -#define TR_RXCHANNELORD "Ordem Canal RX" +#define TR_DEF_CHAN_ORD "Ordem Canal RX" #define TR_STICKS "Sticks" #define TR_POTS "Pots" #define TR_SWITCHES "Switches" @@ -611,6 +611,7 @@ #define TR_CURRENT_CALIB "Corrente Calib" #define TR_VOLTAGE INDENT"Volts" #define TR_SELECT_MODEL "Selec. Modelo" +#define TR_MANAGE_MODELS "MODEL MANAGER" #define TR_MODELS "Models" #define TR_SELECT_MODE "Select mode" #define TR_CREATE_MODEL "Criar Modelo" @@ -619,12 +620,14 @@ #define TR_NEW_MODEL "New Model" #define TR_INVALID_MODEL "Invalid Model" #define TR_EDIT_LABELS "Edit Labels" +#define TR_LABEL_MODEL "Label model" #define TR_MOVE_UP "Move Up" #define TR_MOVE_DOWN "Move Down" #define TR_ENTER_LABEL "Enter Label" #define TR_LABEL "Label" #define TR_LABELS "Labels" #define TR_CURRENT_MODEL "Current" +#define TR_ACTIVE "Active" #define TR_NEW "New" #define TR_NEW_LABEL "New Label" #define TR_RENAME_LABEL "Rename Label" @@ -1217,6 +1220,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Select\nModel" +#define TR_MAIN_MENU_MANAGE_MODELS "Model\nManager" #define TR_MAIN_MENU_MODEL_NOTES "Model\nNotes" #define TR_MAIN_MENU_CHANNEL_MONITOR "Channel\nMonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Model\nSettings" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 329abcd18..3c6c6fe81 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -476,7 +476,7 @@ #define TR_TIMEZONE "Tidszon" #define TR_ADJUST_RTC "Justera RTC" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("Kanalordn. Rx","Kanalordning i Rx") +#define TR_DEF_CHAN_ORD TR("Kanalordning","Förvald kanalordning") #define TR_STICKS "Spakar" #define TR_POTS "Vred" #define TR_SWITCHES "Brytare" @@ -629,6 +629,7 @@ #define TR_CURRENT_CALIB "Kalib. ström" #define TR_VOLTAGE INDENT "Volt" #define TR_SELECT_MODEL "Välj modell" +#define TR_MANAGE_MODELS "MODELLHANTERING" #define TR_MODELS "Modeller" #define TR_SELECT_MODE "Välj läge" #define TR_CREATE_MODEL "Skapa modell" @@ -637,12 +638,14 @@ #define TR_NEW_MODEL "Ny modell" #define TR_INVALID_MODEL "Ogiltig modell" #define TR_EDIT_LABELS "Redigera etiketter" +#define TR_LABEL_MODEL "Sätt modelletikett" #define TR_MOVE_UP "Flytta upp" #define TR_MOVE_DOWN "Flytta ner" #define TR_ENTER_LABEL "Ange etikett" #define TR_LABEL "Etikett" #define TR_LABELS "Etiketter" #define TR_CURRENT_MODEL "Nuvarande" +#define TR_ACTIVE "Aktiv" #define TR_NEW "Ny" #define TR_NEW_LABEL "Ny etikett" #define TR_RENAME_LABEL "Byt namn på etikett" @@ -1250,6 +1253,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "Välj\nmodell" +#define TR_MAIN_MENU_MANAGE_MODELS "Hantera\nmodell" #define TR_MAIN_MENU_MODEL_NOTES "Modell-\nanteckn." #define TR_MAIN_MENU_CHANNEL_MONITOR "Kanal-\nmonitor" #define TR_MAIN_MENU_MODEL_SETTINGS "Modell-\ninställn." diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index ee120a57a..10409c93b 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -454,7 +454,7 @@ #define TR_TIMEZONE "時區" #define TR_ADJUST_RTC "時鐘設置" #define TR_GPS "GPS" -#define TR_RXCHANNELORD TR("通道順序", "默認通道順序") +#define TR_DEF_CHAN_ORD TR("通道順序", "默認通道順序") #define TR_STICKS "搖桿" #define TR_POTS "電位器" #define TR_SWITCHES "開關" @@ -606,6 +606,7 @@ #define TR_CURRENT_CALIB "電流校準" #define TR_VOLTAGE TR(INDENT "電壓源", INDENT "電壓來源") #define TR_SELECT_MODEL "選擇模型" +#define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "個模型" #define TR_SELECT_MODE "選擇模式" #define TR_CREATE_MODEL "創建模型" @@ -614,12 +615,14 @@ #define TR_NEW_MODEL "新建模型" #define TR_INVALID_MODEL "無效模型" #define TR_EDIT_LABELS "編輯分組" +#define TR_LABEL_MODEL "模型標簽" #define TR_MOVE_UP "上移" #define TR_MOVE_DOWN "下移" #define TR_ENTER_LABEL "輸入分組名稱" #define TR_LABEL "分組" #define TR_LABELS "分組" #define TR_CURRENT_MODEL "當前模型" +#define TR_ACTIVE "當前模型" #define TR_NEW "新建分組" #define TR_NEW_LABEL "新建分組" #define TR_RENAME_LABEL "分組改名" @@ -1204,6 +1207,7 @@ // Main menu #define TR_MAIN_MENU_SELECT_MODEL "模型選擇" +#define TR_MAIN_MENU_MANAGE_MODELS "模型\n管理" #define TR_MAIN_MENU_MODEL_NOTES "模型說明" #define TR_MAIN_MENU_CHANNEL_MONITOR "通道查看" #define TR_MAIN_MENU_MODEL_SETTINGS "模型設置"