diff --git a/Firmware/messages.c b/Firmware/messages.c index bd1d81551..0b1d58e04 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -131,6 +131,7 @@ const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); //// const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); //// const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); //// const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced for a different printer type. Continue?"); ////c=20 r=5 +const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."); ////c=20 r=6 const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); //// const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); //// const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 11f731831..0a05c58f5 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -131,6 +131,7 @@ extern const char MSG_MODEL[]; extern const char MSG_FIRMWARE[]; extern const char MSG_GCODE[]; extern const char MSG_GCODE_DIFF_PRINTER_CONTINUE[]; +extern const char MSG_GCODE_DIFF_PRINTER_CANCELLED[]; extern const char MSG_NOZZLE_DIAMETER[]; extern const char MSG_MMU_MODE[]; extern const char MSG_SD_CARD[]; diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 325db4660..e335793a0 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -434,7 +434,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED)); lcd_print_stop(); break; case ClCheckModel::_None: @@ -583,7 +583,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_update_enable(true); // display / status-line recovery break; case ClCheckModel::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different printer type. Please re-slice the model again. Print cancelled.")); + lcd_show_fullscreen_message_and_wait_P(_T(MSG_GCODE_DIFF_PRINTER_CANCELLED)); lcd_print_stop(); break; case ClCheckModel::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 207d08460..bcb0a4444 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1048,7 +1048,7 @@ #MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5 "G-code sliced for a different printer type. Continue?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." # diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 320d2b99a..0b3d7b14f 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code je pripraven pro jiny typ tiskarny. Pokracovat?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 9967e6d85..0a436a9ee 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-Code ist fuer einen anderen Drucker geslict. Fortfahren?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index d2837bc97..2e29fa20a 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "Codigo G laminado para un tipo de impresora diferente. ?Continuar?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 8b6f88c50..cc0cbb95b 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "Le G-code a ete prepare pour une autre version de l'imprimante. Continuer?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "Le G-code a ete prepare pour une autre version de l'imprimante. Veuillez decouper le modele a nouveau. L'impression a ete annulee." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b36c7a394..8cd939082 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code processato per una stampante diversa. Continuare?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cc78b676b..38d1421f7 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Continue?" "G-code pociety dla innej drukarki. Kontynuowac?" -# +#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=6 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany."