Browse Source

Remove duplicate string `HW Setup" using `MSG_HW_SETUP`

3d-gussner 3 years ago
parent
commit
223f32deae

+ 1 - 1
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"); ////

+ 2 - 2
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;

+ 1 - 1
lang/lang_en.txt

@@ -1012,7 +1012,7 @@
 #MSG_WARN
 "Warn"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 
 #

+ 1 - 1
lang/lang_en_cz.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Varovat"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "HW nastaveni"
 

+ 1 - 1
lang/lang_en_de.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Warnen"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "HW Einstellungen"
 

+ 1 - 1
lang/lang_en_es.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Aviso"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "Configuracion HW"
 

+ 1 - 1
lang/lang_en_fr.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Avert"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "Config HW"
 

+ 1 - 1
lang/lang_en_it.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Avviso"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "Impostazioni HW"
 

+ 1 - 1
lang/lang_en_pl.txt

@@ -1350,7 +1350,7 @@
 "Warn"
 "Ostrzez"
 
-#
+#MSG_HW_SETUP c=18
 "HW Setup"
 "Ustawienia HW"