diff --git a/Firmware/messages.c b/Firmware/messages.c index b681cfd3..433f2e7f 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -79,9 +79,10 @@ const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 const char MSG_PULL_OUT_FILAMENT[] PROGMEM_I1 = ISTR("Please pull out filament immediately"); ////c=20 r=4 const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover print?"); ////c=20 r=2 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); //// -const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 -const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4 +const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////c=14 +const char MSG_RESUME_PRINT[] PROGMEM_I1 = ISTR("Resume print"); ////c=18 +const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); //// const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed "); ////c=20 diff --git a/Firmware/messages.h b/Firmware/messages.h index ea2ddeea..e397ea0a 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -77,9 +77,10 @@ extern const char MSG_PRESS_TO_UNLOAD[]; extern const char MSG_PRINT_ABORTED[]; extern const char MSG_PULL_OUT_FILAMENT[]; extern const char MSG_RECOVER_PRINT[]; -extern const char MSG_RESET[]; extern const char MSG_REFRESH[]; extern const char MSG_REMOVE_STEEL_SHEET[]; +extern const char MSG_RESET[]; +extern const char MSG_RESUME_PRINT[]; extern const char MSG_RESUMING_PRINT[]; extern const char MSG_SD_WORKDIR_FAIL[]; extern const char MSG_SELFTEST_COOLING_FAN[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dd3f7026..81bb0f3c 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -6620,9 +6620,9 @@ static void lcd_main_menu() { #ifdef FANCHECK if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #else - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #endif } @@ -6640,9 +6640,9 @@ static void lcd_main_menu() { #ifdef FANCHECK if((fan_check_error == EFCE_FIXED) || (fan_check_error == EFCE_OK)) - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #else - MENU_ITEM_SUBMENU_P(_i("Resume print"), lcd_resume_print);////MSG_RESUME_PRINT + MENU_ITEM_SUBMENU_P(_T(MSG_RESUME_PRINT), lcd_resume_print);////MSG_RESUME_PRINT c=18 #endif } diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 8c545346..21688a9d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -694,7 +694,7 @@ #MSG_RESET c=14 "Reset" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" #MSG_RESUMING_PRINT c=20 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index b4e4a4fb..6be8dba7 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Pokracovat" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9164a4ca..65c78d7c 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -926,7 +926,7 @@ "Reset" "Ruecksetzen" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Druck fortsetzen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 1cb9a7c8..e009c3f9 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Reanudar impres." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 7e7e3e13..dfc7c1dc 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -926,7 +926,7 @@ "Reset" "Reinitialiser" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Reprendre impression" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 6c4175cb..336efb68 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Riprendi stampa" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 4705c688..2feacf14 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -926,7 +926,7 @@ "Reset" "\x00" -#MSG_RESUME_PRINT +#MSG_RESUME_PRINT c=18 "Resume print" "Wznowic wydruk"