diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 17a9a3e3f..c8297b374 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -11786,7 +11786,7 @@ void M600_wait_for_user(float HotendTempBckp) { delay_keep_alive(4); if (_millis() > waiting_start_time + (unsigned long)M600_TIMEOUT * 1000) { - lcd_display_message_fullscreen_P(_i("Press knob to preheat nozzle and continue."));////MSG_PRESS_TO_PREHEAT c=20 r=4 + lcd_display_message_fullscreen_P(_i("Press the knob to preheat nozzle and continue."));////MSG_PRESS_TO_PREHEAT c=20 r=4 wait_for_user_state = 1; setAllTargetHotends(0); st_synchronize(); diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d3686509a..72b5451a4 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2235,18 +2235,18 @@ uint8_t nLevel; lcd_set_cursor(0,0); lcdui_print_temp(LCD_STR_THERMOMETER[0],(int)degHotend(0),(int)degTargetHotend(0)); -lcd_puts_at_P(0,2, _i("Press the knob")); ////MSG_ c=20 r=1 -lcd_set_cursor(0,3); +lcd_puts_at_P(0,1, _i("Press the knob")); ////MSG_ c=20 +lcd_set_cursor(0,2); switch(eFilamentAction) { case FilamentAction::Load: case FilamentAction::AutoLoad: case FilamentAction::MmuLoad: - lcd_puts_P(_i("to load filament")); ////MSG_ c=20 r=1 + lcd_puts_P(_i("to load filament")); ////MSG_ c=20 break; case FilamentAction::UnLoad: case FilamentAction::MmuUnLoad: - lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 r=1 + lcd_puts_P(_i("to unload filament")); ////MSG_ c=20 break; case FilamentAction::MmuEject: case FilamentAction::MmuCut: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index bcb0a4444..8c0e6eb9d 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -620,7 +620,7 @@ "Please upgrade." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." #MSG_FS_PAUSE c=5 "Pause" @@ -643,7 +643,7 @@ #MSG_CARD_MENU "Print from SD" -# +# c=20 "Press the knob" #MSG_PRINT_PAUSED c=20 r=1 @@ -874,10 +874,10 @@ #MSG_TOTAL_FAILURES c=20 "Total failures" -# +# c=20 "to load filament" -# +# c=20 "to unload filament" #MSG_UNLOAD_FILAMENT c=17 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 0b3d7b14f..2c0bc664b 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -827,7 +827,7 @@ "Prosim aktualizujte." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Pro nahrati trysky a pokracovani stisknete tlacitko." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Tisk z SD" -# +# c=20 "Press the knob" "Stisknete hl. tlacitko" @@ -1166,11 +1166,11 @@ "Total failures" "Celkem selhani" -# +# c=20 "to load filament" "k zavedeni filamentu" -# +# c=20 "to unload filament" "k vyjmuti filamentu" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 0a436a9ee..e6fd5bccc 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -827,7 +827,7 @@ "Bitte aktualisieren." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Bitte druecken Sie den Knopf um die Duese vorzuheizen und fortzufahren." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Drucken von SD" -# +# c=20 "Press the knob" "Knopf druecken zum" @@ -1166,11 +1166,11 @@ "Total failures" "Gesamte Fehler" -# +# c=20 "to load filament" "Filament laden" -# +# c=20 "to unload filament" "Filament entladen" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 2e29fa20a..4e622ebb9 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -827,7 +827,7 @@ "Actualize por favor" #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Pulsa el dial para precalentar la boquilla y continue." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Menu tarjeta SD" -# +# c=20 "Press the knob" "Pulsa el dial" @@ -1166,13 +1166,13 @@ "Total failures" "Fallos totales" -# +# c=20 "to load filament" -"para cargar el filamento" +"para cargar el fil." -# +# c=20 "to unload filament" -"para descargar el filamento" +"para descargar fil." #MSG_UNLOAD_FILAMENT c=17 "Unload filament" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index cc0cbb95b..edf2bb8b4 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -827,7 +827,7 @@ "Mettez a jour le FW." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Appuyez sur le bouton pour prechauffer la buse et continuer." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Impr. depuis la SD" -# +# c=20 "Press the knob" "App. sur sur bouton" @@ -1166,11 +1166,11 @@ "Total failures" "Total des echecs" -# +# c=20 "to load filament" "pour charger le fil." -# +# c=20 "to unload filament" "pour decharger fil." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8cd939082..043d1141b 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -827,7 +827,7 @@ "Prego aggiornare." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Premete la manopola per preriscaldare l'ugello e continuare." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Stampa da SD" -# +# c=20 "Press the knob" "Premere la manopola" @@ -1166,13 +1166,13 @@ "Total failures" "Totale fallimenti" -# +# c=20 "to load filament" -"per caricare il filamento" +"per caricare il fil." -# +# c=20 "to unload filament" -"per scaricare il filamento" +"per scaricare fil." #MSG_UNLOAD_FILAMENT c=17 "Unload filament" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 38d1421f7..4e6be18e0 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -827,7 +827,7 @@ "Prosze zaktualizowac." #MSG_PRESS_TO_PREHEAT c=20 r=4 -"Press knob to preheat nozzle and continue." +"Press the knob to preheat nozzle and continue." "Wcisnij pokretlo aby rozgrzac dysze i kontynuowac." #MSG_FS_PAUSE c=5 @@ -858,7 +858,7 @@ "Print from SD" "Druk z karty SD" -# +# c=20 "Press the knob" "Wcisnij pokretlo" @@ -1166,11 +1166,11 @@ "Total failures" "Suma bledow" -# +# c=20 "to load filament" "aby zaladow. fil." -# +# c=20 "to unload filament" "aby rozlad. filament"