diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index a9fbf958a..c1d46be1e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -6131,7 +6131,7 @@ Sigma_Exit: WRITE(PS_ON_PIN, PS_ON_ASLEEP); #endif powersupply = false; - LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),MSG_OFF,PSTR("."))); + LCD_MESSAGERPGM(CAT4(CUSTOM_MENDEL_NAME,PSTR(" "),_i("Off"),PSTR("."))); lcd_update(0); break; diff --git a/Firmware/messages.c b/Firmware/messages.c index 4c1dbc275..83665d4bf 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -104,8 +104,6 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 -const char MSG_OFF[] PROGMEM_I1 = "Off"; ////c=3 r=1 -const char MSG_ON[] PROGMEM_I1 = "On"; ////c=2 r=1 //not internationalized messages const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 65ddbab3f..f944f52de 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -104,8 +104,6 @@ extern const char MSG_WIZARD_QUIT[]; extern const char MSG_YES[]; extern const char MSG_V2_CALIBRATION[]; extern const char WELCOME_MSG[]; -extern const char MSG_OFF[]; -extern const char MSG_ON[]; //not internationalized messages extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_EXTERNAL_RESET[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index cf81908d5..35afc9549 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5569,7 +5569,7 @@ static void lcd_settings_menu() SETTINGS_CUTTER; - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); SETTINGS_SILENT_MODE; @@ -6878,7 +6878,7 @@ static void lcd_tune_menu() if(farm_mode) { - MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check); + MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _i("On") : _i("Off"), lcd_set_fan_check); } #ifdef TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8819d40ae..8e00dd803 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -925,8 +925,8 @@ # "Y-correct:" -#MSG_OFF +# "Off" -#MSG_ON +# "On" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 9a4b75795..701693945 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekce Y:" -#MSG_OFF +# "Off" "Vyp" -#MSG_ON +# "On" "Zap" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 1dc09798c..fbfb27fdf 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1235,10 +1235,10 @@ "Y-correct:" "Y-Korrektur:" -#MSG_OFF +# "Off" "Aus" -#MSG_ON +# "On" "An" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index ba1fea1ee..b1da127d4 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Y-correcion:" -#MSG_OFF +# "Off" "Ina" -#MSG_ON +# "On" "Act" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index f86795d71..57ed8d119 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correct-Y:" -#MSG_OFF +# "Off" "\x00" -#MSG_ON +# "On" "\x00" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4130aedb7..b79b678ae 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Correzione-Y:" -#MSG_OFF +# "Off" "\x00" -#MSG_ON +# "On" "\x00" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 45b402fa9..79765625d 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1234,10 +1234,10 @@ "Y-correct:" "Korekcja Y:" -#MSG_OFF +# "Off" "Wyl" -#MSG_ON +# "On" "Wl"