From ff9185d1bb01ba36cfb9a685bf60928eb97a5b18 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Fri, 23 Apr 2021 08:50:50 +0200 Subject: [PATCH] Readded `>Cancel` as the `>` has some meaning. Sadly the previously 10bytes more free space are gone again --- Firmware/ultralcd.cpp | 2 +- lang/lang_en.txt | 3 +++ lang/lang_en_cz.txt | 4 ++++ lang/lang_en_de.txt | 4 ++++ lang/lang_en_es.txt | 4 ++++ lang/lang_en_fr.txt | 4 ++++ lang/lang_en_it.txt | 4 ++++ lang/lang_en_nl.txt | 4 ++++ lang/lang_en_pl.txt | 4 ++++ 9 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index ebf2b205..f5e47a50 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2209,7 +2209,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed) lcd_clear(); lcd_draw_update = 1; - lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_ c=20 r=1 + lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_CANCEL2 c=10 lcd_set_cursor(0, 1); switch (eFilamentAction) diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 63898a67..30c36001 100644 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -115,6 +115,9 @@ #MSG_CALIBRATE_PINDA c=17 "Calibrate" +#MSG_CANCEL2 c=10 +">Cancel" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 99756be1..4db4248c 100644 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -154,6 +154,10 @@ "Calibrate" "Zkalibrovat" +#MSG_CANCEL2 c=10 +">Cancel" +">Zrusit" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Kalibrace XYZ. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index a35152a1..32aa0498 100644 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -154,6 +154,10 @@ "Calibrate" "Kalibrieren" +#MSG_CANCEL2 c=10 +">Cancel" +">Abbruch" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "XYZ Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index 8f049ef1..8a63d669 100644 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -154,6 +154,10 @@ "Calibrate" "Calibrar" +#MSG_CANCEL2 c=10 +">Cancel" +">Cancelar" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibrando XYZ. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 09f98396..f763d581 100644 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -154,6 +154,10 @@ "Calibrate" "Calibrer" +#MSG_CANCEL2 c=10 +">Cancel" +">Annuler" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibration de XYZ. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 4607f3d3..7c309f06 100644 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -154,6 +154,10 @@ "Calibrate" "Calibra" +#MSG_CANCEL2 c=10 +">Cancel" +">Annulla" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Calibrazione XYZ. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare." diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt index 03ffe77d..4a4a2343 100644 --- a/lang/lang_en_nl.txt +++ b/lang/lang_en_nl.txt @@ -154,6 +154,10 @@ "Calibrate" "Kalibreren" +#MSG_CANCEL2 c=10 +">Cancel" +">Annuleren" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Kalibreren van XYZ. Draai de knop om de Z-wagen omhoog te gaan tot het einde stoppers. Druk knop als klaar." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 36c31c91..68dee501 100644 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -154,6 +154,10 @@ "Calibrate" "Kalibruj" +#MSG_CANCEL2 c=10 +">Cancel" +">Anuluj" + #MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done." "Kalibracja XYZ. Przekrec pokretlo, aby przesunac os Z do gornych ogranicznikow. Nacisnij, by potwierdzic."