From 009518a1a45386f7bc59943dd991974c9716f345 Mon Sep 17 00:00:00 2001 From: philmoz Date: Thu, 26 Feb 2026 12:17:26 +1100 Subject: [PATCH] fix(color): mixed case for "Manage Models" page heading (#7130) --- radio/src/gui/colorlcd/model/model_select.cpp | 2 +- radio/src/gui/colorlcd/model/model_templates.cpp | 4 ++-- radio/src/gui/colorlcd/radio/radio_setup.cpp | 2 +- radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp | 4 ++-- radio/src/translations/i18n/cn.h | 1 - radio/src/translations/i18n/cz.h | 1 - radio/src/translations/i18n/da.h | 1 - radio/src/translations/i18n/de.h | 1 - radio/src/translations/i18n/en.h | 3 +-- radio/src/translations/i18n/es.h | 1 - radio/src/translations/i18n/fi.h | 1 - radio/src/translations/i18n/fr.h | 1 - radio/src/translations/i18n/he.h | 1 - radio/src/translations/i18n/it.h | 1 - radio/src/translations/i18n/jp.h | 1 - radio/src/translations/i18n/ko.h | 1 - radio/src/translations/i18n/nl.h | 1 - radio/src/translations/i18n/pl.h | 1 - radio/src/translations/i18n/pt.h | 1 - radio/src/translations/i18n/ru.h | 1 - radio/src/translations/i18n/se.h | 1 - radio/src/translations/i18n/tw.h | 1 - radio/src/translations/i18n/ua.h | 1 - radio/src/translations/sim_string_list.h | 1 - radio/src/translations/string_list.h | 1 - 25 files changed, 7 insertions(+), 28 deletions(-) diff --git a/radio/src/gui/colorlcd/model/model_select.cpp b/radio/src/gui/colorlcd/model/model_select.cpp index 1b00fd701..324bb29e0 100644 --- a/radio/src/gui/colorlcd/model/model_select.cpp +++ b/radio/src/gui/colorlcd/model/model_select.cpp @@ -951,6 +951,6 @@ void ModelLabelsWindow::setTitle() title2 += ": "; title2 += modelName; - header->setTitle(STR_MANAGE_MODELS); + header->setTitle(STR_MAIN_MENU_MANAGE_MODELS); header->setTitle2(title2); } diff --git a/radio/src/gui/colorlcd/model/model_templates.cpp b/radio/src/gui/colorlcd/model/model_templates.cpp index 11bf9361e..0e2223a74 100644 --- a/radio/src/gui/colorlcd/model/model_templates.cpp +++ b/radio/src/gui/colorlcd/model/model_templates.cpp @@ -87,7 +87,7 @@ class SelectTemplate : public TemplatePage SelectTemplate(SelectTemplateFolder* tp, std::string folder) : templateFolderPage(tp) { - header->setTitle(STR_MANAGE_MODELS); + header->setTitle(STR_MAIN_MENU_MANAGE_MODELS); header->setTitle2(STR_NEW_MODEL); char path[LEN_PATH + 1]; @@ -163,7 +163,7 @@ SelectTemplateFolder::SelectTemplateFolder( { this->update = update; - header->setTitle(STR_MANAGE_MODELS); + header->setTitle(STR_MAIN_MENU_MANAGE_MODELS); header->setTitle2(STR_NEW_MODEL); auto tfb = new TextButton(listWindow, diff --git a/radio/src/gui/colorlcd/radio/radio_setup.cpp b/radio/src/gui/colorlcd/radio/radio_setup.cpp index 1f1eb0233..3802a9a19 100644 --- a/radio/src/gui/colorlcd/radio/radio_setup.cpp +++ b/radio/src/gui/colorlcd/radio/radio_setup.cpp @@ -1051,7 +1051,7 @@ const static PageButtonDef radioSetupButtons[] = { {STR_DEF(STR_BACKLIGHT_LABEL), []() { (new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_BACKLIGHT_LABEL, backlightSetupLines))->useFlexLayout(); }}, {STR_DEF(STR_GPS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_GPS, gpsPageSetupLines); }}, {STR_DEF(STR_ENABLED_FEATURES), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_ENABLED_FEATURES, viewOptionsPageSetupLines); }}, - {STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_MANAGE_MODELS, manageModelsSetupLines); }}, + {STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), []() { new SubPage(ICON_RADIO_SETUP, STR_MAIN_MENU_RADIO_SETTINGS, STR_MAIN_MENU_MANAGE_MODELS, manageModelsSetupLines); }}, #if VERSION_MAJOR > 2 {STR_DEF(STR_KEY_SHORTCUTS), []() { new QMKeyShortcutsPage(); }, nullptr, []() { return hasShortcutKeys(); }}, {STR_DEF(STR_QUICK_MENU_FAVORITES), []() { new QMFavoritesPage(); }, nullptr}, diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp index ff5d80596..b421e4bfb 100644 --- a/radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp +++ b/radio/src/gui/colorlcd/setup_menus/quick_menu_data.cpp @@ -118,7 +118,7 @@ const PageDef statsMenuItems[] = { }; const QMMainDef qmTopItems[] = { - { ICON_MODEL_SELECT, STR_DEF(STR_QM_MANAGE_MODELS), STR_DEF(STR_MANAGE_MODELS), QM_ACTION, QM_MANAGE_MODELS, nullptr, []() { new ModelLabelsWindow(); }}, + { ICON_MODEL_SELECT, STR_DEF(STR_QM_MANAGE_MODELS), STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), QM_ACTION, QM_MANAGE_MODELS, nullptr, []() { new ModelLabelsWindow(); }}, { ICON_MODEL_NOTES, STR_DEF(STR_MAIN_MENU_MODEL_NOTES), STR_DEF(STR_MAIN_MENU_MODEL_NOTES), QM_ACTION, QM_NONE, nullptr, []() { QuickMenu::openPage(QM_MODEL_NOTES); }, modelHasNotes}, { ICON_MONITOR, STR_DEF(STR_QM_CHAN_MON), STR_DEF(STR_QM_CHAN_MON), QM_ACTION, QM_TOOLS_CHAN_MON, nullptr, []() { new ChannelsViewMenu(); } }, @@ -185,7 +185,7 @@ const PageDef toolsMenuItems[] = { const QMMainDef qmTopItems[] = { { ICON_QM_FAVORITES, STR_DEF(STR_FAVORITE_LABEL), STR_DEF(STR_FAVORITE_LABEL), QM_SUBMENU, QM_NONE, favoritesMenuItems, nullptr, []() { return favoritesMenuItems[0].icon != EDGETX_ICONS_COUNT; }}, - { ICON_MODEL_SELECT, STR_DEF(STR_QM_MANAGE_MODELS), STR_DEF(STR_MANAGE_MODELS), QM_ACTION, QM_MANAGE_MODELS, nullptr, []() { new ModelLabelsWindow(); }}, + { ICON_MODEL_SELECT, STR_DEF(STR_QM_MANAGE_MODELS), STR_DEF(STR_MAIN_MENU_MANAGE_MODELS), QM_ACTION, QM_MANAGE_MODELS, nullptr, []() { new ModelLabelsWindow(); }}, { ICON_MODEL, STR_DEF(STR_QM_MODEL_SETUP), STR_DEF(STR_MAIN_MENU_MODEL_SETTINGS), QM_SUBMENU, QM_NONE, modelMenuItems}, { ICON_RADIO, STR_DEF(STR_QM_RADIO_SETUP), STR_DEF(STR_MAIN_MENU_RADIO_SETTINGS), QM_SUBMENU, QM_NONE, radioMenuItems}, { ICON_THEME, STR_DEF(STR_QM_UI_SETUP), STR_DEF(STR_MAIN_MENU_SCREEN_SETTINGS), QM_SUBMENU, QM_NONE, screensMenuItems}, diff --git a/radio/src/translations/i18n/cn.h b/radio/src/translations/i18n/cn.h index ce3077e4b..d136359f2 100644 --- a/radio/src/translations/i18n/cn.h +++ b/radio/src/translations/i18n/cn.h @@ -715,7 +715,6 @@ #define TR_CURRENT_CALIB "电流校准" #define TR_VOLTAGE TR("电压源", "电压来源") #define TR_SELECT_MODEL "选择模型" -#define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "个模型" #define TR_SELECT_MODE "选择模式" #define TR_CREATE_MODEL "创建模型" diff --git a/radio/src/translations/i18n/cz.h b/radio/src/translations/i18n/cz.h index ddc7511fd..03033286c 100644 --- a/radio/src/translations/i18n/cz.h +++ b/radio/src/translations/i18n/cz.h @@ -714,7 +714,6 @@ #define TR_CURRENT_CALIB "+=\006Proud" #define TR_VOLTAGE "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" diff --git a/radio/src/translations/i18n/da.h b/radio/src/translations/i18n/da.h index 7910a5586..a3876f777 100644 --- a/radio/src/translations/i18n/da.h +++ b/radio/src/translations/i18n/da.h @@ -720,7 +720,6 @@ #define TR_CURRENT_CALIB "Aktuel kalib" #define TR_VOLTAGE TR("Spænding", "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" diff --git a/radio/src/translations/i18n/de.h b/radio/src/translations/i18n/de.h index a60fd11d0..eee57b33b 100644 --- a/radio/src/translations/i18n/de.h +++ b/radio/src/translations/i18n/de.h @@ -710,7 +710,6 @@ #define TR_CURRENT_CALIB "Strom abgl." #define TR_VOLTAGE TR("Spg", "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") diff --git a/radio/src/translations/i18n/en.h b/radio/src/translations/i18n/en.h index c3a40ee4d..9b8f6bee8 100644 --- a/radio/src/translations/i18n/en.h +++ b/radio/src/translations/i18n/en.h @@ -137,7 +137,7 @@ #define TR_AUX_SERIAL_MODES_2 "Telem Mirror" #define TR_AUX_SERIAL_MODES_3 "Telemetry In" #define TR_AUX_SERIAL_MODES_4 "SBUS Trainer" -#define TR_AUX_SERIAL_MODES_5 "LUA" +#define TR_AUX_SERIAL_MODES_5 "Lua" #define TR_AUX_SERIAL_MODES_6 "CLI" #define TR_AUX_SERIAL_MODES_7 "GPS" #define TR_AUX_SERIAL_MODES_8 "Debug" @@ -716,7 +716,6 @@ #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR("Voltage", "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" diff --git a/radio/src/translations/i18n/es.h b/radio/src/translations/i18n/es.h index 762504b5b..7985c5062 100644 --- a/radio/src/translations/i18n/es.h +++ b/radio/src/translations/i18n/es.h @@ -710,7 +710,6 @@ #define TR_CURRENT_CALIB "Calib. actual" #define TR_VOLTAGE "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" diff --git a/radio/src/translations/i18n/fi.h b/radio/src/translations/i18n/fi.h index 396c9d1f9..f9d456a1f 100644 --- a/radio/src/translations/i18n/fi.h +++ b/radio/src/translations/i18n/fi.h @@ -710,7 +710,6 @@ #define TR_CURRENT_CALIB "Current Calib" #define TR_VOLTAGE "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" diff --git a/radio/src/translations/i18n/fr.h b/radio/src/translations/i18n/fr.h index 8e67cf52a..fd5692424 100644 --- a/radio/src/translations/i18n/fr.h +++ b/radio/src/translations/i18n/fr.h @@ -714,7 +714,6 @@ #define TR_CURRENT_CALIB "Calib. cour" #define TR_VOLTAGE TR("Tension","Source tension") #define TR_SELECT_MODEL "Sélection Modèle" -#define TR_MANAGE_MODELS "GESTION MODÈLES" #define TR_MODELS "Modèles" #define TR_SELECT_MODE "Sélection mode" #define TR_CREATE_MODEL "Créer modèle" diff --git a/radio/src/translations/i18n/he.h b/radio/src/translations/i18n/he.h index 8de11942b..685f98bf3 100644 --- a/radio/src/translations/i18n/he.h +++ b/radio/src/translations/i18n/he.h @@ -718,7 +718,6 @@ #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR("Voltage", "Voltage source") #define TR_SELECT_MODEL "בחירת מודל" -#define TR_MANAGE_MODELS "ניהול מודלים" #define TR_MODELS "מודלים" #define TR_SELECT_MODE "בחירת מצב" #define TR_CREATE_MODEL "יצירת מודל" diff --git a/radio/src/translations/i18n/it.h b/radio/src/translations/i18n/it.h index 8ab960989..a3936c3a7 100644 --- a/radio/src/translations/i18n/it.h +++ b/radio/src/translations/i18n/it.h @@ -715,7 +715,6 @@ #define TR_CURRENT_CALIB "Calibrazione" #define TR_VOLTAGE TR("Voltagg.","Voltaggio") #define TR_SELECT_MODEL "Scegli Modello" -#define TR_MANAGE_MODELS "GESTIONE MODELLI" #define TR_MODELS "Modelli" #define TR_SELECT_MODE "Seleziona modo" #define TR_CREATE_MODEL "Crea Modello" diff --git a/radio/src/translations/i18n/jp.h b/radio/src/translations/i18n/jp.h index 75625685d..972e4ee86 100644 --- a/radio/src/translations/i18n/jp.h +++ b/radio/src/translations/i18n/jp.h @@ -714,7 +714,6 @@ #define TR_CURRENT_CALIB "現在のキャリブレーション" #define TR_VOLTAGE TR("Voltage", "電圧ソース") #define TR_SELECT_MODEL "モデル選択" -#define TR_MANAGE_MODELS "モデル管理" #define TR_MODELS "モデル" #define TR_SELECT_MODE "モード選択" #define TR_CREATE_MODEL "モデル作成" diff --git a/radio/src/translations/i18n/ko.h b/radio/src/translations/i18n/ko.h index 008cfd2b9..e886647d0 100644 --- a/radio/src/translations/i18n/ko.h +++ b/radio/src/translations/i18n/ko.h @@ -743,7 +743,6 @@ #define TR_CURRENT_CALIB "전류 보정" #define TR_VOLTAGE TR("전압", "전압 소스") #define TR_SELECT_MODEL "모델 선택" -#define TR_MANAGE_MODELS "모델 관리" #define TR_MODELS "모델" #define TR_SELECT_MODE "모드 선택" #define TR_CREATE_MODEL "모델 생성" diff --git a/radio/src/translations/i18n/nl.h b/radio/src/translations/i18n/nl.h index 659ea429b..4afff0a3d 100644 --- a/radio/src/translations/i18n/nl.h +++ b/radio/src/translations/i18n/nl.h @@ -712,7 +712,6 @@ #define TR_CURRENT_CALIB "Stroom Calib" #define TR_VOLTAGE TR("Spg", "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" diff --git a/radio/src/translations/i18n/pl.h b/radio/src/translations/i18n/pl.h index fae3216c2..182e17d84 100644 --- a/radio/src/translations/i18n/pl.h +++ b/radio/src/translations/i18n/pl.h @@ -709,7 +709,6 @@ #define TR_CURRENT_CALIB " +=\006Kalibracja prądu" #define TR_VOLTAGE TR ("Napięcie","Ź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" diff --git a/radio/src/translations/i18n/pt.h b/radio/src/translations/i18n/pt.h index 3d1970aeb..e85226e06 100644 --- a/radio/src/translations/i18n/pt.h +++ b/radio/src/translations/i18n/pt.h @@ -715,7 +715,6 @@ #define TR_CURRENT_CALIB "Current calib" #define TR_VOLTAGE TR("Tensão", "Origem tensão") #define TR_SELECT_MODEL "Selec. modelo" -#define TR_MANAGE_MODELS "GERENCIAR" #define TR_MODELS "Modelos" #define TR_SELECT_MODE "Seleção de modo" #define TR_CREATE_MODEL "Criar Modelo" diff --git a/radio/src/translations/i18n/ru.h b/radio/src/translations/i18n/ru.h index 694ab2536..d06df580d 100644 --- a/radio/src/translations/i18n/ru.h +++ b/radio/src/translations/i18n/ru.h @@ -717,7 +717,6 @@ #define TR_CURRENT_CALIB "Калибр тока" #define TR_VOLTAGE TR("Напряжение", "Напряжение") #define TR_SELECT_MODEL "Выбор модели" -#define TR_MANAGE_MODELS "УПРАВЛЕНИЕ МОДЕЛЯМИ" #define TR_MODELS "Модели" #define TR_SELECT_MODE "Выбрать модель" #define TR_CREATE_MODEL "Создать модель" diff --git a/radio/src/translations/i18n/se.h b/radio/src/translations/i18n/se.h index 6ff8d2a2a..30d03fd10 100644 --- a/radio/src/translations/i18n/se.h +++ b/radio/src/translations/i18n/se.h @@ -715,7 +715,6 @@ #define TR_CURRENT_CALIB "Kalib. ström" #define TR_VOLTAGE "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" diff --git a/radio/src/translations/i18n/tw.h b/radio/src/translations/i18n/tw.h index 41131da53..3f4f2c4c6 100644 --- a/radio/src/translations/i18n/tw.h +++ b/radio/src/translations/i18n/tw.h @@ -712,7 +712,6 @@ #define TR_CURRENT_CALIB "電流校準" #define TR_VOLTAGE TR("電壓源", "電壓來源") #define TR_SELECT_MODEL "選擇模型" -#define TR_MANAGE_MODELS "模型管理" #define TR_MODELS "個模型" #define TR_SELECT_MODE "選擇模式" #define TR_CREATE_MODEL "創建模型" diff --git a/radio/src/translations/i18n/ua.h b/radio/src/translations/i18n/ua.h index 1b25b5b75..8a78070ba 100644 --- a/radio/src/translations/i18n/ua.h +++ b/radio/src/translations/i18n/ua.h @@ -716,7 +716,6 @@ #define TR_CURRENT_CALIB "Калібровка струму" #define TR_VOLTAGE TR("Напруга", "Джерело напруги") #define TR_SELECT_MODEL "Оберіть модель" -#define TR_MANAGE_MODELS "КЕРУВАННЯ МОДЕЛЯМИ" #define TR_MODELS "Моделі" #define TR_SELECT_MODE "Оберіть режим" #define TR_CREATE_MODEL "Створіть модель" diff --git a/radio/src/translations/sim_string_list.h b/radio/src/translations/sim_string_list.h index d986c338b..6301b3e2d 100644 --- a/radio/src/translations/sim_string_list.h +++ b/radio/src/translations/sim_string_list.h @@ -113,7 +113,6 @@ #define STR_MAIN_MENU_THEMES currentLangStrings->STR_MAIN_MENU_THEMES #define STR_MAIN_MODEL_SETTINGS currentLangStrings->STR_MAIN_MODEL_SETTINGS #define STR_MAIN_RADIO_SETTINGS currentLangStrings->STR_MAIN_RADIO_SETTINGS -#define STR_MANAGE_MODELS currentLangStrings->STR_MANAGE_MODELS #define STR_MEM_USED_EXTRA currentLangStrings->STR_MEM_USED_EXTRA #define STR_MEM_USED_SCRIPT currentLangStrings->STR_MEM_USED_SCRIPT #define STR_MEM_USED_WIDGET currentLangStrings->STR_MEM_USED_WIDGET diff --git a/radio/src/translations/string_list.h b/radio/src/translations/string_list.h index 5bbbc586e..96ff7295a 100644 --- a/radio/src/translations/string_list.h +++ b/radio/src/translations/string_list.h @@ -112,7 +112,6 @@ STR(MAIN_MENU_STATISTICS) STR(MAIN_MENU_THEMES) STR(MAIN_MODEL_SETTINGS) STR(MAIN_RADIO_SETTINGS) -STR(MANAGE_MODELS) STR(MEM_USED_EXTRA) STR(MEM_USED_SCRIPT) STR(MEM_USED_WIDGET)