piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(colorlcd): Page header unification and other cosmetics (#3326)

Browse Source 
* 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
This commit is contained in:
Peter Feerick
2023-03-23 11:53:27 +10:00
committed by GitHub
parent edd469645f
commit 335c0a3a0a
39 changed files with 188 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/translations.cpp
+16 -15
View File
@@ -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)