From a09f2c2f2d5aa8846d947c2df62a9822b06ba000 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 19 Mar 2021 18:12:16 +0100 Subject: [PATCH] Update "G-code sliced for a newer firmware. Continue?" as French translation is longer --- Firmware/util.cpp | 4 ++-- lang/lang_en.txt | 2 +- lang/lang_en_cz.txt | 2 +- lang/lang_en_de.txt | 2 +- lang/lang_en_es.txt | 2 +- lang/lang_en_fr.txt | 2 +- lang/lang_en_it.txt | 2 +- lang/lang_en_nl.txt | 2 +- lang/lang_en_pl.txt | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Firmware/util.cpp b/Firmware/util.cpp index 080d1778..8bbb2232 100644 --- a/Firmware/util.cpp +++ b/Firmware/util.cpp @@ -479,7 +479,7 @@ switch(oCheckVersion) { case ClCheckVersion::_Warn: // lcd_show_fullscreen_message_and_wait_P(_i("Printer FW version differs from the G-code. Continue?")); -lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////c=20 r=4 +lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////c=20 r=5 lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); //???custom_message_type=CUSTOM_MSG_TYPE_STATUS; // display / status-line recovery lcd_update_enable(true); // display / status-line recovery @@ -518,7 +518,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT); lcd_update_enable(true); // display / status-line recovery break; case ClCheckGcode::_Strict: - lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////c=20 r=6 + lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////c=20 r=7 lcd_print_stop(); break; case ClCheckGcode::_None: diff --git a/lang/lang_en.txt b/lang/lang_en.txt index a01a3b99..b264c745 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -1048,7 +1048,7 @@ #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8 "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" # c=20 r=7 diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index c1183a4e..c1666c08 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. Please re-slice the model again. Print cancelled." "G-code je pripraven pro jiny typ tiskarny. Prosim preslicujte model znovu. Tisk zrusen." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code je pripraven pro novejsi firmware. Pokracovat?" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index dd71f59c..d268ae9c 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. Please re-slice the model again. Print cancelled." "G-Code ist fuer einen anderen Drucker geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-Code ist fuer eine neuere Firmware geslict. Fortfahren?" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index bd7c5353..9ba619fb 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. Please re-slice the model again. Print cancelled." "Codigo G laminado para una impresora diferente. Por favor relamina el modelo de nuevo. Impresion cancelada." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "Codigo G laminado para nuevo firmware. ?Continuar?" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 85ed7e4f..d75dab0e 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. 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." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "Le G-code a ete prepare pour une version plus recente du firmware. Continuer?" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 8019eabf..8494d217 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. 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." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code processato per un firmware piu recente. Continuare?" diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 2ed02d03..3056e4c6 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -1398,7 +1398,7 @@ "G-code sliced for a different printer type. Please re-slice the model again. Print cancelled." "G-Code is voor een ander printertype geslict. Slice het model opniew alsjeblieft. Druk geannuleerd." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-Code is voor een nieuwere firmware geslict. Doorgaan?" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 11768609..29c54928 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. Please re-slice the model again. Print cancelled." "G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany." -# c=20 r=4 +# c=20 r=5 "G-code sliced for a newer firmware. Continue?" "G-code pociety dla nowszego firmware. Kontynuowac?"