From 223f32deae5bb681af4a85ae8c164e3a28edcf66 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 25 Jan 2021 16:15:57 +0100 Subject: [PATCH] Remove duplicate string `HW Setup" using `MSG_HW_SETUP` --- Firmware/messages.c | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_pl.txt | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 477213f0..c77c4c34 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -81,7 +81,7 @@ const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); //// const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17 const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// -const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); //// +const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18 const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); //// diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index f0041b82..92e612b2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5605,7 +5605,7 @@ static void select_sheet_menu() static void sheets_menu() { MENU_BEGIN(); - MENU_ITEM_BACK_P(_i("HW Setup")); + MENU_ITEM_BACK_P(_T(MSG_HW_SETUP)); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[0], select_sheet_menu<0>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[1], select_sheet_menu<1>); MENU_ITEM_SUBMENU_E(EEPROM_Sheets_base->s[2], select_sheet_menu<2>); @@ -5695,7 +5695,7 @@ static void lcd_settings_menu() if(!farm_mode) { bSettings=true; // flag ('fake parameter') for 'lcd_hw_setup_menu()' function - MENU_ITEM_SUBMENU_P(_i("HW Setup"), lcd_hw_setup_menu);////MSG_HW_SETUP + MENU_ITEM_SUBMENU_P(_T(MSG_HW_SETUP), lcd_hw_setup_menu); } SETTINGS_MMU_MODE; diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 82ca2c0d..e2596e19 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1012,7 +1012,7 @@ #MSG_WARN "Warn" -# +#MSG_HW_SETUP c=18 "HW Setup" # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 994e4350..97409c2d 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1350,7 +1350,7 @@ "Warn" "Varovat" -# +#MSG_HW_SETUP c=18 "HW Setup" "HW nastaveni" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index ef06194b..2c72bea5 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1350,7 +1350,7 @@ "Warn" "Warnen" -# +#MSG_HW_SETUP c=18 "HW Setup" "HW Einstellungen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 8f7e271f..9dc3ce64 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1350,7 +1350,7 @@ "Warn" "Aviso" -# +#MSG_HW_SETUP c=18 "HW Setup" "Configuracion HW" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 3e7c082b..db1b9afa 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1350,7 +1350,7 @@ "Warn" "Avert" -# +#MSG_HW_SETUP c=18 "HW Setup" "Config HW" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 63cfc397..bba04172 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1350,7 +1350,7 @@ "Warn" "Avviso" -# +#MSG_HW_SETUP c=18 "HW Setup" "Impostazioni HW" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 52968d47..621bd9db 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1350,7 +1350,7 @@ "Warn" "Ostrzez" -# +#MSG_HW_SETUP c=18 "HW Setup" "Ustawienia HW"