From 1a6de14a06c00968669fc34c8632fa411f92263d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:16:34 +0100
Subject: [PATCH 001/254] Fix `FINDA` translation
---
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.txt | 2 +-
lang/lang_en_es.txt | 4 ++--
lang/lang_en_fr.txt | 4 ++--
lang/lang_en_it.txt | 2 +-
lang/lang_en_pl.txt | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 02d42080..a8a51f8f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1007,7 +1007,7 @@
"False triggering"
#
-"FINDA:"
+"FINDA"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bbf30748..6de138b3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1343,7 +1343,7 @@
"Falesne spusteni"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 02dc1a7f..6c9a2d1d 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1343,7 +1343,7 @@
"Falschtriggerung"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 76cfd6ac..bcb853fa 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1343,8 +1343,8 @@
"Falsa activacion"
#
-"FINDA:"
-"FINDA:"
+"FINDA"
+"\x00"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 77e31256..4e84c112 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1343,8 +1343,8 @@
"Faux declenchement"
#
-"FINDA:"
-"FINDA:"
+"FINDA"
+"\x00"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b0bebf1a..6adf44ba 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1343,7 +1343,7 @@
"Falso innesco"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 89db5b6d..70712d99 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1343,7 +1343,7 @@
"Falszywy alarm"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
From 5efe33bfc6db9afd2ee7b4ce99b3a27e5fc1a4da Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:23:33 +0100
Subject: [PATCH 002/254] Delete unused translations
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a8a51f8f..ea9fabc8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1,6 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6de138b3..ca0d29e9 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 nebo starsi"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6c9a2d1d..bb72c70a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 oder aelter"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index bcb853fa..58d5ed91 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 o mayor"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4e84c112..ce959036 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 ou +ancien"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6adf44ba..7ed80e78 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset"
-
#MSG_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 o inferiore"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 70712d99..ef445e1c 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 lub starszy"
From 6f15cc383b52a976c8564d5dde7e8720c1eb03b7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:25:39 +0100
Subject: [PATCH 003/254] Fix `PINDA` translation
---
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.txt | 2 +-
lang/lang_en_es.txt | 4 ++--
lang/lang_en_fr.txt | 4 ++--
lang/lang_en_it.txt | 2 +-
lang/lang_en_pl.txt | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ea9fabc8..66444fb0 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1061,7 +1061,7 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
#
-"PINDA:"
+"PINDA"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ca0d29e9..b6241636 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1415,7 +1415,7 @@
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index bb72c70a..c9a3c176 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1415,7 +1415,7 @@
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 58d5ed91..be9e72ee 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1415,8 +1415,8 @@
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
#
-"PINDA:"
-"PINDA:"
+"PINDA"
+"\x00"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ce959036..812e3ce1 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1415,8 +1415,8 @@
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
#
-"PINDA:"
-"PINDA:"
+"PINDA"
+"\x00"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7ed80e78..799ef173 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1415,7 +1415,7 @@
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ef445e1c..d6a0c384 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1415,7 +1415,7 @@
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
From d47d0ed34fa431d18e74349fe07042a8fdcf135b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:32:16 +0100
Subject: [PATCH 004/254] Delete unused `IR:` translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 66444fb0..39b064fa 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1018,9 +1018,6 @@
#MSG_HW_SETUP c=18
"HW Setup"
-#
-"IR:"
-
#MSG_MAGNETS_COMP
"Magnets comp."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b6241636..e7568375 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"HW nastaveni"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Komp. magnetu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c9a3c176..5997fb8c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"HW Einstellungen"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Magnet Komp."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index be9e72ee..71cfe2ae 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"Configuracion HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Comp. imanes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 812e3ce1..77cc4f2a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"Config HW"
-#
-"IR:"
-"IR:"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Compens. aim."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 799ef173..58f3123f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"Impostazioni HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Comp. Magneti"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d6a0c384..6d20bace 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1358,10 +1358,6 @@
"HW Setup"
"Ustawienia HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Kor. magnesow"
From d2bfa666b16899203bfc7533eacf72f868745c26 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:38:43 +0100
Subject: [PATCH 005/254] Delete unused `Sensor state` translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 39b064fa..c79973e7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -766,9 +766,6 @@
#MSG_SHOW_END_STOPS c=18
"Show end stops"
-#
-"Sensor state"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e7568375..78500ee0 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Stav konc. spin."
-#
-"Sensor state"
-"Stav senzoru"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5997fb8c..8e8be982 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Endschalter Status"
-#
-"Sensor state"
-"Sensorstatus"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 71cfe2ae..16707900 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Mostrar endstops"
-#
-"Sensor state"
-"Estado del sensor"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 77cc4f2a..a4cb5d1f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Afficher butees"
-#
-"Sensor state"
-"Etat capteur"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 58f3123f..a6a686de 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Stato finecorsa"
-#
-"Sensor state"
-"Stato sensore"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6d20bace..33d008d0 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1022,10 +1022,6 @@
"Show end stops"
"Pokaz krancowki"
-#
-"Sensor state"
-"Stan czujnikow"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100."
From 67526116e2867f560b59be60f36dca252bf1b00d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:44:29 +0100
Subject: [PATCH 006/254] Delete unused translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index c79973e7..2fbece67 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -907,9 +907,6 @@
#MSG_WAITING_TEMP_PINDA c=20 r=3
"Waiting for PINDA probe cooling"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 78500ee0..723dea3f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"Cekani na zchladnuti PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Varovani: doslo ke zmene typu tiskarny a motherboardu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 8e8be982..7c3747b0 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"Warten, bis PINDA- Sonde abgekuehlt ist"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Warnung: Druckertyp und Platinentyp wurden beide geaendert."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 16707900..6b944a30 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"Esperando a que se enfrie la sonda PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo"
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Aviso: tanto el tipo de impresora como el tipo de la placa han cambiado."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a4cb5d1f..ed040a50 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"Attente du refroidissement de la sonde PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Utilisez Remonter le fil. pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Attention: Types d'imprimante et de carte mere modifies"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a6a686de..51882b9c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"In attesa del raffreddamento della sonda PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Attenzione: tipo di stampante e di scheda madre cambiati."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 33d008d0..a05292f7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1210,10 +1210,6 @@
"Waiting for PINDA probe cooling"
"Czekam az spadnie temp. sondy PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Ostrzezenie: typ drukarki i plyta glowna ulegly zmianie."
From c976340deed8494969ea431a08fc4d087b45f234 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 12:03:15 +0100
Subject: [PATCH 007/254] Remove duplicate `PINDA` in translations
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2fbece67..64d5ad83 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1051,9 +1051,6 @@
#
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
-#
-"PINDA"
-
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 723dea3f..260197af 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Predehrev ke strihu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7c3747b0..56451048 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Heizen zum Schnitt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6b944a30..aa8d1da6 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Precalent. laminar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ed040a50..89370339 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Chauffe pour couper"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 51882b9c..421b4240 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Preriscalda. taglio"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index a05292f7..9b88e39e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1402,10 +1402,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Nagrzew. obciecia"
From 02e5000efa214d26c8970605d295b0f887c352d0 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:16:34 +0100
Subject: [PATCH 008/254] Fix `FINDA` translation
---
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.txt | 2 +-
lang/lang_en_es.txt | 4 ++--
lang/lang_en_fr.txt | 4 ++--
lang/lang_en_it.txt | 2 +-
lang/lang_en_pl.txt | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index c25cbe29..4873d2c1 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1010,7 +1010,7 @@
"False triggering"
#
-"FINDA:"
+"FINDA"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c80a8367..465ce9bb 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1347,7 +1347,7 @@
"Falesne spusteni"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7fc66267..b64154a1 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1347,7 +1347,7 @@
"Falschtriggerung"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c2587efa..fb64b794 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1347,8 +1347,8 @@
"Falsa activacion"
#
-"FINDA:"
-"FINDA:"
+"FINDA"
+"\x00"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c572acef..cfd4b35b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1347,8 +1347,8 @@
"Faux declenchement"
#
-"FINDA:"
-"FINDA:"
+"FINDA"
+"\x00"
#MSG_FIRMWARE
"Firmware"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 91577e82..f676ad74 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1347,7 +1347,7 @@
"Falso innesco"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3c6381ef..8363cd28 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1347,7 +1347,7 @@
"Falszywy alarm"
#
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE
From 3bf938f052e1ae2749c7f550a8695ef92e0fb4b2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:23:33 +0100
Subject: [PATCH 009/254] Delete unused translations
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4873d2c1..01cea236 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1,6 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 465ce9bb..4d9664e3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Doladeni Z\x0auz nastaveno, pouzit\x0anebo reset od nuly?\x0a%cPokracovat%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 nebo starsi"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b64154a1..17d1620e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Z Einstell.\x0aWert gesetzt,weiter\x0aoder mit 0 beginnen?\x0a%cWeiter%cNeu beginnen"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 oder aelter"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index fb64b794..8d71d5ff 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Ajuste Z\x0aAjustado, continuar\x0ao empezar de nuevo?\x0a%cContinuar%cRepetir"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 o mayor"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cfd4b35b..e50e923c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Ajust. du Z\x0aValeur enreg, contin\x0aou depart a zero?\x0a%cContinuer%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 ou +ancien"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f676ad74..e466df53 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Set valori\x0aComp. Z, continuare\x0ao iniziare da zero?\x0a%cContinua%cReset"
-
#MSG_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 o inferiore"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8363cd28..4b80a747 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Live Adj. Z\x0austaw., kontynuowac\x0aczy zaczac od 0?\x0a%cKontynuuj%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 lub starszy"
From 38e7779f1f6a486008a447ccee624a6f58498dea Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:25:39 +0100
Subject: [PATCH 010/254] Fix `PINDA` translation
---
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.txt | 2 +-
lang/lang_en_es.txt | 4 ++--
lang/lang_en_fr.txt | 4 ++--
lang/lang_en_it.txt | 2 +-
lang/lang_en_pl.txt | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 01cea236..aa8425fc 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1064,7 +1064,7 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
#
-"PINDA:"
+"PINDA"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4d9664e3..e508503e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1419,7 +1419,7 @@
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 17d1620e..03ad5f67 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1419,7 +1419,7 @@
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8d71d5ff..d01777a2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1419,8 +1419,8 @@
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
#
-"PINDA:"
-"PINDA:"
+"PINDA"
+"\x00"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e50e923c..88fff319 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1419,8 +1419,8 @@
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
#
-"PINDA:"
-"PINDA:"
+"PINDA"
+"\x00"
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e466df53..bd5241e1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1419,7 +1419,7 @@
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4b80a747..f65e91cc 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1419,7 +1419,7 @@
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
#
-"PINDA:"
+"PINDA"
"\x00"
# c=20
From de51d1069408600aeef92db55698df807b0fb5b8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:32:16 +0100
Subject: [PATCH 011/254] Delete unused `IR:` translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index aa8425fc..bc662912 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1021,9 +1021,6 @@
#MSG_HW_SETUP c=18
"HW Setup"
-#
-"IR:"
-
#MSG_MAGNETS_COMP
"Magnets comp."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e508503e..59d3c270 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"HW nastaveni"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Komp. magnetu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 03ad5f67..7793de4e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"HW Einstellungen"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Magnet Komp."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d01777a2..68c4e22a 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"Configuracion HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Comp. imanes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 88fff319..6e0fb2c1 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"Config HW"
-#
-"IR:"
-"IR:"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Compens. aim."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index bd5241e1..f1aef280 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"Impostazioni HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Comp. Magneti"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f65e91cc..96d31a44 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1362,10 +1362,6 @@
"HW Setup"
"Ustawienia HW"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Kor. magnesow"
From 1ade96bbeb84300f3a38858f8e5e30d69c8b6845 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:38:43 +0100
Subject: [PATCH 012/254] Delete unused `Sensor state` translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bc662912..b6428643 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -769,9 +769,6 @@
#MSG_SHOW_END_STOPS c=18
"Show end stops"
-#
-"Sensor state"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 59d3c270..2a61e091 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Stav konc. spin."
-#
-"Sensor state"
-"Stav senzoru"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7793de4e..23f58484 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Endschalter Status"
-#
-"Sensor state"
-"Sensorstatus"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 68c4e22a..842e5adc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Mostrar endstops"
-#
-"Sensor state"
-"Estado del sensor"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 6e0fb2c1..805bcff2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Afficher butees"
-#
-"Sensor state"
-"Etat capteur"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f1aef280..7c5e8118 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Stato finecorsa"
-#
-"Sensor state"
-"Stato sensore"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 96d31a44..433661ca 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1026,10 +1026,6 @@
"Show end stops"
"Pokaz krancowki"
-#
-"Sensor state"
-"Stan czujnikow"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100."
From e0f0aecee81494bd89b2b76fb64dbff0cf4ce8d2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 11:44:29 +0100
Subject: [PATCH 013/254] Delete unused translation
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b6428643..50badebd 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -910,9 +910,6 @@
#MSG_WAITING_TEMP_PINDA c=20 r=3
"Waiting for PINDA probe cooling"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2a61e091..2b95539d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Cekani na zchladnuti PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Pouzijte vyjmout pro odstraneni filamentu 1 pokud presahuje z PTFE trubicky za tiskarnou. Pouzijte vysunout, pokud neni videt."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Varovani: doslo ke zmene typu tiskarny a motherboardu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 23f58484..f72d645b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Warten, bis PINDA- Sonde abgekuehlt ist"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Entladen Sie das Filament 1, wenn er aus dem hinteren MMU-Rohr herausragt. Verwenden Sie den Auswurf, wenn er im Rohr versteckt ist."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Warnung: Druckertyp und Platinentyp wurden beide geaendert."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 842e5adc..d0553b8f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Esperando a que se enfrie la sonda PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Usa unload para retirar el filamento 1 si sobresale por fuera de la parte trasera del tubo MMU. Usa Expulsar si esta escondido dentro del tubo"
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Aviso: tanto el tipo de impresora como el tipo de la placa han cambiado."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 805bcff2..843b5172 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Attente du refroidissement de la sonde PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Utilisez Remonter le fil. pour retirer le filament 1 s'il depasse du tube arriere du MMU. Utilisez ejecter s'il est cache dans le tube."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Attention: Types d'imprimante et de carte mere modifies"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7c5e8118..a89a98c7 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"In attesa del raffreddamento della sonda PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Usate lo scaricamento per rimuovere il filamento 1 se protrude dal retro del tubo posteriore del MMu. Utilizzate l'espulsione se e nascosto nel tubo."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Attenzione: tipo di stampante e di scheda madre cambiati."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 433661ca..d7989a82 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1214,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Czekam az spadnie temp. sondy PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Uzyj opcji Rozladuj jesli filament wystaje z tylnej rurki MMU. Uzyj opcji Wysun jesli wciaz jest w srodku."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Ostrzezenie: typ drukarki i plyta glowna ulegly zmianie."
From 6d3f76638e4c158511efc7d95a081990ddc39c98 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 25 Feb 2021 12:03:15 +0100
Subject: [PATCH 014/254] Remove duplicate `PINDA` in translations
---
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_pl.txt | 4 ----
7 files changed, 27 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 50badebd..1e4c4d98 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1054,9 +1054,6 @@
#
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
-#
-"PINDA"
-
# c=20
"Preheating to cut"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2b95539d..b3c16deb 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Predehrev ke strihu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f72d645b..e571cf8e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Heizen zum Schnitt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d0553b8f..bf53c5c9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Precalent. laminar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 843b5172..0cb929f7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Chauffe pour couper"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a89a98c7..ab87446a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Preriscalda. taglio"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d7989a82..36d16966 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1406,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
-#
-"PINDA"
-"\x00"
-
# c=20
"Preheating to cut"
"Nagrzew. obciecia"
From 9a719fd0b9131aed5d7445df77a94f782de3e742 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:17:30 +0100
Subject: [PATCH 015/254] Update "Calibrating home" c= value
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5ac1a0cc..cea3786d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8425,7 +8425,7 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s
if (screen == TestScreen::FsensorOk) lcd_puts_P(_T(MSG_SELFTEST_CHECK_FSENSOR));
if (screen == TestScreen::AllCorrect) lcd_puts_P(_i("All correct "));////MSG_SELFTEST_CHECK_ALLCORRECT c=20
if (screen == TestScreen::Failed) lcd_puts_P(_T(MSG_SELFTEST_FAILED));
- if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////c=20 r=1
+ if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////c=20
lcd_puts_at_P(0, 1, separator);
if ((screen >= TestScreen::ExtruderFan) && (screen <= TestScreen::FansOk))
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1e4c4d98..b75d537a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -106,7 +106,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-#
+# c=20
"Calibrating home"
#MSG_CALIBRATE_BED
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b3c16deb..79df260a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Detekovan vypadek proudu.Obnovit tisk?"
-#
+# c=20
"Calibrating home"
"Kalibruji vychozi poz."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e571cf8e..23cd4475 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Stromausfall! Druck wiederherstellen?"
-#
+# c=20
"Calibrating home"
"Kalibriere Start"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index bf53c5c9..2ce008cc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Se fue la luz. ?Reanudar la impresion?"
-#
+# c=20
"Calibrating home"
"Calibrando posicion inicial"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0cb929f7..204eec1b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Coupure detectee. Reprendre impression?"
-#
+# c=20
"Calibrating home"
"Calib. mise a 0"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ab87446a..3541a2df 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Blackout rilevato. Recuperare la stampa?"
-#
+# c=20
"Calibrating home"
"Calibrazione Home"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index dcfb8b4a..eda06691 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -146,7 +146,7 @@
"Blackout occurred. Recover print?"
"Stroomstoring. Print herstellen?"
-#
+# c=20
"Calibrating home"
"Kalibreren start"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 36d16966..f095d02f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -142,7 +142,7 @@
"Blackout occurred. Recover print?"
"Wykryto zanik napiecia. Kontynowac?"
-#
+# c=20
"Calibrating home"
"Zerowanie osi"
From dd4c02aa151a003c1fc4ef90c779c2fdf104283b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:23:46 +0100
Subject: [PATCH 016/254] Update "Heating disabled by safety timer." c= r=
values
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 9386e753..df0c6e29 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9659,7 +9659,7 @@ static void handleSafetyTimer()
{
setTargetBed(0);
setAllTargetHotends(0);
- lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED
+ lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
}
}
#endif //SAFETYTIMER
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b75d537a..278fa77e 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -310,7 +310,7 @@
#MSG_SELFTEST_HEATERTHERMISTOR
"Heater/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
#MSG_HEATING_COMPLETE c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 79df260a..726314ce 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Topeni/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Zahrivani preruseno bezpecnostnim casovacem."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 23cd4475..03da7160 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Heizung/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Heizung durch Sicherheitstimer deaktiviert."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2ce008cc..79d55a5e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Calentador/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Calentadores desactivados por el temporizador de seguridad."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 204eec1b..1e6a771b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Chauffage/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Chauffage desactivee par le compteur de securite."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3541a2df..5b408fbe 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Riscald./Termist."
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Riscaldamento fermato dal timer di sicurezza."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index eda06691..2572c562 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -418,7 +418,7 @@
"Heater/Thermistor"
"Verwarmer/Therm."
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Verwarming uitgeschakeld door veiligheidstimer."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f095d02f..206e5a7a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Grzalka/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Grzanie wylaczone przez wyl. czasowy"
From 37ec18596b3655caea64323a3b19d773a2ec5db9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:29:15 +0100
Subject: [PATCH 017/254] Update #MSG_USERWAIT c= value
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index df0c6e29..4a6bbb86 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3821,7 +3821,7 @@ void process_commands()
if (!hasP && !hasS && *src != '\0') {
lcd_setstatus(src);
} else {
- LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT
+ LCD_MESSAGERPGM(_i("Wait for user..."));////MSG_USERWAIT c=20
}
lcd_ignore_click(); //call lcd_ignore_click aslo for else ???
st_synchronize();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 278fa77e..de1c026d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -901,7 +901,7 @@
#
"unknown"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
#MSG_WAITING_TEMP c=20 r=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 726314ce..6e71f362 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1202,7 +1202,7 @@
"unknown"
"neznamy"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Ceka se na uzivatele..."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 03da7160..3c2b2526 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1202,7 +1202,7 @@
"unknown"
"unbekannt"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Warte auf Benutzer.."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 79d55a5e..2e7fe691 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1202,7 +1202,7 @@
"unknown"
"desconocido"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Esperando ordenes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1e6a771b..381b913b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1202,7 +1202,7 @@
"unknown"
"inconnu"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Attente utilisateur..."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5b408fbe..aaa924f5 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1202,7 +1202,7 @@
"unknown"
"sconosciuto"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Attendendo utente..."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2572c562..9dcbfb53 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1210,7 +1210,7 @@
"unknown"
"onbekend"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Wacht op gebruiker ..."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 206e5a7a..b942715d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1202,7 +1202,7 @@
"unknown"
"nieznane"
-#MSG_USERWAIT
+#MSG_USERWAIT c=20
"Wait for user..."
"Czekam na uzytkownika..."
From 83d73b9ac0206b55a1a57aa7a901ce2c3d54852d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:35:31 +0100
Subject: [PATCH 018/254] Remove unused messages from Dutch translation
---
lang/lang_en_nl.txt | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9dcbfb53..a16eec5f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1,7 +1,3 @@
-#
-"[%.7s]Live adj. Z\x0avalue set, continue\x0aor start from zero?\x0a%cContinue%cReset"
-"[%.7s]Z instell.\x0awaarde ingesteld,\x0averder of bij 0\x0abeginen?\x0a%cVerder%cReset"
-
#MSG_IR_03_OR_OLDER c=18
" 0.3 or older"
" 0.3 of ouder"
@@ -1030,10 +1026,6 @@
"Show end stops"
"Toon endstops"
-#
-"Sensor state"
-"Sensorstatus"
-
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Sommige bestanden worden niet gesorteerd omdat het maximum aantal bestanden per map 100 is."
@@ -1222,10 +1214,6 @@
"Waiting for PINDA probe cooling"
"Wachten op afkoelen van PINDA"
-#
-"Use unload to remove filament 1 if it protrudes outside of the rear MMU tube. Use eject if it is hidden in tube."
-"Gebruik ontladen om filament 1 te verwijderen als het uitsteekt buiten de achterste MMU-buis. Gebruik uitwerpen als deze in de tube is verborgen."
-
#MSG_CHANGED_BOTH c=20 r=4
"Warning: both printer type and motherboard type changed."
"Waarschuwing: zowel het printertype als het moederbordtype is gewijzigd."
@@ -1366,10 +1354,6 @@
"HW Setup"
"HW Configuratie"
-#
-"IR:"
-"\x00"
-
#MSG_MAGNETS_COMP
"Magnets comp."
"Magnet. comp."
@@ -1422,10 +1406,6 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd."
-#
-"PINDA:"
-"\x00"
-
# c=20
"Preheating to cut"
"Opwarm. te snijden"
From dbec06086c1ef4c166883d0c919ced0a4f6d2abe Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:40:04 +0100
Subject: [PATCH 019/254] Update
MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index cea3786d..34c3c95a 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3624,7 +3624,7 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
msg = _T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
else if (point_too_far_mask == 2 || point_too_far_mask == 7)
// Only the center point or all the three front points.
- msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=8
+ msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
else if ((point_too_far_mask & 1) == 0)
// The right and maybe the center point out of reach.
msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index de1c026d..a796bb9a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -967,7 +967,7 @@
#
"XYZ calibration failed. Bed calibration point was not found."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6e71f362..fa46bf2e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 3c2b2526..382fdf67 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2e7fe691..8387d043 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"Calibracion XYZ fallada. Puntos frontales no alcanzables."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 381b913b..f0f1ef70 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index aaa924f5..de8a450b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"Calibrazione XYZ fallita. Punti anteriori non raggiungibili."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a16eec5f..0a5ae7e1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b942715d..4498c6f7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
"Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki."
From 1ed7d8fc4b668e3d361273dec9e112f5751ea08a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 14:42:17 +0100
Subject: [PATCH 020/254] Update
MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 34c3c95a..41b8c3bd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3627,7 +3627,7 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
else if ((point_too_far_mask & 1) == 0)
// The right and maybe the center point out of reach.
- msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=8
+ msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
else
// The left and maybe the center point out of reach.
msg = _i("XYZ calibration failed. Left front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_LEFT_FAR c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a796bb9a..1bc36bf7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -970,7 +970,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
"XYZ calibration failed. Front calibration points not reachable."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fa46bf2e..8419d4ce 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 382fdf67..6dee9d6a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8387d043..5af7b9a3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Calibracion XYZ fallada. Puntos frontales no alcanzables."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"Calibracion XYZ fallad. Punto frontal derecho no alcanzable."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f0f1ef70..7a60042f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index de8a450b..6652a3ad 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Calibrazione XYZ fallita. Punti anteriori non raggiungibili."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0a5ae7e1..d0c84329 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4498c6f7..152df200 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki."
From fd7aa82dce02ef0fa2a79e43527ba69cfbb4b655 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:00:00 +0100
Subject: [PATCH 021/254] Update MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND
c=20 r=6
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 41b8c3bd..0570f4d7 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3618,7 +3618,7 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
{
const char *msg = NULL;
if (result == BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND) {
- lcd_show_fullscreen_message_and_wait_P(_i("XYZ calibration failed. Bed calibration point was not found."));////MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("XYZ calibration failed. Bed calibration point was not found."));////MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
} else if (result == BED_SKEW_OFFSET_DETECTION_FITTING_FAILED) {
if (point_too_far_mask == 0)
msg = _T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1bc36bf7..74ec18f7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -964,7 +964,7 @@
#MSG_LOAD_ALL c=17
"Load all"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8419d4ce..34d3c874 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Zavest vse"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6dee9d6a..33177417 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Alle laden"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5af7b9a3..ea5a5fb2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Intr. todos fil."
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7a60042f..de29ae60 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Charger un par un"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6652a3ad..dc51eeca 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Caricare tutti"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d0c84329..74ef472a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Laad alle"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 152df200..002f1bca 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1286,7 +1286,7 @@
"Load all"
"Zalad. wszystkie"
-#
+#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
"Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych."
From 49e8f84916476bf4739de4ec15cdf860757e34d1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:02:53 +0100
Subject: [PATCH 022/254] Update "G-code sliced for a newer firmware.
Continue?" c= r= values
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index a25efd35..1c5e84a1 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?"));
+lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////c=20 r=4
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
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 74ec18f7..59495489 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1048,7 +1048,7 @@
#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=7
"G-code sliced for a different printer type. Please re-slice the model again. Print cancelled."
-#
+# c=20 r=4
"G-code sliced for a newer firmware. Continue?"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 34d3c874..b1b0ce52 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
"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 33177417..41657389 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
"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 ea5a5fb2..c07ea71c 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
"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 de29ae60..69cdf1f9 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
"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 dc51eeca..f09ce626 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
"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 74ef472a..5950eae9 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
"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 002f1bca..ea27a00f 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
"G-code sliced for a newer firmware. Continue?"
"G-code pociety dla nowszego firmware. Kontynuowac?"
From 89900a51096f082ae342fb47dffb82122d6d04f1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:07:14 +0100
Subject: [PATCH 023/254] Update "G-code sliced for a newer firmware. Please
update the firmware. Print cancelled." c= r= values
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 1c5e84a1..ccbaa164 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -485,7 +485,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery
break;
case ClCheckVersion::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));
+ lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////c=20 r=7
lcd_print_stop();
break;
case ClCheckVersion::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 59495489..6b1eb482 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1051,7 +1051,7 @@
# c=20 r=4
"G-code sliced for a newer firmware. Continue?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b1b0ce52..180ccc1e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code je pripraven pro novejsi firmware. Pokracovat?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 41657389..5863729c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-Code ist fuer eine neuere Firmware geslict. Fortfahren?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c07ea71c..f1a7f752 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"Codigo G laminado para nuevo firmware. ?Continuar?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 69cdf1f9..f556fbbb 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"Le G-code a ete prepare pour une version plus recente du firmware. Continuer?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f09ce626..3b7c77e1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code processato per un firmware piu recente. Continuare?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5950eae9..f2767f4f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-Code is voor een nieuwere firmware geslict. Doorgaan?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ea27a00f..16a80b78 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code pociety dla nowszego firmware. Kontynuowac?"
-#
+# c=20 r=7
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
From 0c18ddcb102cb38aec6b654e1f410313a20478e5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:10:18 +0100
Subject: [PATCH 024/254] Update "Choose a filament for the First Layer
Calibration and select it in the on-screen menu." c= r= values
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0570f4d7..5a9f1df6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4757,7 +4757,7 @@ static void wizard_lay1cal_message(bool cold)
if (mmu_enabled)
{
lcd_show_fullscreen_message_and_wait_P(
- _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));
+ _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));////c=20 r=6
}
else if (cold)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6b1eb482..ac4200cf 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -154,7 +154,7 @@
#MSG_CRASHDETECT c=13
"Crash det."
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
#MSG_CRASH_DETECTED c=20 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 180ccc1e..cfe7d9a7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -206,7 +206,7 @@
"Crash det."
"\x00"
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5863729c..70b0305f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -206,7 +206,7 @@
"Crash det."
"Crash Erk."
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f1a7f752..529ca819 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -206,7 +206,7 @@
"Crash det."
"Det. choque"
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f556fbbb..a39a985f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -206,7 +206,7 @@
"Crash det."
"Detect.crash"
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3b7c77e1..5f96d7c4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -206,7 +206,7 @@
"Crash det."
"Rileva.crash"
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f2767f4f..30fa8088 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -206,7 +206,7 @@
"Crash det."
"Crashdet."
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in het schermmenu."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 16a80b78..6d29594c 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -206,7 +206,7 @@
"Crash det."
"Wykr.zderzen"
-#
+# c=20 r=6
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym."
From ba73d14511d1f2270edd4440c47f12abd31f0238 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:13:56 +0100
Subject: [PATCH 025/254] Update "Fix the issue and then press button on MMU
unit." c= r= values
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index be5e988d..9f51c635 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -723,7 +723,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
}
else { //screen 1
if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));
- else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));
+ else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));////c=20 r=4
screen=0;
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ac4200cf..1ba2e40e 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -289,7 +289,7 @@
#MSG_WIZARD_SELFTEST c=20 r=8
"First, I will run the selftest to check most common assembly problems."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
#MSG_FLOW
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cfe7d9a7..51d02778 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Opravte chybu a pote stisknete tlacitko na jednotce MMU."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 70b0305f..5e3fdb84 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 529ca819..230df35e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Primero, hare el Selftest para comprobar los problemas de montaje mas comunes."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Corrige el problema y pulsa el boton en la unidad MMU."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a39a985f..c598a08d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Corrigez le probleme et appuyez sur le bouton sur la MMU."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5f96d7c4..2b548ee3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Per primo avviero l'autotest per controllare gli errori di assemblaggio piu comuni."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Risolvere il problema e premere il bottone sull'unita MMU. "
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 30fa8088..631f8f8c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Ten eerste zullen we de zelftest uitvoeren om de meest voorkomende montageproblemen te controleren."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Los het probleem op en druk vervolgens op de knop op de MMU-eenheid."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6d29594c..cf8963d7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -386,7 +386,7 @@
"First, I will run the selftest to check most common assembly problems."
"Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu."
-#
+# c=20 r=4
"Fix the issue and then press button on MMU unit."
"Rozwiaz problem i wcisnij przycisk na MMU."
From ee8c9227cf3c1a6ac523edd95852c37dac27e643 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:16:23 +0100
Subject: [PATCH 026/254] Update #MSG_SELFTEST_FANS c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5a9f1df6..79358ade 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8112,7 +8112,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_print(_error_1);
break;
case TestError::SwappedFan:
- lcd_puts_at_P(0, 2, _i("Front/left fans"));////MSG_SELFTEST_FANS
+ lcd_puts_at_P(0, 2, _i("Front/left fans"));////MSG_SELFTEST_FANS c=20
lcd_puts_at_P(0, 3, _i("Swapped"));////MSG_SELFTEST_SWAPPED
lcd_set_cursor(18, 3);
lcd_print(_error_1);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1ba2e40e..e84451aa 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -304,7 +304,7 @@
#MSG_BED_CORRECTION_FRONT c=14 r=1
"Front side[um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
#MSG_SELFTEST_HEATERTHERMISTOR
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 51d02778..9cd93398 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Vpredu [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Predni/levy vent."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5e3fdb84..6ce79eef 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Vorne [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Vorderer/linke Luefter"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 230df35e..5e082c9b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Frontal [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Ventiladores frontal/izquierdo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c598a08d..b00b7c14 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Avant [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Ventilos avt/gauche"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2b548ee3..8dbc42ee 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Fronte [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Ventola frontale/sinistra"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 631f8f8c..6391483f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Voorkant [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Fans voor/links"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index cf8963d7..6c254b15 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -406,7 +406,7 @@
"Front side[um]"
"Przod [um]"
-#MSG_SELFTEST_FANS
+#MSG_SELFTEST_FANS c=20
"Front/left fans"
"Przedni/lewy wentylator"
From 18a58c504d1660e771f96e26b2c98482a0b6efc3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:21:42 +0100
Subject: [PATCH 027/254] Update #MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 4a6bbb86..004d6fbc 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9659,7 +9659,7 @@ static void handleSafetyTimer()
{
setTargetBed(0);
setAllTargetHotends(0);
- lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+ lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
}
}
#endif //SAFETYTIMER
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e84451aa..1e97730d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -310,7 +310,7 @@
#MSG_SELFTEST_HEATERTHERMISTOR
"Heater/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
#MSG_HEATING_COMPLETE c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9cd93398..fb81b18c 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Topeni/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Zahrivani preruseno bezpecnostnim casovacem."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6ce79eef..1621ab30 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Heizung/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Heizung durch Sicherheitstimer deaktiviert."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5e082c9b..a32bd82a 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Calentador/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Calentadores desactivados por el temporizador de seguridad."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b00b7c14..aa159dd6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Chauffage/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Chauffage desactivee par le compteur de securite."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8dbc42ee..0bce403e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Riscald./Termist."
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Riscaldamento fermato dal timer di sicurezza."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6391483f..8d15adfe 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Verwarmer/Therm."
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Verwarming uitgeschakeld door veiligheidstimer."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6c254b15..271c245b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Grzalka/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
"Heating disabled by safety timer."
"Grzanie wylaczone przez wyl. czasowy"
From b001eaec8d863b1605172ab7f851ba280b36f710 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:24:28 +0100
Subject: [PATCH 028/254] Update "If you have additional steel sheets,
calibrate their presets in Settings - HW Setup - Steel sheets." c= r= values
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 79358ade..09c6be73 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4944,7 +4944,7 @@ void lcd_wizard(WizState state)
}
else
{
- lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));
+ lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////c=20 r=8
state = S::Finish;
}
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1e97730d..a5b335d2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -388,7 +388,7 @@
#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
#MSG_LAST_PRINT c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fb81b18c..4ce05290 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ahoj, jsem vase tiskarna Original Prusa i3. Provedu vas kratkym procesem nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1621ab30..2d7b449e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen Einrichtungsprozess fuehren, bei dem die Z-Achse kalibriert wird. Danach sind Sie bereit fuer den Druck."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index a32bd82a..a2c4c520 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hola, soy tu impresora Original Prusa i3. Te guiare a traves de un breve proceso de configuracion, en el que se calibrara el eje Z. Despues, estaras listo para imprimir."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index aa159dd6..2346e5ee 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous accompagner au cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. Apres cela, tout sera pret pour imprimer."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0bce403e..0f0bf4d6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ciao, sono la tua stampante Original Prusa i3. Ti guidero attraverso un rapido processo in cui verra calibrato l'asse Z. Poi, sarai pronto a stampare."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8d15adfe..f10b7210 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ik ben je originele Prusa i3-printer. Ik zal je door een snel instellingsproces leiden dat de Z-as zal kalibreren. Dan ben je klaar om te printen."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Als u extra staalplaten hebt, kalibreert u hun voorinstellingen in Instellingen - HW Setup - Staalplaten."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 271c245b..04bca9b5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie."
-#
+# c=20 r=8
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe."
From 6a267e5a9a7fb75d3e209ee930b4e8e892f971dc Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:30:13 +0100
Subject: [PATCH 029/254] Update "Press the knob to resume nozzle temperature."
c= r= values
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 9f51c635..35463ae3 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -722,7 +722,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
screen++;
}
else { //screen 1
- if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));
+ if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));////c=20 r=4
else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));////c=20 r=4
screen=0;
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a5b335d2..b279aa95 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -655,7 +655,7 @@
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
#MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4ce05290..46e3109c 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -874,7 +874,7 @@
"Print paused"
"Tisk pozastaven"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Pro pokracovani nahrivani trysky stisknete tlacitko."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2d7b449e..e50ec244 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -874,7 +874,7 @@
"Print paused"
"Druck pausiert"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index a2c4c520..f98b43ca 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -874,7 +874,7 @@
"Print paused"
"Impresion en pausa"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Presiona el dial para continuar con la temperatura de la boquilla."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 2346e5ee..36a130c1 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -874,7 +874,7 @@
"Print paused"
"Impression en pause"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Appuyez sur le bouton pour rechauffer la buse."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0f0bf4d6..6f6b95b4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -874,7 +874,7 @@
"Print paused"
"Stampa in pausa"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Premete la manopola per recuperare la temperatura dell'ugello."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f10b7210..d2325154 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -874,7 +874,7 @@
"Print paused"
"Print pauzeren"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Druk op de knop om de temperatuur van de tuit te hervatten."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 04bca9b5..701e2714 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -874,7 +874,7 @@
"Print paused"
"Druk wstrzymany"
-#
+# c=20 r=4
"Press the knob to resume nozzle temperature."
"Wcisnij pokretlo aby wznowic podgrzewanie dyszy."
From 286c1931a5b78b0822f150143b16a70600183e3a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:33:13 +0100
Subject: [PATCH 030/254] Update #MSG_WIZARD_LOAD_FILAMENT c=20 r=5
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 09c6be73..ae1ec96c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4733,7 +4733,7 @@ static void lcd_wizard_load()
}
else
{
- lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=5
}
lcd_update_enable(false);
lcd_clear();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b279aa95..5d9e1eab 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -664,7 +664,7 @@
#
"Print FAN"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 46e3109c..a1e5a665 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Tiskovy vent."
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e50ec244..d4f51933 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Druckvent."
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f98b43ca..7b67429d 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Vent. extr"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 36a130c1..f5a824ab 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Vent. impr"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6f6b95b4..1148128d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Ventola di stampa"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d2325154..9de5526f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -886,7 +886,7 @@
"Print FAN"
"\x00"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Steek a.u.b. filament in de extruder en druk op de knop om het te laden."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 701e2714..81244a5d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -886,7 +886,7 @@
"Print FAN"
"WentWydruk"
-#
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac."
From f319dede23c97a0409a85689fb5ec1ace2c8ac57 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:39:57 +0100
Subject: [PATCH 031/254] Update "Please insert filament into the first tube of
the MMU, then press the knob to load it." c= r= values
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index ae1ec96c..89e5d9e8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4728,7 +4728,7 @@ static void lcd_wizard_load()
{
if (mmu_enabled)
{
- lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////c=20 r=6
tmp_extruder = 0;
}
else
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 5d9e1eab..cdd07993 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -667,7 +667,7 @@
#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
"Please insert filament into the extruder, then press the knob to load it."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a1e5a665..05bee164 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni"
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d4f51933..0795e242 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7b67429d..5c89d89e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f5a824ab..85e91c72 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1148128d..090c1845 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9de5526f..2885945c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Steek a.u.b. filament in de extruder en druk op de knop om het te laden."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Steek a.u.b. filament in de eerste buis van de MMU en druk op de knop om het te laden."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 81244a5d..02cb80f6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -890,7 +890,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac."
-#
+# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac."
From 41db8eed3004a2551ef12b3fd3b8d083a11301df Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:42:17 +0100
Subject: [PATCH 032/254] Update "Select nozzle preheat temperature which
matches your material." c= r= values
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 89e5d9e8..75df4dce 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4913,7 +4913,7 @@ void lcd_wizard(WizState state)
break;
case S::Preheat:
menu_goto(lcd_preheat_menu,0,false,true);
- lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////c=20 r=5
end = true; // Leave wizard temporarily for lcd_preheat_menu
break;
case S::LoadFilHot:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index cdd07993..4f5e462f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -748,7 +748,7 @@
#MSG_FORCE_SELFTEST c=20 r=8
"Selftest will be run to calibrate accurate sensorless rehoming."
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
#MSG_SET_TEMPERATURE c=19 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 05bee164..2bef9b2f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Pro kalibraci presneho rehomovani bude nyni spusten selftest."
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 0795e242..d6f076e9 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren"
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5c89d89e..31e98527 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Se realizara el auto-test para calibrar con precision la vuelta a la posicion inicial sin sensores."
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 85e91c72..b815fe3c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Le Selftest sera lance pour calibrer la remise a zero precise sans capteur"
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 090c1845..faf5c68a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Verra effettuato un self test per calibrare l'homing senza sensori"
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2885945c..14957840 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zelftest zal worden uitgevoerd om nauwkeurige sensorloze auto positie te kalibreren."
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw materiaal."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 02cb80f6..9992f0e4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek"
-#
+# c=20 r=5
"Select nozzle preheat temperature which matches your material."
"Wybierz temperature grzania dyszy odpowiednia dla materialu."
From 5a36b49cee920560bec8faa7edd2faecc7857d5b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:45:32 +0100
Subject: [PATCH 033/254] Update "Select temperature which matches your
material." c= r= values
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 75df4dce..b540f89b 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4762,7 +4762,7 @@ static void wizard_lay1cal_message(bool cold)
else if (cold)
{
lcd_show_fullscreen_message_and_wait_P(
- _i("Select temperature which matches your material."));
+ _i("Select temperature which matches your material."));////c=20 r=4
}
lcd_show_fullscreen_message_and_wait_P(
_i("The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter).")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4f5e462f..12ffc829 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -838,7 +838,7 @@
#MSG_TEMP_CALIBRATION c=14
"Temp. cal."
-#
+# c=20 r=4
"Select temperature which matches your material."
#MSG_CALIBRATION_PINDA_MENU c=17 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2bef9b2f..3bc7e17f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Tepl. kal."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Zvolte teplotu, ktera odpovida vasemu materialu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d6f076e9..6cba80d4 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Temp Kalib."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Waehlen Sie die Temperatur, die zu Ihrem Material passt."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 31e98527..796e4bc2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Cal. temp."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Selecciona la temperatura adecuada a tu material."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b815fe3c..c513781b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Calib. Temp."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Selectionnez la temperature qui correspond a votre materiau."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index faf5c68a..3b95000f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Calib. temp."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Seleziona la temperatura appropriata per il tuo materiale."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 14957840..caf2d80c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Tempkalib."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Selecteer de temperatuur die overeenkomt met uw materiaal."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9992f0e4..ca60d6a8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1118,7 +1118,7 @@
"Temp. cal."
"Kalib. temp."
-#
+# c=20 r=4
"Select temperature which matches your material."
"Wybierz temperature, ktora odpowiada Twojemu filamentowi."
From 65f35e25b865ac46be05553bfaf2b63ca00fd514 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:48:52 +0100
Subject: [PATCH 034/254] Update MSG_WIZARD_V2_CAL_2 c=20 r=12
---
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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 12ffc829..2a0f8ec1 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -976,7 +976,7 @@
#
"Y distance from min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
# c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3bc7e17f..cad73dcd 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Y vzdalenost od min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6cba80d4..7dda2914 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Y Entfernung vom Min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 796e4bc2..7a6b7485 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Distancia en Y desde el min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"La impresora comenzara a imprimir una linea en zig-zag. Gira el dial hasta que la linea alcance la altura optima. Mira las fotos del manual (Capitulo de calibracion)."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c513781b..7b1e407e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Distance Y du min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3b95000f..a55a52f6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Distanza Y dal min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index caf2d80c..e5671e67 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Y afstand van min"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"De printer begint een zigzaglijn printen. Draai aan de knop totdat je de optimale hoogte hebt bereikt. Bekijk de afbeeldingen in de handleiding (Calibration chapter)."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ca60d6a8..3ea44cfd 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1302,7 +1302,7 @@
"Y distance from min"
"Dystans od 0 w osi Y"
-#
+#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)."
From c39b22724d36e89ba6dfa6548fad151fb5f5e2a8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:51:10 +0100
Subject: [PATCH 035/254] Update "G-code sliced for a different level. Please
re-slice the model again. Print cancelled." c= r= values
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index ccbaa164..35621380 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -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."));
+ 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_print_stop();
break;
case ClCheckGcode::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2a0f8ec1..410c4cf8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1039,7 +1039,7 @@
#
"G-code sliced for a different level. Continue?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cad73dcd..8fc55e9e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"\x00"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7dda2914..a5f5db0e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-Code ist fuer einen anderen Level geslict. Fortfahren?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7a6b7485..b8d858e1 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"Codigo G laminado para un nivel diferente. ?Continuar?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Codigo G laminado para un nivel 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 7b1e407e..3301fe99 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"Le G-code a ete prepare pour un niveau different. Continuer?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Le G-code a ete prepare pour un niveau different. 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 a55a52f6..4b5697d1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-code processato per un livello diverso. Continuare?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index e5671e67..82292933 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-Code is voor een ander niveau geslict. Doorgaan?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3ea44cfd..f735f8fd 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-code pociety dla innej wersji. Kontynuowac?"
-#
+# c=20 r=6
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany."
From 5cbb5b0e179a09e9e40151e830efd4fa7f729766 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 15:53:36 +0100
Subject: [PATCH 036/254] Update "Printer nozzle diameter differs from the
G-code. Please check the value in settings. Print cancelled." c= r= values
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 35621380..c676622c 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -399,7 +399,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery
break;
case ClCheckMode::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////c=20 r=8
lcd_print_stop();
break;
case ClCheckMode::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 410c4cf8..ed409aab 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1063,7 +1063,7 @@
#
"Printer nozzle diameter differs from the G-code. Continue?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8fc55e9e..ef5af1e2 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Prumer trysky tiskarny se lisi od G-code. Pokracovat?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a5f5db0e..24af0ae8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b8d858e1..4b5aea24 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro nozzle impresora difiere de cod.G. ?Continuar?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3301fe99..fa43fa1d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4b5697d1..0133bec1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro ugello diverso da G-Code. Continuare?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 82292933..e2f21db0 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"De diameter van de tuit van de printer verschilt van de G-code. Doorgaan?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"De diameter van de tuit van de printer verschilt van de G-code. Controleer de waarde in de instellingen. Afdrukken geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f735f8fd..de3ab03f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?"
-#
+# c=20 r=8
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany."
From 6691f67e7d7477b9714954e4439ae98766085822 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:00:58 +0100
Subject: [PATCH 037/254] Fix too long #MSG_RECOVER_PRINT translations
---
lang/lang_en_es.txt | 2 +-
lang/lang_en_fr.txt | 2 +-
lang/lang_en_it.txt | 2 +-
lang/lang_en_pl.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4b5aea24..9d2ee291 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -140,7 +140,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-"Se fue la luz. ?Reanudar la impresion?"
+"Se fue la luz. Re- anudar la impresion?"
# c=20
"Calibrating home"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index fa43fa1d..87e9e336 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -140,7 +140,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-"Coupure detectee. Reprendre impression?"
+"Coupure detectee. Reprendre impres.?"
# c=20
"Calibrating home"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0133bec1..272c9084 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -140,7 +140,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-"Blackout rilevato. Recuperare la stampa?"
+"Blackout rilevato. Recuperare stampa?"
# c=20
"Calibrating home"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index de3ab03f..36a08362 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -140,7 +140,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-"Wykryto zanik napiecia. Kontynowac?"
+"Wykryto zanik napiecia.Kontynowac?"
# c=20
"Calibrating home"
From 878200ecae5e1e7010b9723a70291072700eb72e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:06:54 +0100
Subject: [PATCH 038/254] Update "Fail stats MMU" c=18
---
Firmware/ultralcd.cpp | 2 +-
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.txt | 2 +-
lang/lang_en_es.txt | 4 ++--
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/ultralcd.cpp b/Firmware/ultralcd.cpp
index b540f89b..4253f8e9 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6668,7 +6668,7 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);
#endif
if (mmu_enabled) {
- MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);
+ MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////c=18
}
MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT
#ifdef LCD_TEST
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ed409aab..18827482 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -235,7 +235,7 @@
#MSG_EXTRUDER c=17
"Extruder"
-#
+# c=18
"Fail stats MMU"
#MSG_FSENSOR_AUTOLOAD c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ef5af1e2..9e1573ae 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -314,7 +314,7 @@
"Extruder"
"\x00"
-#
+# c=18
"Fail stats MMU"
"Selhani MMU"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 24af0ae8..84582232 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -314,7 +314,7 @@
"Extruder"
"\x00"
-#
+# c=18
"Fail stats MMU"
"MMU-Fehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9d2ee291..2bdca599 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -144,7 +144,7 @@
# c=20
"Calibrating home"
-"Calibrando posicion inicial"
+"Calibrar posicion inicial"
#MSG_CALIBRATE_BED
"Calibrate XYZ"
@@ -314,7 +314,7 @@
"Extruder"
"Extruir"
-#
+# c=18
"Fail stats MMU"
"Estadistica de fallos MMU"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 87e9e336..bd6c5bac 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -314,7 +314,7 @@
"Extruder"
"Extrudeur"
-#
+# c=18
"Fail stats MMU"
"Stat. d'echec MMU"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 272c9084..8f26f1a8 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -314,7 +314,7 @@
"Extruder"
"Estrusore"
-#
+# c=18
"Fail stats MMU"
"Stat.fall. MMU"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index e2f21db0..26872ac0 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -314,7 +314,7 @@
"Extruder"
"\x00"
-#
+# c=18
"Fail stats MMU"
"MMU-Fouten"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 36a08362..51f99464 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -314,7 +314,7 @@
"Extruder"
"Ekstruder"
-#
+# c=18
"Fail stats MMU"
"Bledy MMU"
From 5f9d6a040113e67c0762dc84044481ff8d63f6f4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:08:57 +0100
Subject: [PATCH 039/254] Update "Fail stats" c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4253f8e9..b139cf12 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6665,7 +6665,7 @@ static void lcd_main_menu()
}
#if defined(TMC2130) || defined(FILAMENT_SENSOR)
- MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);
+ MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);////c=18
#endif
if (mmu_enabled) {
MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 18827482..35440fc4 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -241,7 +241,7 @@
#MSG_FSENSOR_AUTOLOAD c=13
"F. autoload"
-#
+# c=18
"Fail stats"
#MSG_FAN_SPEED c=14
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9e1573ae..8a3f541e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -322,7 +322,7 @@
"F. autoload"
"F. autozav."
-#
+# c=18
"Fail stats"
"Selhani"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 84582232..89dba165 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -322,7 +322,7 @@
"F. autoload"
"F. autoladen"
-#
+# c=18
"Fail stats"
"Fehlerstatistik"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2bdca599..ac2ba68b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -322,7 +322,7 @@
"F. autoload"
"Autocarg.fil."
-#
+# c=18
"Fail stats"
"Estadistica de fallos"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bd6c5bac..ec197abb 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -322,7 +322,7 @@
"F. autoload"
"F. autocharg."
-#
+# c=18
"Fail stats"
"Stat. d'echec"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8f26f1a8..33bf7f22 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -322,7 +322,7 @@
"F. autoload"
"Autocar.fil."
-#
+# c=18
"Fail stats"
"Stat. fallimenti"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 26872ac0..46b68bed 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -322,7 +322,7 @@
"F. autoload"
"F. autoladen"
-#
+# c=18
"Fail stats"
"Foutstatistieken"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 51f99464..dd2a4368 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -322,7 +322,7 @@
"F. autoload"
"Autolad. fil."
-#
+# c=18
"Fail stats"
"Statystyki bledow"
From ce42f2c2a5714537ffac5275f13c487ea8a5212d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:11:42 +0100
Subject: [PATCH 040/254] Update MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 004d6fbc..4a6bbb86 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -9659,7 +9659,7 @@ static void handleSafetyTimer()
{
setTargetBed(0);
setAllTargetHotends(0);
- lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+ lcd_show_fullscreen_message_and_wait_P(_i("Heating disabled by safety timer."));////MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
}
}
#endif //SAFETYTIMER
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 35440fc4..e5820c8a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -310,7 +310,7 @@
#MSG_SELFTEST_HEATERTHERMISTOR
"Heater/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
#MSG_HEATING_COMPLETE c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8a3f541e..cb463894 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Topeni/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Zahrivani preruseno bezpecnostnim casovacem."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 89dba165..a61e3070 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Heizung/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Heizung durch Sicherheitstimer deaktiviert."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ac2ba68b..7454fdf0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Calentador/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Calentadores desactivados por el temporizador de seguridad."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ec197abb..8a24c93b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Chauffage/Thermistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Chauffage desactivee par le compteur de securite."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 33bf7f22..3c5920a3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Riscald./Termist."
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Riscaldamento fermato dal timer di sicurezza."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 46b68bed..da30a9cb 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Verwarmer/Therm."
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Verwarming uitgeschakeld door veiligheidstimer."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index dd2a4368..b02012fd 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -414,7 +414,7 @@
"Heater/Thermistor"
"Grzalka/Termistor"
-#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=3
+#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
"Heating disabled by safety timer."
"Grzanie wylaczone przez wyl. czasowy"
From 0928c3d1339e79137f931a85f8214f5892591bb7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:14:16 +0100
Subject: [PATCH 041/254] Update "Lin. correction" c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index b139cf12..05023a6d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5617,7 +5617,7 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings);
#if defined (TMC2130) && defined (LINEARITY_CORRECTION)
- MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);
+ MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);////c=18
#endif //LINEARITY_CORRECTION && TMC2130
if(has_temperature_compensation())
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e5820c8a..bf04a0c2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -403,7 +403,7 @@
#MSG_BED_CORRECTION_LEFT c=14 r=1
"Left side [um]"
-#
+# c=18
"Lin. correction"
#MSG_BABYSTEP_Z
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cb463894..dab14e09 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Vlevo [um]"
-#
+# c=18
"Lin. correction"
"Korekce lin."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a61e3070..38b619c8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Links [um]"
-#
+# c=18
"Lin. correction"
"Lineare Korrektur"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7454fdf0..b880eb44 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Izquierda [um]"
-#
+# c=18
"Lin. correction"
"Correccion de Linealidad"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 8a24c93b..d090de1c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Gauche [um]"
-#
+# c=18
"Lin. correction"
"Correction lin."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3c5920a3..c77b94e4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Sinistra [um]"
-#
+# c=18
"Lin. correction"
"Correzione lineare"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index da30a9cb..8eea2f30 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Linkerkant[um]"
-#
+# c=18
"Lin. correction"
"Lineaire correctie"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b02012fd..505e7330 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -538,7 +538,7 @@
"Left side [um]"
"Lewo [um]"
-#
+# c=18
"Lin. correction"
"Korekcja liniowa"
From 4dc99d970d4c15a54c75e642fcbe62af401b983c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:17:26 +0100
Subject: [PATCH 042/254] Update "MMU needs user attention." c= r= values
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 35463ae3..697fc8fe 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -718,7 +718,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
//first three lines are used for printing multiscreen message; last line contains measured and target nozzle temperature
if (screen == 0) { //screen 0
- lcd_display_message_fullscreen_P(_i("MMU needs user attention."));
+ lcd_display_message_fullscreen_P(_i("MMU needs user attention."));////c=20 r=3
screen++;
}
else { //screen 1
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bf04a0c2..1bcd8184 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -478,7 +478,7 @@
#MSG_SILENT
"Silent"
-#
+# c=20 r=3
"MMU needs user attention."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index dab14e09..8dc653f7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -638,7 +638,7 @@
"Silent"
"Tichy"
-#
+# c=20 r=3
"MMU needs user attention."
"MMU potrebuje zasah uzivatele."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 38b619c8..f436b76f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -638,7 +638,7 @@
"Silent"
"Leise"
-#
+# c=20 r=3
"MMU needs user attention."
"MMU erfordert Benutzereingriff."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b880eb44..6e7153e9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -638,7 +638,7 @@
"Silent"
"Silencio"
-#
+# c=20 r=3
"MMU needs user attention."
"MMU necesita atencion del usuario."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d090de1c..9cc44496 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -638,7 +638,7 @@
"Silent"
"Furtif"
-#
+# c=20 r=3
"MMU needs user attention."
"Le MMU necessite l'attention de l'utilisateur."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c77b94e4..b89f4558 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -638,7 +638,7 @@
"Silent"
"Silenzioso"
-#
+# c=20 r=3
"MMU needs user attention."
"Il MMU richiede attenzione dall'utente."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8eea2f30..cd6ffa0d 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -638,7 +638,7 @@
"Silent"
"Stil"
-#
+# c=20 r=3
"MMU needs user attention."
"MMU heeft gebruikersaandacht nodig."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 505e7330..f46a1ea8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -638,7 +638,7 @@
"Silent"
"Cichy"
-#
+# c=20 r=3
"MMU needs user attention."
"MMU wymaga uwagi uzytkownika."
From cbe2a4d301766102750e8a0b4790d36fb0bd2cbb Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:22:05 +0100
Subject: [PATCH 043/254] Update MSG_CHECK_IDLER c=20 r=5
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 4a6bbb86..af19d107 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3288,7 +3288,7 @@ static void gcode_M600(bool automatic, float x_position, float y_position, float
current_position[X_AXIS] -= 100;
plan_buffer_line_curposXYZE(FILAMENTCHANGE_XYFEED);
st_synchronize();
- lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=4
+ lcd_show_fullscreen_message_and_wait_P(_i("Please open idler and remove filament manually."));////MSG_CHECK_IDLER c=20 r=5
}
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1bcd8184..d6585944 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -580,7 +580,7 @@
#MSG_WIZARD_CALIBRATION_FAILED c=20 r=8
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
#MSG_PLACE_STEEL_SHEET c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8dc653f7..82b639de 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Prosim nahlednete do prirucky 3D tiskare a opravte problem. Pote obnovte Pruvodce restartovanim tiskarny."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Prosim otevrete idler a manualne odstrante filament."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f436b76f..ca797a6c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Bitte lesen Sie unser Handbuch und beheben Sie das Problem. Fahren Sie dann mit dem Assistenten fort, indem Sie den Drucker neu starten."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6e7153e9..e3b2f1c6 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Lee el manual y resuelve el problema. Despues, reinicia la impresora y continua con el Wizard"
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 9cc44496..f9d3fad7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Merci de consulter notre manuel et de corriger le probleme. Poursuivez alors l'assistant en redemarrant l'imprimante."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Ouvrez l'idler et retirez le filament manuellement."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b89f4558..a68d0963 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Per favore consulta il nostro manuale per risolvere il problema. Poi riprendi il Wizard dopo aver riavviato la stampante."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Aprire la guida filam. e rimuovere il filam. a mano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index cd6ffa0d..c5438773 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Controleer aub ons handboek en los het probleem op. Hervat vervolgens de wizard door de printer opnieuw te starten."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Open rondsel en verwijder filament handmatig."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f46a1ea8..5810dd95 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -774,7 +774,7 @@
"Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."
"Przeczytaj nasz Podrecznik druku 3D aby naprawic problem. Potem wznow Asystenta przez restart drukarki."
-#MSG_CHECK_IDLER c=20 r=4
+#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
"Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament."
From cdd1d302fd43c914709dcec47b86e19d27795555 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:24:04 +0100
Subject: [PATCH 044/254] Update MSG_PLEASE_LOAD_PLA c=20 r=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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d6585944..93f0a5c2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -670,7 +670,7 @@
# c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
#MSG_PRUSA3D
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 82b639de..8d418842 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni"
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Prosim nejdriv zavedte filament"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index ca797a6c..2b58157c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Bitte laden Sie zuerst das Filament."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index e3b2f1c6..9ad33ed3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Por favor, cargar primero el filamento. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f9d3fad7..3e01deb8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Veuillez d'abord charger un filament."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a68d0963..f13d83fb 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Per favore prima carica il filamento."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c5438773..7d63de10 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Steek a.u.b. filament in de eerste buis van de MMU en druk op de knop om het te laden."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Laad a.u.b. eerst filament."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 5810dd95..8fd7a136 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -894,7 +894,7 @@
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac."
-#
+#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
"Najpierw zaladuj filament."
From 1f6834204f9ecd6d9b35320b51a13e28c43542db Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:30:04 +0100
Subject: [PATCH 045/254] Update "Select filament:" c= value
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 05023a6d..78c09947 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4621,7 +4621,7 @@ void lcd_v2_calibration()
if (mmu_enabled)
{
const uint8_t filament = choose_menu_P(
- _i("Select filament:"), ////c=20 r=1
+ _i("Select filament:"), ////c=20
_T(MSG_FILAMENT),_i("Cancel")); ////c=19 r=1
if (filament < 5)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 93f0a5c2..1c676410 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -832,7 +832,7 @@
#MSG_SELFTEST_SWAPPED
"Swapped"
-#
+# c=20
"Select filament:"
#MSG_TEMP_CALIBRATION c=14
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8d418842..4210febc 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Prohozene"
-#
+# c=20
"Select filament:"
"Zvolte filament:"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2b58157c..130d0700 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Ausgetauscht"
-#
+# c=20
"Select filament:"
"Filament auswaehlen:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9ad33ed3..f57c95ad 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Intercambiado"
-#
+# c=20
"Select filament:"
"Selecciona filamento:"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3e01deb8..bb486f7d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Echange"
-#
+# c=20
"Select filament:"
"Selectionnez le filament:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f13d83fb..2f6f206b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Scambiato"
-#
+# c=20
"Select filament:"
"Seleziona il filamento:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 7d63de10..3545658c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Gewisseld"
-#
+# c=20
"Select filament:"
"Kies filament:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8fd7a136..10a39dd5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1110,7 +1110,7 @@
"Swapped"
"Zamieniono"
-#
+# c=20
"Select filament:"
"Wybierz filament:"
From f9a92e2277df49794f8b4a86bcb153a542a3e08d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:32:13 +0100
Subject: [PATCH 046/254] Update "Y distance from min" c=20
---
Firmware/ultralcd.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/ultralcd.cpp b/Firmware/ultralcd.cpp
index 78c09947..3bb02dd0 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2739,7 +2739,7 @@ void lcd_move_e()
//! This functionality is applied more often for MK2 printers.
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Y distance from min | c=19 r=1
+//! |Y distance from min | c=20
//! | -------------- | STR_SEPARATOR
//! |Left: 00.00mm | c=11 r=1
//! |Right: 00.00mm | c=11 r=1
@@ -2757,7 +2757,7 @@ static void lcd_menu_xyz_y_min()
"%S:\n"
"%S:"
),
- _i("Y distance from min"), ////c=19 r=1
+ _i("Y distance from min"), ////c=20
separator,
_i("Left"), ////c=11 r=1
_i("Right") ////c=11 r=1
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1c676410..5076bed7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -973,7 +973,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
"XYZ calibration failed. Right front calibration point not reachable."
-#
+# c=20
"Y distance from min"
#MSG_WIZARD_V2_CAL_2 c=20 r=12
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4210febc..584951b6 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu."
-#
+# c=20
"Y distance from min"
"Y vzdalenost od min"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 130d0700..92f1faad 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
-#
+# c=20
"Y distance from min"
"Y Entfernung vom Min"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f57c95ad..274aa444 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Calibracion XYZ fallad. Punto frontal derecho no alcanzable."
-#
+# c=20
"Y distance from min"
"Distancia en Y desde el min"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bb486f7d..b13e19e8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable."
-#
+# c=20
"Y distance from min"
"Distance Y du min"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2f6f206b..a07e1983 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile."
-#
+# c=20
"Y distance from min"
"Distanza Y dal min"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3545658c..36da3942 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar."
-#
+# c=20
"Y distance from min"
"Y afstand van min"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 10a39dd5..3db6b37e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1298,7 +1298,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki."
-#
+# c=20
"Y distance from min"
"Dystans od 0 w osi Y"
From 891861d4752d6080fe84f03068c54d912b06e867 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:35:53 +0100
Subject: [PATCH 047/254] Update "G-code sliced for a different level.
Continue?" c= r= values
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index c676622c..ebfe26e0 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -512,7 +512,7 @@ switch(oCheckGcode)
{
case ClCheckGcode::_Warn:
// lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?"));
-lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));
+lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////c=20 r=4
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
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 5076bed7..f41830cf 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1036,7 +1036,7 @@
#MSG_NOZZLE_DIAMETER
"Nozzle d."
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
# c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 584951b6..d77b46c8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Tryska"
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 92f1faad..4d2b095e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Duese D."
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"G-Code ist fuer einen anderen Level geslict. Fortfahren?"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 274aa444..f80538fb 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Diam. nozzl"
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"Codigo G laminado para un nivel diferente. ?Continuar?"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b13e19e8..913345ea 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Diam. buse"
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"Le G-code a ete prepare pour un niveau different. Continuer?"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a07e1983..56c0c709 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Diam.Ugello"
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"G-code processato per un livello diverso. Continuare?"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 36da3942..113a3c5b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Tuit d."
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"G-Code is voor een ander niveau geslict. Doorgaan?"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3db6b37e..c7165684 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1382,7 +1382,7 @@
"Nozzle d."
"Sr. dyszy"
-#
+# c=20 r=4
"G-code sliced for a different level. Continue?"
"G-code pociety dla innej wersji. Kontynuowac?"
From 8cbf0b3318b77218a55808d0d553f794987801af Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:38:53 +0100
Subject: [PATCH 048/254] Update "Crash detected. Resume print?" c=20 r=2
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index af19d107..d255badd 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -650,7 +650,7 @@ void crashdet_detected(uint8_t mask)
enquecommand_P(PSTR("CRASH_RECOVER"));
}else{
setTargetHotend(0, active_extruder);
- bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);
+ bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);////c=20 r=2
lcd_update_enable(true);
if (yesno)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f41830cf..ec6fb790 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -160,7 +160,7 @@
#MSG_CRASH_DETECTED c=20 r=1
"Crash detected."
-#
+# c=20 r=2
"Crash detected. Resume print?"
#MSG_CRASH c=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d77b46c8..8e2a6890 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Detekovan naraz."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Detekovan naraz. Obnovit tisk?"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4d2b095e..a7072d5a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Crash erkannt."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Crash erkannt. Druck fortfuehren?"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f80538fb..48ed57ee 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Choque detectado."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Choque detectado. Continuar impresion?"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 913345ea..ac40ade2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Crash detecte."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Crash detecte. Poursuivre l'impression?"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 56c0c709..08d069f5 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Rilevato impatto."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Scontro rilevato. Riprendere la stampa?"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 113a3c5b..6be1038c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Crash gedetecteerd."
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Crash gedetecteerd. Print voorzetten?"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c7165684..faf6c8fe 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -214,7 +214,7 @@
"Crash detected."
"Zderzenie wykryte"
-#
+# c=20 r=2
"Crash detected. Resume print?"
"Wykryto zderzenie. Wznowic druk?"
From 6a541968629ebda079b589e604a40ceb2cf20dff Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:42:21 +0100
Subject: [PATCH 049/254] Update "Now remove the test print from steel sheet."
c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 3bb02dd0..79a32cf4 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4873,7 +4873,7 @@ void lcd_wizard(WizState state)
break;
case S::Z:
lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));
- lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));////c=20 r=4
lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_STEEL_SHEET_CHECK), false, false);
if (!wizard_event) lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ec6fb790..cb6a1997 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -544,7 +544,7 @@
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
"Old settings found. Default PID, Esteps etc. will be set."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8e2a6890..7740989e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Nyni odstrante testovaci vytisk z tiskoveho platu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a7072d5a..64816e93 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Testdruck jetzt von Stahlblech entfernen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 48ed57ee..13616e66 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Ahora retira la prueba de la lamina de acero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ac40ade2..06e90862 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles"
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Retirez maintenant l'impression de test de la plaque en acier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 08d069f5..d9bbaf95 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Ora rimuovete la stampa di prova dalla piastra in acciaio."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6be1038c..7994e861 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden geladen."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Verwijder nu de testprint van staalplaat."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index faf6c8fe..45885d60 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -726,7 +726,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
-#
+# c=20 r=4
"Now remove the test print from steel sheet."
"Teraz zdejmij wydruk testowy ze stolu."
From bab4994b897db25171d4a05a7f8ac787ba0801cf Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 16:52:24 +0100
Subject: [PATCH 050/254] Update #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 684cfa08..bcde03b7 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -40,7 +40,7 @@ const char MSG_FILAMENT_LOADING_T1[] PROGMEM_I1 = ISTR("Insert filament into ext
const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into extruder 3. Click when done."); ////c=20 r=4
const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into extruder 4. Click when done."); ////c=20 r=4
const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////
-const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=60
+const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=20 r=2
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index cb6a1997..582273fb 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -724,7 +724,7 @@
#
"Right"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
#MSG_LANGUAGE_SELECT
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7740989e..f8c5f5d7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -966,7 +966,7 @@
"Right"
"Vpravo"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Hledam kalibracni bod podlozky"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 64816e93..35f351f4 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -966,7 +966,7 @@
"Right"
"Rechts"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Suche Bett Kalibrierpunkt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 13616e66..04dd9791 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -966,7 +966,7 @@
"Right"
"Derecha"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Buscando punto de calibracion base"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 06e90862..f3702656 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -966,7 +966,7 @@
"Right"
"Droite"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Recherche du point de calibration du plateau chauffant"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d9bbaf95..fd76f58f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -966,7 +966,7 @@
"Right"
"Destra"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Ricerca dei punti di calibrazione del piano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 7994e861..b06140f6 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -966,7 +966,7 @@
"Right"
"Rechts"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Zoeken bed kalibratiepunt"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 45885d60..ba3436c7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -966,7 +966,7 @@
"Right"
"Prawa"
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60
+#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
"Szukam punktu kalibracyjnego na stole"
From 787b6111e5f0d2d0bb919f634abe71bfeaeb66e0 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:32:49 +0100
Subject: [PATCH 051/254] Fix too long translations in MSG_USERWAIT c=20
---
lang/lang_en_cz.txt | 2 +-
lang/lang_en_es.txt | 2 +-
lang/lang_en_fr.txt | 2 +-
lang/lang_en_nl.txt | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f8c5f5d7..39b2277d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1204,7 +1204,7 @@
#MSG_USERWAIT c=20
"Wait for user..."
-"Ceka se na uzivatele..."
+"Ceka se na uzivatele"
#MSG_WAITING_TEMP c=20 r=3
"Waiting for nozzle and bed cooling"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 04dd9791..cfd02565 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1204,7 +1204,7 @@
#MSG_USERWAIT c=20
"Wait for user..."
-"Esperando ordenes"
+"Esperando ordenes..."
#MSG_WAITING_TEMP c=20 r=3
"Waiting for nozzle and bed cooling"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f3702656..36249a62 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1204,7 +1204,7 @@
#MSG_USERWAIT c=20
"Wait for user..."
-"Attente utilisateur..."
+"Attente utilisateur."
#MSG_WAITING_TEMP c=20 r=3
"Waiting for nozzle and bed cooling"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b06140f6..5b0e98f9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1204,7 +1204,7 @@
#MSG_USERWAIT c=20
"Wait for user..."
-"Wacht op gebruiker ..."
+"Wacht op gebruiker.."
#MSG_WAITING_TEMP c=20 r=3
"Waiting for nozzle and bed cooling"
From 1bba2255c1077ba5b63ac8ab44a7788bc05b5b3d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:34:15 +0100
Subject: [PATCH 052/254] Update MSG_WAITING_TEMP c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 79a32cf4..4eef83be 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3198,7 +3198,7 @@ void lcd_wait_for_cool_down() {
int fanSpeedBckp = fanSpeed;
fanSpeed = 255;
while ((degHotend(0)>MAX_HOTEND_TEMP_CALIBRATION) || (degBed() > MAX_BED_TEMP_CALIBRATION)) {
- lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=3
+ lcd_display_message_fullscreen_P(_i("Waiting for nozzle and bed cooling"));////MSG_WAITING_TEMP c=20 r=4
lcd_set_cursor(0, 4);
lcd_print(LCD_STR_THERMOMETER[0]);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 582273fb..d8260639 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -904,7 +904,7 @@
#MSG_USERWAIT c=20
"Wait for user..."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
#MSG_WAITING_TEMP_PINDA c=20 r=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 39b2277d..f202cc19 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Ceka se na uzivatele"
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Cekani na zchladnuti trysky a podlozky."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 35f351f4..ef3d5b87 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Warte auf Benutzer.."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Warten bis Heizung und Bett abgekuehlt sind"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index cfd02565..2167bff4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Esperando ordenes..."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Esperando enfriamiento de la base y extrusor."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 36249a62..ecce60ad 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Attente utilisateur."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Attente du refroidissement des buse et plateau chauffant"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index fd76f58f..ef42de8e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Attendendo utente..."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"In attesa del raffreddamento dell'ugello e del piano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5b0e98f9..0569329a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Wacht op gebruiker.."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Wachten op afkoelen van tuit en bed"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ba3436c7..d1f5b958 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1206,7 +1206,7 @@
"Wait for user..."
"Czekam na uzytkownika..."
-#MSG_WAITING_TEMP c=20 r=3
+#MSG_WAITING_TEMP c=20 r=4
"Waiting for nozzle and bed cooling"
"Oczekiwanie na wychlodzenie dyszy i stolu"
From ba9e26f444feaa29786bbbbc479185ba00374c7d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:37:24 +0100
Subject: [PATCH 053/254] Update #MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index bcde03b7..eec62cf7 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -135,7 +135,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=7
+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=8
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/lang/lang_en.txt b/lang/lang_en.txt
index d8260639..b714c7c0 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1045,7 +1045,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=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
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f202cc19..79863a18 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1394,7 +1394,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=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."
"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 ef3d5b87..9d3d08ce 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1394,7 +1394,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=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."
"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 2167bff4..eb5bce91 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1394,7 +1394,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=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."
"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 ecce60ad..c5cd8769 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1394,7 +1394,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=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."
"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 ef42de8e..6bc812a6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1394,7 +1394,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=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."
"G-code processato per una stampante diversa. Per favore esegui nuovamente lo slice del modello. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0569329a..f0475bb8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1394,7 +1394,7 @@
"G-code sliced for a different printer type. Continue?"
"G-Code is voor een ander printertype geslict. Doorgaan?"
-#MSG_GCODE_DIFF_PRINTER_CANCELLED c=20 r=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."
"G-Code is voor een ander printertype geslict. Slice het model opniew alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d1f5b958..f6321c01 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1394,7 +1394,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=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."
"G-code pociety dla drukarki innego typu. Potnij model ponownie. Druk anulowany."
From 17c015f5c038c9aea3b603e853d3b33fd1ee4374 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:44:07 +0100
Subject: [PATCH 054/254] Update "Printer nozzle diameter differs from the
G-code. Continue?" c=20 r=5
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index ebfe26e0..7afe15f0 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -393,7 +393,7 @@ switch(oCheckMode)
{
case ClCheckMode::_Warn:
// lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));
-lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));
+lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. 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
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b714c7c0..2371e5ab 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1060,7 +1060,7 @@
# c=20
"Preheating to eject"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
# c=20 r=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 79863a18..6e1f4dd5 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Predehrev k vysunuti"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Prumer trysky tiskarny se lisi od G-code. Pokracovat?"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 9d3d08ce..429dfff3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Heizen zum Auswurf"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index eb5bce91..9d5a0eed 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Precalent. expulsar"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro nozzle impresora difiere de cod.G. ?Continuar?"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c5cd8769..7e3f015b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Chauf. pour remonter"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6bc812a6..d291ded6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Preriscalda. espuls."
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro ugello diverso da G-Code. Continuare?"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f0475bb8..a0d3541b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Opwarm.te uitwerpen"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"De diameter van de tuit van de printer verschilt van de G-code. Doorgaan?"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f6321c01..a9df45ee 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1414,7 +1414,7 @@
"Preheating to eject"
"Nagrzew. wysuniecia"
-#
+# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?"
From 03a13ace5a848cd1655152fd86535bdced50c729 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:47:35 +0100
Subject: [PATCH 055/254] Update "Printer nozzle diameter differs from the
G-code. Please check the value in settings. Print cancelled." c=20 r=9 as
French translation is longer
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 7afe15f0..080d1778 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -399,7 +399,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery
break;
case ClCheckMode::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////c=20 r=9
lcd_print_stop();
break;
case ClCheckMode::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2371e5ab..3e4490fc 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1063,7 +1063,7 @@
# c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6e1f4dd5..d07f1b2f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Prumer trysky tiskarny se lisi od G-code. Pokracovat?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 429dfff3..1acda3b2 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9d5a0eed..8c225e3e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro nozzle impresora difiere de cod.G. ?Continuar?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7e3f015b..3f8e127a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d291ded6..ac673916 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro ugello diverso da G-Code. Continuare?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a0d3541b..3321380b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"De diameter van de tuit van de printer verschilt van de G-code. Doorgaan?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"De diameter van de tuit van de printer verschilt van de G-code. Controleer de waarde in de instellingen. Afdrukken geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index a9df45ee..80261eb5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1418,7 +1418,7 @@
"Printer nozzle diameter differs from the G-code. Continue?"
"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?"
-# c=20 r=8
+# c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany."
From cc29a9485eb9f2d8f0e1d53ed08f61a79047373e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:52:54 +0100
Subject: [PATCH 056/254] Update "If you have additional steel sheets,
calibrate their presets in Settings - HW Setup - Steel sheets." c=20 r=9 as
German translation is longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4eef83be..2e5f2088 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4944,7 +4944,7 @@ void lcd_wizard(WizState state)
}
else
{
- lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////c=20 r=9
state = S::Finish;
}
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3e4490fc..6c5d4c99 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -388,7 +388,7 @@
#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
#MSG_LAST_PRINT c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d07f1b2f..8706ab30 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ahoj, jsem vase tiskarna Original Prusa i3. Provedu vas kratkym procesem nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1acda3b2..b233ba73 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen Einrichtungsprozess fuehren, bei dem die Z-Achse kalibriert wird. Danach sind Sie bereit fuer den Druck."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8c225e3e..b6355dbc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hola, soy tu impresora Original Prusa i3. Te guiare a traves de un breve proceso de configuracion, en el que se calibrara el eje Z. Despues, estaras listo para imprimir."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3f8e127a..6d1ccecb 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous accompagner au cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. Apres cela, tout sera pret pour imprimer."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ac673916..c73893ae 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ciao, sono la tua stampante Original Prusa i3. Ti guidero attraverso un rapido processo in cui verra calibrato l'asse Z. Poi, sarai pronto a stampare."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3321380b..a35e5319 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ik ben je originele Prusa i3-printer. Ik zal je door een snel instellingsproces leiden dat de Z-as zal kalibreren. Dan ben je klaar om te printen."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Als u extra staalplaten hebt, kalibreert u hun voorinstellingen in Instellingen - HW Setup - Staalplaten."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 80261eb5..9e471c62 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -518,7 +518,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie."
-# c=20 r=8
+# c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe."
From d52a7326beb2ab5bc99f380626bd2460599d92c2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 17:55:03 +0100
Subject: [PATCH 057/254] Update "Please insert filament into the extruder,
then press the knob to load it." c=20 r=6 as German translation is longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2e5f2088..5bd56cf5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4733,7 +4733,7 @@ static void lcd_wizard_load()
}
else
{
- lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+ lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the extruder, then press the knob to load it."));////MSG_WIZARD_LOAD_FILAMENT c=20 r=6
}
lcd_update_enable(false);
lcd_clear();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6c5d4c99..2c3e029f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -664,7 +664,7 @@
#
"Print FAN"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
# c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8706ab30..7b6ab6d3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Tiskovy vent."
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b233ba73..9313fc32 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Druckvent."
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b6355dbc..ac1c2b74 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Vent. extr"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 6d1ccecb..d96a3d31 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Vent. impr"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c73893ae..d293dc2c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -886,7 +886,7 @@
"Print FAN"
"Ventola di stampa"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a35e5319..e9b33786 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -886,7 +886,7 @@
"Print FAN"
"\x00"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Steek a.u.b. filament in de extruder en druk op de knop om het te laden."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9e471c62..b3a99074 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -886,7 +886,7 @@
"Print FAN"
"WentWydruk"
-#MSG_WIZARD_LOAD_FILAMENT c=20 r=5
+#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac."
From 65e389b6fd1402ed7c4a06613158e6a62c43142e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:01:06 +0100
Subject: [PATCH 058/254] Fix too long German translations
---
lang/lang_en_de.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 9313fc32..d6d93859 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -400,7 +400,7 @@
#MSG_SELFTEST_COOLING_FAN c=20
"Front print fan?"
-"Vorderer Luefter?"
+"Teile Luefter?"
#MSG_BED_CORRECTION_FRONT c=14 r=1
"Front side[um]"
@@ -408,7 +408,7 @@
#MSG_SELFTEST_FANS c=20
"Front/left fans"
-"Vorderer/linke Luefter"
+"Teile/Extr. Luefter"
#MSG_SELFTEST_HEATERTHERMISTOR
"Heater/Thermistor"
@@ -528,7 +528,7 @@
#MSG_SELFTEST_EXTRUDER_FAN c=20
"Left hotend fan?"
-"Linker Luefter?"
+"Extruder Luefter?"
#
"Left"
From 813aabab5658a72a6a8a33685b53fd8adef8250b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:03:06 +0100
Subject: [PATCH 059/254] Update "Select nozzle preheat temperature which
matches your material." c=20 r=6 as Spanish translation is longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5bd56cf5..c16e044d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4913,7 +4913,7 @@ void lcd_wizard(WizState state)
break;
case S::Preheat:
menu_goto(lcd_preheat_menu,0,false,true);
- lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////c=20 r=5
+ lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////c=20 r=6
end = true; // Leave wizard temporarily for lcd_preheat_menu
break;
case S::LoadFilHot:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2c3e029f..982d7141 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -748,7 +748,7 @@
#MSG_FORCE_SELFTEST c=20 r=8
"Selftest will be run to calibrate accurate sensorless rehoming."
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
#MSG_SET_TEMPERATURE c=19 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7b6ab6d3..7a1356f2 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Pro kalibraci presneho rehomovani bude nyni spusten selftest."
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d6d93859..66aefd94 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren"
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ac1c2b74..381ee604 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Se realizara el auto-test para calibrar con precision la vuelta a la posicion inicial sin sensores."
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d96a3d31..1a0c9d83 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Le Selftest sera lance pour calibrer la remise a zero precise sans capteur"
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d293dc2c..8ff79c4d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Verra effettuato un self test per calibrare l'homing senza sensori"
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index e9b33786..0b90464f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zelftest zal worden uitgevoerd om nauwkeurige sensorloze auto positie te kalibreren."
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw materiaal."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b3a99074..18c33e25 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -998,7 +998,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek"
-# c=20 r=5
+# c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Wybierz temperature grzania dyszy odpowiednia dla materialu."
From c82c72a93711347f9fd166e13d1c0e69b0dfaedd Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:03:58 +0100
Subject: [PATCH 060/254] Fix too long Spanish translation
---
lang/lang_en_es.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 381ee604..6a428582 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1112,7 +1112,7 @@
# c=20
"Select filament:"
-"Selecciona filamento:"
+"Selecciona filamento"
#MSG_TEMP_CALIBRATION c=14
"Temp. cal."
From 41022d7d6000807fca3d3f0abd962fac45ea7ce4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:07:04 +0100
Subject: [PATCH 061/254] Update "Choose a filament for the First Layer
Calibration and select it in the on-screen menu." as French translation is
longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c16e044d..53449d9d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4757,7 +4757,7 @@ static void wizard_lay1cal_message(bool cold)
if (mmu_enabled)
{
lcd_show_fullscreen_message_and_wait_P(
- _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));////c=20 r=6
+ _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));////c=20 r=7
}
else if (cold)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 982d7141..6d3795b1 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -154,7 +154,7 @@
#MSG_CRASHDETECT c=13
"Crash det."
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
#MSG_CRASH_DETECTED c=20 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7a1356f2..e441f0a1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -206,7 +206,7 @@
"Crash det."
"\x00"
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 66aefd94..6f1611ed 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -206,7 +206,7 @@
"Crash det."
"Crash Erk."
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6a428582..83f9b3c7 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -206,7 +206,7 @@
"Crash det."
"Det. choque"
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1a0c9d83..8a0fe64b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -206,7 +206,7 @@
"Crash det."
"Detect.crash"
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8ff79c4d..66f63e38 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -206,7 +206,7 @@
"Crash det."
"Rileva.crash"
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0b90464f..7bb475df 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -206,7 +206,7 @@
"Crash det."
"Crashdet."
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in het schermmenu."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 18c33e25..21892e68 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -206,7 +206,7 @@
"Crash det."
"Wykr.zderzen"
-# c=20 r=6
+# c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym."
From 9ed4efe5dca451b21137741947a76a38ab614e6e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:10:13 +0100
Subject: [PATCH 062/254] Update "G-code sliced for a different level. Please
re-slice the model again. Print cancelled." as French translation is longer
---
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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6d3795b1..a01a3b99 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1039,7 +1039,7 @@
# c=20 r=4
"G-code sliced for a different level. Continue?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e441f0a1..c1183a4e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"\x00"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6f1611ed..dd71f59c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-Code ist fuer einen anderen Level geslict. Fortfahren?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 83f9b3c7..bd7c5353 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"Codigo G laminado para un nivel diferente. ?Continuar?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Codigo G laminado para un nivel 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 8a0fe64b..85ed7e4f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"Le G-code a ete prepare pour un niveau different. Continuer?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Le G-code a ete prepare pour un niveau different. 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 66f63e38..8019eabf 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-code processato per un livello diverso. Continuare?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 7bb475df..2ed02d03 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-Code is voor een ander niveau geslict. Doorgaan?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 21892e68..11768609 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1386,7 +1386,7 @@
"G-code sliced for a different level. Continue?"
"G-code pociety dla innej wersji. Kontynuowac?"
-# c=20 r=6
+# c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany."
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 063/254] 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?"
From 9e60953d44880345b4f6734b117fc1f10593c438 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:14:03 +0100
Subject: [PATCH 064/254] Update "G-code sliced for a newer firmware. Please
update the firmware. Print cancelled." as French translation is longer
---
Firmware/util.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 8bbb2232..0baab628 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -485,7 +485,7 @@ lcd_wait_for_click_delay(MSG_PRINT_CHECKING_FAILED_TIMEOUT);
lcd_update_enable(true); // display / status-line recovery
break;
case ClCheckVersion::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////c=20 r=7
+ lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////c=20 r=8
lcd_print_stop();
break;
case ClCheckVersion::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b264c745..6568e155 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1051,7 +1051,7 @@
# c=20 r=5
"G-code sliced for a newer firmware. Continue?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c1666c08..863adeff 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code je pripraven pro novejsi firmware. Pokracovat?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d268ae9c..bb9f17cb 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-Code ist fuer eine neuere Firmware geslict. Fortfahren?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9ba619fb..98bce0e2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"Codigo G laminado para nuevo firmware. ?Continuar?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d75dab0e..c544463b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"Le G-code a ete prepare pour une version plus recente du firmware. Continuer?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8494d217..6565fa9c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code processato per un firmware piu recente. Continuare?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3056e4c6..9187ad97 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-Code is voor een nieuwere firmware geslict. Doorgaan?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 29c54928..840889c8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1402,7 +1402,7 @@
"G-code sliced for a newer firmware. Continue?"
"G-code pociety dla nowszego firmware. Kontynuowac?"
-# c=20 r=7
+# c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
From 8378ea8f8397ab36431f915f019017b3ec0ac469 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:20:31 +0100
Subject: [PATCH 065/254] Update MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
---
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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6568e155..cd6eae9c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -526,7 +526,7 @@
#MSG_SELFTEST_NOTCONNECTED
"Not connected"
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
#MSG_SELFTEST_FAN_NO c=19
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 863adeff..bca4f6f6 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -702,7 +702,7 @@
"Not connected"
"Nezapojeno "
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Vysla nova verze firmware:"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index bb9f17cb..69663d07 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -702,7 +702,7 @@
"Not connected"
"Nicht angeschlossen"
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Neue Firmware- Version verfuegbar:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 98bce0e2..4a58dfa5 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -702,7 +702,7 @@
"Not connected"
"No hay conexion "
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Nuevo firmware disponible:"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c544463b..ec448c0f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -702,7 +702,7 @@
"Not connected"
"Non connecte"
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Nouvelle version de firmware disponible:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6565fa9c..d935441a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -702,7 +702,7 @@
"Not connected"
"Non connesso"
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Nuova versione firmware disponibile:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9187ad97..acf9beef 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -702,7 +702,7 @@
"Not connected"
"Niet verbonden"
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Nieuwe firmware versie beschikbaar:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 840889c8..f8c624a7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -702,7 +702,7 @@
"Not connected"
"Nie podlaczono "
-#
+#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
"Dostepna nowa wersja firmware:"
From 79a148bb14f8e67923bf2b56716bac54b6f4ef4d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:34:39 +0100
Subject: [PATCH 066/254] Update #MSG_DEFAULT_SETTINGS_LOADED c=20 r=6 as
Italian translation is longer
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index d255badd..0ed545ed 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1546,7 +1546,7 @@ void setup()
}
if (!previous_settings_retrieved) {
- lcd_show_fullscreen_message_and_wait_P(_i("Old settings found. Default PID, Esteps etc. will be set.")); //if EEPROM version or printer type was changed, inform user that default setting were loaded////MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+ lcd_show_fullscreen_message_and_wait_P(_i("Old settings found. Default PID, Esteps etc. will be set.")); //if EEPROM version or printer type was changed, inform user that default setting were loaded////MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
Config_StoreSettings();
}
if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) >= 1) {
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index cd6eae9c..109c54a8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -541,7 +541,7 @@
#MSG_NOZZLE
"Nozzle"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
# c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bca4f6f6..b29b9c98 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Tryska"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 69663d07..3c8893e5 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Duese"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4a58dfa5..246fd6bb 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Boquilla"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ec448c0f..62fb9754 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Buse"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d935441a..0e94a4fa 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Ugello"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index acf9beef..6d7a2d4f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Tuit"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden geladen."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f8c624a7..52704f19 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -722,7 +722,7 @@
"Nozzle"
"Dysza"
-#MSG_DEFAULT_SETTINGS_LOADED c=20 r=5
+#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
"Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
From 63002112685603defe3a6110372b9b8b5e0fb872 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:37:23 +0100
Subject: [PATCH 067/254] Update MSG_PLACE_STEEL_SHEET c=20 r=5 as Italian
translation is longer
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index eec62cf7..e21f55c9 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -72,7 +72,7 @@ const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
-const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
+const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=15
const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 109c54a8..da255469 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -583,7 +583,7 @@
#MSG_CHECK_IDLER c=20 r=5
"Please open idler and remove filament manually."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
#MSG_PRESS_TO_UNLOAD c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b29b9c98..46c20c24 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Prosim otevrete idler a manualne odstrante filament."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Umistete prosim tiskovy plat na podlozku"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 3c8893e5..31126100 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Bitte Spannrolle oeffnen und Fila- ment von Hand entfernen"
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Bitte legen Sie das Stahlblech auf das Heizbett."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 246fd6bb..07eecbff 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Por favor abate el rodillo de empuje (idler) y retira el filamento manualmente."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Por favor coloca la chapa de acero en la base calefactable."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 62fb9754..31145af0 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Ouvrez l'idler et retirez le filament manuellement."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Placez la plaque en acier sur le plateau chauffant."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0e94a4fa..a90de516 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Aprire la guida filam. e rimuovere il filam. a mano"
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Per favore posizionate la piastra d'acciaio sul piano riscaldato."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6d7a2d4f..2a9a5da1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Open rondsel en verwijder filament handmatig."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Leg staalplaat op bed."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 52704f19..4909190f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -778,7 +778,7 @@
"Please open idler and remove filament manually."
"Prosze odciagnac dzwignie dociskowa ekstrudera i recznie usunac filament."
-#MSG_PLACE_STEEL_SHEET c=20 r=4
+#MSG_PLACE_STEEL_SHEET c=20 r=5
"Please place steel sheet on heatbed."
"Prosze umiescic plyte stalowa na stole podgrzewanym."
From 147fddd060c4ef0424a623b3e5043fd403cce246 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:41:01 +0100
Subject: [PATCH 068/254] Update MSG_CALIBRATE_BED_RESET c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 53449d9d..a92b38ea 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5719,7 +5719,7 @@ static void lcd_calibration_menu()
MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=18
#endif
#ifndef MK1BP
- MENU_ITEM_GCODE_P(_i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET
+ MENU_ITEM_GCODE_P(_i("Reset XYZ calibr."), PSTR("M44"));////MSG_CALIBRATE_BED_RESET c=18
#endif //MK1BP
#ifndef SNMM
//MENU_ITEM_FUNCTION_P(MSG_RESET_CALIBRATE_E, lcd_extr_cal_reset);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index da255469..aa06fa4d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -694,7 +694,7 @@
# c=20
"Prusa i3 MK3S OK."
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
#MSG_RESET c=14
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 46c20c24..52bf5534 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reset XYZ kalibr."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 31126100..1a7bf420 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reset XYZ Kalibr."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 07eecbff..c2a00c63 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 31145af0..1a09b5a3 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reinit. calib. XYZ"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a90de516..c18d0afd 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reset calibrazione XYZ."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2a9a5da1..201b68d7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reset XYZ kalibr."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4909190f..56adb631 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -926,7 +926,7 @@
"Prusa i3 MK3S OK."
"\x00"
-#MSG_CALIBRATE_BED_RESET
+#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
"Reset kalibr. XYZ"
From 542ff585293cb94a3e9daf69be89b0efd3621fa5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:47:09 +0100
Subject: [PATCH 069/254] Update
MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6 as Polish
translation is longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index a92b38ea..db3a18d6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3624,7 +3624,7 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
msg = _T(MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED);
else if (point_too_far_mask == 2 || point_too_far_mask == 7)
// Only the center point or all the three front points.
- msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+ msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
else if ((point_too_far_mask & 1) == 0)
// The right and maybe the center point out of reach.
msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index aa06fa4d..6e060f0c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -967,7 +967,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND c=20 r=6
"XYZ calibration failed. Bed calibration point was not found."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 52bf5534..d2cbe78c 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1a7bf420..ca21b4d3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-Kalibrierung fehlgeschlagen. Bett-Kalibrierpunkt nicht gefunden."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c2a00c63..64b443e8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Calibracion XYZ fallada. Puntos de calibracion en la base no encontrados."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"Calibracion XYZ fallada. Puntos frontales no alcanzables."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1a09b5a3..5b3031bd 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Echec calibration XYZ. Le point de calibration du plateau n'a pas ete trouve."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c18d0afd..6e003e03 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Calibrazione XYZ fallita. Il punto di calibrazione sul piano non e' stato trovato."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"Calibrazione XYZ fallita. Punti anteriori non raggiungibili."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 201b68d7..f6524865 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"XYZ-kalibratie mislukt. Bed ijkpunt niet gevonden."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 56adb631..67e37036 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1290,7 +1290,7 @@
"XYZ calibration failed. Bed calibration point was not found."
"Kalibracja XYZ nieudana. Nie znaleziono punktow kalibracyjnych."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
"Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki."
From b806c017cbe67885fa37ff867a6b538cb80e7bbf Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:47:58 +0100
Subject: [PATCH 070/254] Update
MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6 as Polish
translation is longer
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index db3a18d6..3a80b381 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3627,7 +3627,7 @@ void lcd_bed_calibration_show_result(BedSkewOffsetDetectionResultType result, ui
msg = _i("XYZ calibration failed. Front calibration points not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
else if ((point_too_far_mask & 1) == 0)
// The right and maybe the center point out of reach.
- msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+ msg = _i("XYZ calibration failed. Right front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
else
// The left and maybe the center point out of reach.
msg = _i("XYZ calibration failed. Left front calibration point not reachable.");////MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_LEFT_FAR c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6e060f0c..084e8ce3 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -970,7 +970,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_BOTH_FAR c=20 r=6
"XYZ calibration failed. Front calibration points not reachable."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d2cbe78c..0d0d6f6a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Kalibrace XYZ selhala. Predni kalibracni body moc vpredu. Srovnejte tiskarnu."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index ca21b4d3..24ec41ee 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Vordere Kalibrierpunkte nicht erreichbar."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 64b443e8..addfdd6c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Calibracion XYZ fallada. Puntos frontales no alcanzables."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"Calibracion XYZ fallad. Punto frontal derecho no alcanzable."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 5b3031bd..93ebc548 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Echec calibration XYZ. Les points de calibration en avant ne sont pas atteignables."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6e003e03..1707e476 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Calibrazione XYZ fallita. Punti anteriori non raggiungibili."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f6524865..35c65265 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"XYZ-kalibratie mislukt. Voorste kalibratiepunten niet bereikbaar."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 67e37036..3779c9fe 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Front calibration points not reachable."
"Kalibr. XYZ nieudana. Przednie punkty kalibr. nieosiagalne. Nalezy poprawic montaz drukarki."
-#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=5
+#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki."
From baabc0bd1ea207372ab42416a37bf3f0fafd7cb7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:49:13 +0100
Subject: [PATCH 071/254] Fix typo "didnt" to "didn't"
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index e21f55c9..81564082 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -14,7 +14,7 @@ const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of t
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
-const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5
+const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 084e8ce3..e5ccad60 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -89,7 +89,7 @@
"Belt test "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
#MSG_BRIGHT c=6
"Bright"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0d0d6f6a..dc610846 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -119,7 +119,7 @@
"Test remenu "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 24ec41ee..1e3420b8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -119,7 +119,7 @@
"Riementest "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index addfdd6c..6d7bd148 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -119,7 +119,7 @@
"Test cinturon "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 93ebc548..bf824c8e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -119,7 +119,7 @@
"Test de courroie "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1707e476..f3d5ca4c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -119,7 +119,7 @@
"Test cinghie "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 35c65265..76f874e8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -119,7 +119,7 @@
"Riemtest "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Bed leveling mislukt. Sensor heeft niet geactiveerd. Puin op tuit? Wacht op reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3779c9fe..247abe92 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -119,7 +119,7 @@
"Test paskow"
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
-"Bed leveling failed. Sensor didnt trigger. Debris on nozzle? Waiting for reset."
+"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset."
#MSG_BRIGHT c=6
From 2a848923ea7cd443f813aceba29b14a90086f6b4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:50:29 +0100
Subject: [PATCH 072/254] Update MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6 as
Dutch translation is longer
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 81564082..36d30e21 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -14,7 +14,7 @@ const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of t
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
-const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=5
+const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e5ccad60..b76d9ae5 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -88,7 +88,7 @@
#MSG_BELTTEST c=17
"Belt test "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
#MSG_BRIGHT c=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index dc610846..87144ade 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -118,7 +118,7 @@
"Belt test "
"Test remenu "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Kalibrace Z selhala. Sensor nesepnul. Znecistena tryska? Cekam na reset."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1e3420b8..1f54970f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -118,7 +118,7 @@
"Belt test "
"Riementest "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Z-Kal. fehlgeschlg. Sensor nicht ausgeloest. Schmutzige Duese? Warte auf Reset."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6d7bd148..1ef64ab1 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -118,7 +118,7 @@
"Belt test "
"Test cinturon "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Nivelacion fallada. Sensor no funciona. Restos en boquilla? Esperando reset."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bf824c8e..2874e014 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -118,7 +118,7 @@
"Belt test "
"Test de courroie "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Capt. non declenche pendant que je nivele le plateau. Debris sur buse? En attente d'un reset."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f3d5ca4c..66f59058 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -118,7 +118,7 @@
"Belt test "
"Test cinghie "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Livellamento piano fallito. Sensore KO? Residui su ugello? In attesa di reset."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 76f874e8..324326ca 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -118,7 +118,7 @@
"Belt test "
"Riemtest "
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Bed leveling mislukt. Sensor heeft niet geactiveerd. Puin op tuit? Wacht op reset."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 247abe92..e73dd96e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -118,7 +118,7 @@
"Belt test "
"Test paskow"
-#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=5
+#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
"Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."
"Kalibracja nieudana. Sensor nie aktywowal sie. Zanieczysz. dysza? Czekam na reset."
From 746761b1930db144f3de8bb9ac7375690b164e9b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 19 Mar 2021 18:52:32 +0100
Subject: [PATCH 073/254] Update MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 Fix Dutch
translation to fit in 20 chars
---
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 | 4 ++--
lang/lang_en_pl.txt | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b76d9ae5..4d3258e6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -622,7 +622,7 @@
# c=14
"PINDA"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
#MSG_PRESS_TO_PREHEAT c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 87144ade..bb9b9b01 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Prosim aktualizujte."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1f54970f..7108b16b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Bitte aktualisieren."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1ef64ab1..6808a1ba 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Actualize por favor"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 2874e014..ca91f16c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Mettez a jour le FW."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 66f59058..b260d1a6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Prego aggiornare."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 324326ca..26439ebe 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -830,9 +830,9 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
-"Voer een upgrade uit."
+"Voer een upgrade uit"
#MSG_PRESS_TO_PREHEAT c=20 r=4
"Press the knob to preheat nozzle and continue."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e73dd96e..55bfba2b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -830,7 +830,7 @@
"PINDA"
"\x00"
-#
+#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
"Please upgrade."
"Prosze zaktualizowac."
From 0819a9ba355f3db4789f3fca21703ae846e30e54 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 05:49:43 +0100
Subject: [PATCH 074/254] Fix too long Dutch translation
---
lang/lang_en_nl.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 26439ebe..245b3ec1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1088,7 +1088,7 @@
#MSG_TEMP_CAL_WARNING c=20 r=4
"Stable ambient temperature 21-26C is needed a rigid stand is required."
-"Stabiele omgevingstemperatuur van 21-26C is nodig, een stevige stand is vereist."
+"En stabiele 21-26C omgevingstemperatuur is nodig,een stevige stand is vereist."
#MSG_STATISTICS
"Statistics "
From dd67c5110afbd5e1012df5c37a74f1fe8f8c95c2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 06:09:52 +0100
Subject: [PATCH 075/254] Fix some Dutch translations
---
lang/lang_en_nl.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 245b3ec1..b37833cf 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -912,7 +912,7 @@
# c=20 r=4
"Please check the IR sensor connection, unload filament if present."
-"AUB IR sensor verbindingen kontrolleren en filament verwijderd is."
+"AUB IR sensor ver- binding kontrolleren , verwijder filament indien aanwezig."
#MSG_RECOVERING_PRINT c=20
"Recovering print "
@@ -1176,7 +1176,7 @@
# c=20
"to unload filament"
-"om filament te laden"
+"om fil. uitwerpen"
#MSG_UNLOAD_FILAMENT c=17
"Unload filament"
@@ -1228,7 +1228,7 @@
#MSG_UNLOAD_SUCCESSFUL c=20 r=2
"Was filament unload successful?"
-"Is filament succesvol verwijderd?"
+"Is filament succes- vol verwijderd?"
#MSG_SELFTEST_WIRINGERROR
"Wiring error"
From 92acac453fe2cb3e24de6d111d16da6c1b067bae Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 06:16:11 +0100
Subject: [PATCH 076/254] Update MSG_MMU_POWER_FAILS c=15
---
Firmware/ultralcd.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/ultralcd.cpp b/Firmware/ultralcd.cpp
index 3a80b381..3fefd6b7 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1498,7 +1498,7 @@ static void lcd_menu_fails_stats_mmu_print()
//! |Total failures | MSG_TOTAL_FAILURES c=20
//! | MMU fails 000| MSG_MMU_FAILS c=15
//! | MMU load fails 000| MSG_MMU_LOAD_FAILS c=15
-//! | MMU power fails 000| c=15
+//! | MMU power fails 000| MSG_MMU_POWER_FAILS c=15
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -1511,7 +1511,7 @@ static void lcd_menu_fails_stats_mmu_total()
_T(MSG_TOTAL_FAILURES), ////c=20
_T(MSG_MMU_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_FAIL_TOT) ), ////c=14
_T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) ), ////c=14
- _i("MMU power fails"), clamp999( mmu_power_failures )); ////c=14 r=1
+ _i("MMU power fails"), clamp999( mmu_power_failures )); ////MSG_MMU_POWER_FAILS c=15
menu_back_if_clicked_fb();
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4d3258e6..0a8ee53c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -481,7 +481,7 @@
# c=20 r=3
"MMU needs user attention."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
#MSG_STEALTH
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bb9b9b01..3d467d86 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"MMU potrebuje zasah uzivatele."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"MMU vypadky proudu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7108b16b..c644740f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"MMU erfordert Benutzereingriff."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"MMU Netzfehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6808a1ba..c6b4c743 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"MMU necesita atencion del usuario."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"Fallo de energia en MMU"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ca91f16c..808e89f0 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"Le MMU necessite l'attention de l'utilisateur."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"Echecs alim. MMU"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b260d1a6..737b7099 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"Il MMU richiede attenzione dall'utente."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"Manc. corr. MMU"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b37833cf..ee35bbf5 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"MMU heeft gebruikersaandacht nodig."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"MMU stroomstor."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 55bfba2b..a036b5e7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -642,7 +642,7 @@
"MMU needs user attention."
"MMU wymaga uwagi uzytkownika."
-#
+#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
"Zaniki zasil. MMU"
From 1c965cd9889ff0a33f4cbb4416097970fe8deee7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 06:18:41 +0100
Subject: [PATCH 077/254] Update MSG_MEASURED_OFFSET c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 3fefd6b7..10f681a2 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2819,7 +2819,7 @@ static void lcd_menu_xyz_skew()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |[0;0] point offset | c=20 r=1
+//! |[0;0] point offset | MSG_MEASURED_OFFSET c=20
//! | -------------- | STR_SEPARATOR
//! |X: 000.00mm| c=10 r=1
//! |Y: 000.00mm| c=10 r=1
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0a8ee53c..53d57757 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -19,7 +19,7 @@
#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14
" of 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
#MSG_CRASH_DET_ONLY_IN_NORMAL c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3d467d86..e33757ee 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -26,7 +26,7 @@
" of 9"
" z 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] odsazeni bodu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c644740f..02fd3a4f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -26,7 +26,7 @@
" of 9"
" von 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] Punktversatz"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c6b4c743..391273fe 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -26,7 +26,7 @@
" of 9"
" de 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punto offset"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 808e89f0..80249cf6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -26,7 +26,7 @@
" of 9"
" de 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"Offset point [0;0]"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 737b7099..61f22c3e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -26,7 +26,7 @@
" of 9"
" su 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punto offset"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ee35bbf5..84e6baab 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -26,7 +26,7 @@
" of 9"
" van 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] punt offset"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index a036b5e7..328d606a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -26,7 +26,7 @@
" of 9"
" z 9"
-#MSG_MEASURED_OFFSET
+#MSG_MEASURED_OFFSET c=20
"[0;0] point offset"
"[0;0] przesun.punktu"
From 178fe36dc762cdb06ad4f62c3fed7823ad229554 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 06:30:26 +0100
Subject: [PATCH 078/254] Create MSG_CANCEL c=9 Delete ">Cancel" Samed 10 bytes
Updated MSG_MEASURED_OFFSET c=20
---
Firmware/messages.c | 1 +
Firmware/messages.h | 1 +
Firmware/ultralcd.cpp | 6 +++---
lang/lang_en.txt | 5 +----
lang/lang_en_cz.txt | 6 +-----
lang/lang_en_de.txt | 6 +-----
lang/lang_en_es.txt | 6 +-----
lang/lang_en_fr.txt | 6 +-----
lang/lang_en_it.txt | 6 +-----
lang/lang_en_nl.txt | 6 +-----
lang/lang_en_pl.txt | 6 +-----
11 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 36d30e21..72cb689f 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -17,6 +17,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
+const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20
diff --git a/Firmware/messages.h b/Firmware/messages.h
index f38a4b26..afe8342c 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -18,6 +18,7 @@ extern const char MSG_BED_HEATING[];
extern const char MSG_BED_LEVELING_FAILED_POINT_LOW[];
extern const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[];
extern const char MSG_BELT_STATUS[];
+extern const char MSG_CANCEL[];
extern const char MSG_CALIBRATE_Z_AUTO[];
extern const char MSG_CARD_MENU[];
extern const char MSG_CHECKING_X[];
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 10f681a2..193810fc 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2236,7 +2236,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
// handled earlier
break;
}
- lcd_puts_at_P(0, 3, _i(">Cancel")); ////MSG_ c=20 r=1
+ lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
}
if (lcd_clicked())
@@ -2828,7 +2828,7 @@ static void lcd_menu_xyz_skew()
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
static void lcd_menu_xyz_offset()
{
- lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET
+ lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=20
lcd_puts_at_P(0, 1, separator);
lcd_puts_at_P(0, 2, PSTR("X")); ////c=10 r=1
lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10 r=1
@@ -4622,7 +4622,7 @@ void lcd_v2_calibration()
{
const uint8_t filament = choose_menu_P(
_i("Select filament:"), ////c=20
- _T(MSG_FILAMENT),_i("Cancel")); ////c=19 r=1
+ _T(MSG_FILAMENT),_T(MSG_CANCEL));
if (filament < 5)
{
lay1cal_filament = filament;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 53d57757..ff5efa6b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -28,9 +28,6 @@
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
-#
-">Cancel"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
@@ -133,7 +130,7 @@
#MSG_MENU_CALIBRATION
"Calibration"
-#
+#MSG_CANCEL c=9
"Cancel"
#MSG_SD_REMOVED
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e33757ee..6d97a259 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"POZOR:\x0aCrash detekce\x0adeaktivovana ve\x0aStealth modu"
-#
-">Cancel"
-">Zrusit"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Doladeni Z:"
@@ -178,7 +174,7 @@
"Calibration"
"Kalibrace"
-#
+#MSG_CANCEL c=9
"Cancel"
"Zrusit"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 02fd3a4f..a53c3f88 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"WARNUNG:\x0aCrash Erkennung\x0adeaktiviert im\x0aStealth Modus"
-#
-">Cancel"
-">Abbruch"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Z Anpassen:"
@@ -178,7 +174,7 @@
"Calibration"
"Kalibrierung"
-#
+#MSG_CANCEL c=9
"Cancel"
"Abbruch"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 391273fe..4de6323f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATENCION:\x0aDec. choque\x0adesactivada en\x0aModo silencio"
-#
-">Cancel"
-">Cancelar"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Ajustar-Z:"
@@ -178,7 +174,7 @@
"Calibration"
"Calibracion"
-#
+#MSG_CANCEL c=9
"Cancel"
"Cancelar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 80249cf6..cf372152 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif"
-#
-">Cancel"
-">Annuler"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Ajuster Z:"
@@ -178,7 +174,7 @@
"Calibration"
"\x00"
-#
+#MSG_CANCEL c=9
"Cancel"
"Annuler"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 61f22c3e..43ec3380 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATTENZIONE:\x0aRilev. impatto\x0adisattivato in\x0aModalita silenziosa"
-#
-">Cancel"
-">Annulla"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Compensaz. Z:"
@@ -178,7 +174,7 @@
"Calibration"
"Calibrazione"
-#
+#MSG_CANCEL c=9
"Cancel"
"Annulla"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 84e6baab..5b77c147 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"WARNING:\x0aCrashdetectie\x0auitgeschakeld in\x0aStealth stand"
-#
-">Cancel"
-">Annuleren"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Z is ingesteld:"
@@ -178,7 +174,7 @@
"Calibration"
"Kalibratie"
-#
+#MSG_CANCEL c=9
"Cancel"
"Annuleren"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 328d606a..7fa2584c 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -38,10 +38,6 @@
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"UWAGA:\x0aWykrywanie zderzen\x0awylaczone w\x0atrybie Stealth"
-#
-">Cancel"
-">Anuluj"
-
#MSG_BABYSTEPPING_Z c=15
"Adjusting Z:"
"Ustawianie Z:"
@@ -178,7 +174,7 @@
"Calibration"
"Kalibracja"
-#
+#MSG_CANCEL c=9
"Cancel"
"Anuluj"
From fe1b4e50be076d5ac5765e6cc1eb035abb412f92 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 06:59:54 +0100
Subject: [PATCH 079/254] Update MSG_AMBIENT c=14
---
Firmware/ultralcd.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/ultralcd.cpp b/Firmware/ultralcd.cpp
index 193810fc..d804650f 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1708,7 +1708,7 @@ static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){
//! |01234567890123456789|
//! | Nozzle: 000D| c=14 r=1
//! | Bed: 000D| c=14 r=1
-//! | Ambient: 000D| c=14 r=1
+//! | Ambient: 000D| c=14
//! | PINDA: 000D| c=14 r=1
//! ----------------------
//! D - Degree sysmbol LCD_STR_DEGREE
@@ -1721,7 +1721,7 @@ static void lcd_menu_temperatures()
lcd_menu_temperatures_line( _T(MSG_NOZZLE), (int)current_temperature[0] ); ////c=14 r=1
lcd_menu_temperatures_line( _T(MSG_BED), (int)current_temperature_bed ); ////c=14 r=1
#ifdef AMBIENT_THERMISTOR
- lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////c=14 r=1
+ lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT c=14
#endif //AMBIENT_THERMISTOR
#ifdef PINDA_THERMISTOR
lcd_menu_temperatures_line( _i("PINDA"), (int)current_temperature_pinda ); ////c=14
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ff5efa6b..54fd642e 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -37,7 +37,7 @@
#MSG_WIZARD_DONE c=20 r=8
"All is done. Happy printing!"
-#
+#MSG_AMBIENT c=14
"Ambient"
#MSG_AUTO c=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6d97a259..dfb5fce8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Vse je hotovo."
-#
+#MSG_AMBIENT c=14
"Ambient"
"Okoli"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a53c3f88..e956fb7e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Alles abgeschlossen. Viel Spass beim Drucken!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Raumtemp."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4de6323f..6ddd0101 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Terminado! Feliz impresion!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Ambiente"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cf372152..4ee03342 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Tout est pret. Bonne impression!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Ambiant"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 43ec3380..1270acc5 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Tutto fatto. Buona stampa!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Ambiente"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5b77c147..db62f422 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Klaar. Happy printing!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Kamertemp."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7fa2584c..1aac10be 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -50,7 +50,7 @@
"All is done. Happy printing!"
"Gotowe. Udanego drukowania!"
-#
+#MSG_AMBIENT c=14
"Ambient"
"Otoczenie"
From 83cbfda113cf3c33b189e81b9af302d6d63e4088 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:02:43 +0100
Subject: [PATCH 080/254] Update MSG_AUTO_HOME c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 72cb689f..c627af3f 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -8,7 +8,7 @@
#include "Configuration_prusa.h"
//internationalized messages
-const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////
+const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////c=18
const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18
const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 54fd642e..bfbcfa38 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -52,7 +52,7 @@
#MSG_AUTO_DEPLETE c=17 r=1
"SpoolJoin"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
#MSG_AUTOLOAD_FILAMENT c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index dfb5fce8..91305b78 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e956fb7e..b40a1a5d 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Startposition"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6ddd0101..fcc4b433 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Llevar al origen"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4ee03342..d9ab3e79 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Mise a 0 des axes"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1270acc5..51048ddc 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
""
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Trova origine"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index db62f422..07f1f55f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Startpositie"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1aac10be..b92dcb51 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -70,7 +70,7 @@
"SpoolJoin"
"\x00"
-#MSG_AUTO_HOME
+#MSG_AUTO_HOME c=18
"Auto home"
"Auto zerowanie"
From bc9f6b6ae6958b51db291320b3f54815420b5729 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:03:47 +0100
Subject: [PATCH 081/254] Update MSG_SELFTEST_AXIS_LENGTH c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index d804650f..0df7205d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8106,7 +8106,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_print(_error_1);
break;
case TestError::Axis:
- lcd_puts_at_P(0, 2, _i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH
+ lcd_puts_at_P(0, 2, _i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH c=20
lcd_puts_at_P(0, 3, _i("Axis"));////MSG_SELFTEST_AXIS
lcd_set_cursor(18, 3);
lcd_print(_error_1);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bfbcfa38..109c515c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -64,7 +64,7 @@
#MSG_AUTOLOADING_ENABLED c=20 r=4
"Autoloading filament is active, just press the knob and insert filament..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
#MSG_SELFTEST_AXIS
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 91305b78..ff3adf72 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Delka osy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b40a1a5d..4b7ef048 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Automatisches Laden Filament ist aktiv, Knopf druecken und Filament einlegen..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Achsenlaenge"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index fcc4b433..addb12c9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"La carga automatica esta activada, pulse el dial e inserte el filamento..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Longitud del eje"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d9ab3e79..15c3742c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Chargement auto. du fil. active, appuyez sur le bouton et inserez le fil."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Longueur de l'axe"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 51048ddc..63cc439c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Caricamento automatico attivo, premi la manopola e inserisci il filamento."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Lunghezza dell'asse"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 07f1f55f..6245e074 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Automatisch laden van flament is actief, druk de knop en laad filament..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Aslengte"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b92dcb51..0981f3db 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -86,7 +86,7 @@
"Autoloading filament is active, just press the knob and insert filament..."
"Autoladowanie filamentu wlaczone, nacisnij pokretlo i wsun filament..."
-#MSG_SELFTEST_AXIS_LENGTH
+#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
"Dlugosc osi"
From b6684f6114507464527d7f008cae35e65e42bb56 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:05:03 +0100
Subject: [PATCH 082/254] Update MSG_SELFTEST_AXIS c=16
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0df7205d..bfe8b864 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8107,7 +8107,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
break;
case TestError::Axis:
lcd_puts_at_P(0, 2, _i("Axis length"));////MSG_SELFTEST_AXIS_LENGTH c=20
- lcd_puts_at_P(0, 3, _i("Axis"));////MSG_SELFTEST_AXIS
+ lcd_puts_at_P(0, 3, _i("Axis"));////MSG_SELFTEST_AXIS c=16
lcd_set_cursor(18, 3);
lcd_print(_error_1);
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 109c515c..d9b90eed 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -67,7 +67,7 @@
#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
#MSG_SELFTEST_BEDHEATER
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ff3adf72..3440a06f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -90,7 +90,7 @@
"Axis length"
"Delka osy"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Osa"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4b7ef048..4b2cb723 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -90,7 +90,7 @@
"Axis length"
"Achsenlaenge"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Achse"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index addb12c9..d93b0100 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -90,7 +90,7 @@
"Axis length"
"Longitud del eje"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Eje"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 15c3742c..3a151fb0 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -90,7 +90,7 @@
"Axis length"
"Longueur de l'axe"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Axe"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 63cc439c..4b1c19cf 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -90,7 +90,7 @@
"Axis length"
"Lunghezza dell'asse"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Assi"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6245e074..57238c4b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -90,7 +90,7 @@
"Axis length"
"Aslengte"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"As"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 0981f3db..b8ee2451 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -90,7 +90,7 @@
"Axis length"
"Dlugosc osi"
-#MSG_SELFTEST_AXIS
+#MSG_SELFTEST_AXIS c=16
"Axis"
"Os"
From b3b062e4ba4c3a466149e3571db91601226a2381 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:05:47 +0100
Subject: [PATCH 083/254] Update MSG_SELFTEST_SWAPPED c=16
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index bfe8b864..e8d01011 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8113,7 +8113,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
break;
case TestError::SwappedFan:
lcd_puts_at_P(0, 2, _i("Front/left fans"));////MSG_SELFTEST_FANS c=20
- lcd_puts_at_P(0, 3, _i("Swapped"));////MSG_SELFTEST_SWAPPED
+ lcd_puts_at_P(0, 3, _i("Swapped"));////MSG_SELFTEST_SWAPPED c=16
lcd_set_cursor(18, 3);
lcd_print(_error_1);
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d9b90eed..0e14bb3b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -826,7 +826,7 @@
#MSG_SUPPORT
"Support"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3440a06f..94e0f7f8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1102,7 +1102,7 @@
"Support"
"Podpora"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Prohozene"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4b2cb723..f9b46222 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1102,7 +1102,7 @@
"Support"
"\x00"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Ausgetauscht"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d93b0100..7757d318 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1102,7 +1102,7 @@
"Support"
"Soporte"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Intercambiado"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3a151fb0..b95495e4 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1102,7 +1102,7 @@
"Support"
"\x00"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Echange"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4b1c19cf..6d250ad0 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1102,7 +1102,7 @@
"Support"
"Supporto"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Scambiato"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 57238c4b..958c8fb4 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1102,7 +1102,7 @@
"Support"
"\x00"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Gewisseld"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b8ee2451..dda3e576 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1102,7 +1102,7 @@
"Support"
"Wsparcie"
-#MSG_SELFTEST_SWAPPED
+#MSG_SELFTEST_SWAPPED c=16
"Swapped"
"Zamieniono"
From b86ad11b68d55a70fb5b7a2bda0746ff6c2935a7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:06:37 +0100
Subject: [PATCH 084/254] Update MSG_SELFTEST_BEDHEATER c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e8d01011..e3703e37 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8064,7 +8064,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_puts_at_P(0, 3, _i("Not connected"));////MSG_SELFTEST_NOTCONNECTED
break;
case TestError::Bed:
- lcd_puts_at_P(0, 2, _i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER
+ lcd_puts_at_P(0, 2, _i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER c=20
lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR));
break;
case TestError::Endstops:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0e14bb3b..b8890b09 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -70,7 +70,7 @@
#MSG_SELFTEST_AXIS c=16
"Axis"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
#MSG_BED_DONE
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 94e0f7f8..c6856c3f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -94,7 +94,7 @@
"Axis"
"Osa"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Podlozka / Topeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f9b46222..0aef979e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -94,7 +94,7 @@
"Axis"
"Achse"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Bett / Heizung"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7757d318..ada65b56 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -94,7 +94,7 @@
"Axis"
"Eje"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Base / Calentador"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b95495e4..702c0a0a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -94,7 +94,7 @@
"Axis"
"Axe"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Lit / Chauffage"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6d250ad0..2eefaa15 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -94,7 +94,7 @@
"Axis"
"Assi"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Piano/Riscald."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 958c8fb4..df48511e 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -94,7 +94,7 @@
"Axis"
"As"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Bed / Verwarming"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index dda3e576..f618a5f1 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -94,7 +94,7 @@
"Axis"
"Os"
-#MSG_SELFTEST_BEDHEATER
+#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
"Stol / Grzanie"
From 625604d70410a373488e7de9c6bd557fd36f8c44 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:07:14 +0100
Subject: [PATCH 085/254] Update MSG_SELFTEST_HEATERTHERMISTOR c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e3703e37..b56891f6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8060,7 +8060,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
switch (testError)
{
case TestError::Heater:
- lcd_puts_at_P(0, 2, _i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR
+ lcd_puts_at_P(0, 2, _i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR c=20
lcd_puts_at_P(0, 3, _i("Not connected"));////MSG_SELFTEST_NOTCONNECTED
break;
case TestError::Bed:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b8890b09..dd638e6f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -304,7 +304,7 @@
#MSG_SELFTEST_FANS c=20
"Front/left fans"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
#MSG_BED_HEATING_SAFETY_DISABLED c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c6856c3f..7344bf35 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Predni/levy vent."
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Topeni/Termistor"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 0aef979e..52255e97 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Teile/Extr. Luefter"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Heizung/Thermistor"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ada65b56..27aac241 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Ventiladores frontal/izquierdo"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Calentador/Termistor"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 702c0a0a..7603a054 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Ventilos avt/gauche"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Chauffage/Thermistor"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2eefaa15..a02f799a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Ventola frontale/sinistra"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Riscald./Termist."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index df48511e..0cf0d85e 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Fans voor/links"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Verwarmer/Therm."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f618a5f1..ac2a0615 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -406,7 +406,7 @@
"Front/left fans"
"Przedni/lewy wentylator"
-#MSG_SELFTEST_HEATERTHERMISTOR
+#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
"Grzalka/Termistor"
From 5d167ce81363858c4a226e3fe256880a66e37f67 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:08:20 +0100
Subject: [PATCH 086/254] Update MSG_SELFTEST_NOTCONNECTED c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index b56891f6..109664ef 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8061,7 +8061,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
{
case TestError::Heater:
lcd_puts_at_P(0, 2, _i("Heater/Thermistor"));////MSG_SELFTEST_HEATERTHERMISTOR c=20
- lcd_puts_at_P(0, 3, _i("Not connected"));////MSG_SELFTEST_NOTCONNECTED
+ lcd_puts_at_P(0, 3, _i("Not connected"));////MSG_SELFTEST_NOTCONNECTED c=20
break;
case TestError::Bed:
lcd_puts_at_P(0, 2, _i("Bed / Heater"));////MSG_SELFTEST_BEDHEATER c=20
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index dd638e6f..7f24846b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -520,7 +520,7 @@
#MSG_NO
"No"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7344bf35..3b118333 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -694,7 +694,7 @@
"No"
"Ne"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Nezapojeno "
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 52255e97..c7056849 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -694,7 +694,7 @@
"No"
"Nein"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Nicht angeschlossen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 27aac241..35d2275b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -694,7 +694,7 @@
"No"
"\x00"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"No hay conexion "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7603a054..21114ef6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -694,7 +694,7 @@
"No"
"Non"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Non connecte"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a02f799a..14bdc4f7 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -694,7 +694,7 @@
"No"
"\x00"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Non connesso"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0cf0d85e..b0cbc8e3 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -694,7 +694,7 @@
"No"
"Nee"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Niet verbonden"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ac2a0615..8cc2cdd9 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -694,7 +694,7 @@
"No"
"Nie"
-#MSG_SELFTEST_NOTCONNECTED
+#MSG_SELFTEST_NOTCONNECTED c=20
"Not connected"
"Nie podlaczono "
From b3d3feef4deab96a5ff453a5f0b0b72aae5735eb Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:08:48 +0100
Subject: [PATCH 087/254] Update MSG_SELFTEST_ERROR c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 109664ef..ec787726 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8054,7 +8054,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_clear();
- lcd_puts_at_P(0, 0, _i("Selftest error !"));////MSG_SELFTEST_ERROR
+ lcd_puts_at_P(0, 0, _i("Selftest error !"));////MSG_SELFTEST_ERROR c=20
lcd_puts_at_P(0, 1, _i("Please check :"));////MSG_SELFTEST_PLEASECHECK
switch (testError)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 7f24846b..32214dd8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -736,7 +736,7 @@
#MSG_SELFTEST
"Selftest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
#MSG_SELFTEST_FAILED c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3b118333..9426e09e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -982,7 +982,7 @@
"Selftest "
"Selftest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Chyba Selftestu!"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c7056849..37e5ab58 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -982,7 +982,7 @@
"Selftest "
"Selbsttest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Selbsttest Fehler!"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 35d2275b..2d76c181 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -982,7 +982,7 @@
"Selftest "
"\x00"
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Error Selftest !"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 21114ef6..610ac7e3 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -982,7 +982,7 @@
"Selftest "
"Auto-test"
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Erreur auto-test!"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 14bdc4f7..2ad0f72a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -982,7 +982,7 @@
"Selftest "
"Autotest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Errore Autotest !"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b0cbc8e3..04f06764 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -982,7 +982,7 @@
"Selftest "
"Zelftest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Zelftest fout !"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8cc2cdd9..b915e325 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -982,7 +982,7 @@
"Selftest "
"Selftest "
-#MSG_SELFTEST_ERROR
+#MSG_SELFTEST_ERROR c=20
"Selftest error !"
"Blad selftest!"
From 4a6c53daf856249f0e6bd7ccd2e7cc6d8a84b76d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:09:33 +0100
Subject: [PATCH 088/254] Update MSG_SELFTEST_PLEASECHECK c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index ec787726..cd667e54 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8055,7 +8055,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_clear();
lcd_puts_at_P(0, 0, _i("Selftest error !"));////MSG_SELFTEST_ERROR c=20
- lcd_puts_at_P(0, 1, _i("Please check :"));////MSG_SELFTEST_PLEASECHECK
+ lcd_puts_at_P(0, 1, _i("Please check :"));////MSG_SELFTEST_PLEASECHECK c=20
switch (testError)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 32214dd8..a164f913 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -571,7 +571,7 @@
#MSG_CONFIRM_NOZZLE_CLEAN c=20 r=8
"Please clean the nozzle for calibration. Click when done."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
#MSG_WIZARD_CALIBRATION_FAILED c=20 r=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9426e09e..9a8c3e6d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Pro uspesnou kalibraci ocistete prosim tiskovou trysku. Potvrdte tlacitkem."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Zkontrolujte :"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 37e5ab58..7e925b1f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Bitte entfernen Sie ueberstehendes Filament von der Duese. Klicken wenn sauber."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Bitte pruefe:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2d76c181..30eb2490 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Limpia boquilla para calibracion. Click cuando acabes."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Controla :"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 610ac7e3..dbd0703b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Nettoyez la buse pour la calibration. Cliquez une fois fait."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Verifiez:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2ad0f72a..34d93468 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Pulire l'ugello per la calibrazione, poi fare click."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Verifica:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 04f06764..d1d6c3ff 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Reinig de tuit voor de kalibratie. Druk op de knop wanneer gereed."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Controleer aub:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b915e325..896a3592 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -762,7 +762,7 @@
"Please clean the nozzle for calibration. Click when done."
"Dla prawidlowej kalibracji nalezy oczyscic dysze. Potwierdz guzikiem."
-#MSG_SELFTEST_PLEASECHECK
+#MSG_SELFTEST_PLEASECHECK c=20
"Please check :"
"Sprawdz :"
From 17df4e1c8d4903dc03e7ba9b922015054dc22be3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:10:09 +0100
Subject: [PATCH 089/254] Update MSG_SELFTEST_ENDSTOPS c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index cd667e54..30e95fb7 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8068,7 +8068,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR));
break;
case TestError::Endstops:
- lcd_puts_at_P(0, 2, _i("Endstops"));////MSG_SELFTEST_ENDSTOPS
+ lcd_puts_at_P(0, 2, _i("Endstops"));////MSG_SELFTEST_ENDSTOPS c=20
lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR));
lcd_set_cursor(17, 3);
lcd_print(_error_1);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a164f913..dc932a79 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -199,7 +199,7 @@
#MSG_SELFTEST_ENDSTOP
"Endstop"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
#MSG_STACK_ERROR c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9a8c3e6d..064ff745 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -266,7 +266,7 @@
"Endstop"
"Koncovy spinac"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Konc. spinace"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7e925b1f..5a4dfdd3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -266,7 +266,7 @@
"Endstop"
"Endanschlag"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Endschalter"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 30eb2490..e283f734 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -266,7 +266,7 @@
"Endstop"
"\x00"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index dbd0703b..812c432e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -266,7 +266,7 @@
"Endstop"
"Butee"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Butees"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 34d93468..cbdfb2c9 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -266,7 +266,7 @@
"Endstop"
"Finecorsa"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Finecorsa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d1d6c3ff..36ef9255 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -266,7 +266,7 @@
"Endstop"
"Eindstop"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Eindstops"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 896a3592..68ada5b5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -266,7 +266,7 @@
"Endstop"
"Krancowka"
-#MSG_SELFTEST_ENDSTOPS
+#MSG_SELFTEST_ENDSTOPS c=20
"Endstops"
"Krancowki"
From 3fcc81ebdb038299a4fe1ae37e22609cb3cf22a6 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:11:07 +0100
Subject: [PATCH 090/254] Update MSG_SELFTEST_ENDSTOP c=16
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 30e95fb7..42cbd050 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8077,7 +8077,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_MOTOR));
lcd_set_cursor(18, 2);
lcd_print(_error_1);
- lcd_puts_at_P(0, 3, _i("Endstop"));////MSG_SELFTEST_ENDSTOP
+ lcd_puts_at_P(0, 3, _i("Endstop"));////MSG_SELFTEST_ENDSTOP c=16
lcd_set_cursor(18, 3);
lcd_print(_error_2);
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index dc932a79..a6bcc356 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -196,7 +196,7 @@
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
"Endstop not hit"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
#MSG_SELFTEST_ENDSTOPS c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 064ff745..fcc30a78 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Kon. spinac nesepnut"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Koncovy spinac"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5a4dfdd3..f3712c3a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Ende nicht getroffen"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Endanschlag"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index e283f734..d33734f1 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Endstop no alcanzado"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 812c432e..9ac480d5 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Butee non atteinte"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Butee"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index cbdfb2c9..3f803aac 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Finec. fuori portata"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Finecorsa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 36ef9255..646dcbac 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Endstop niet geraakt"
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Eindstop"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 68ada5b5..e53488f3 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -262,7 +262,7 @@
"Endstop not hit"
"Krancowka nie aktyw."
-#MSG_SELFTEST_ENDSTOP
+#MSG_SELFTEST_ENDSTOP c=16
"Endstop"
"Krancowka"
From ba0f2b250102046eeaf99be0a44ed39e8e1c1ad8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 07:11:41 +0100
Subject: [PATCH 091/254] Update MSG_LOOSE_PULLEY c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 42cbd050..35718bdd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8100,7 +8100,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
lcd_print(_error_1);
break;
case TestError::Pulley:
- lcd_puts_at_P(0, 2, _i("Loose pulley"));////MSG_LOOSE_PULLEY c=20 r=1
+ lcd_puts_at_P(0, 2, _i("Loose pulley"));////MSG_LOOSE_PULLEY c=20
lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_MOTOR));
lcd_set_cursor(18, 3);
lcd_print(_error_1);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a6bcc356..a866e8fb 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -418,7 +418,7 @@
#MSG_LOADING_FILAMENT c=20
"Loading filament"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fcc30a78..012993c7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Zavadeni filamentu"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Uvolnena remenicka"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f3712c3a..f38b9948 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Filament laedt"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Lose Riemenscheibe"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d33734f1..7a798c4d 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Introduciendo filam."
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Polea suelta"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 9ac480d5..1a659e9b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Chargement du fil."
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Poulie lache"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3f803aac..c0d7a73e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Caricando filamento"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Puleggia lenta"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 646dcbac..a15ed534 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Laden filament"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Losse riemschijf"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e53488f3..96105222 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -558,7 +558,7 @@
"Loading filament"
"Laduje filament"
-#MSG_LOOSE_PULLEY c=20 r=1
+#MSG_LOOSE_PULLEY c=20
"Loose pulley"
"Luzne kolo pasowe"
From 3ee23af7b7c604abb8186e98d47ded219e58f4f7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 16:04:52 +0100
Subject: [PATCH 092/254] Update MSG_BED_DONE c=20
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index c627af3f..d08c4f23 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -12,7 +12,7 @@ const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////c=18
const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18
const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
-const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////
+const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////c=20
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a866e8fb..939656f0 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -73,7 +73,7 @@
#MSG_SELFTEST_BEDHEATER c=20
"Bed / Heater"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
#MSG_BED_HEATING
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 012993c7..c69d883c 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Podlozka / Topeni"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Bed OK."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f38b9948..f7522353 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Bett / Heizung"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Bett OK"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7a798c4d..bfe306a4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Base / Calentador"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Base preparada"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1a659e9b..b3fd2a6a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Lit / Chauffage"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Plateau termine"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c0d7a73e..83e2d521 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Piano/Riscald."
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Piano fatto."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a15ed534..fc289c18 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Bed / Verwarming"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Bed klaar"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 96105222..9e961fe6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -98,7 +98,7 @@
"Bed / Heater"
"Stol / Grzanie"
-#MSG_BED_DONE
+#MSG_BED_DONE c=20
"Bed done"
"Stol OK"
From 4d464b79f42c0caf06755646a6212c153f457ee9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sat, 20 Mar 2021 17:30:44 +0100
Subject: [PATCH 093/254] Update MSG_BED_HEATING c=20
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index d08c4f23..b8112128 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -13,7 +13,7 @@ const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18
const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////c=20
-const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////
+const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=20
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 939656f0..cbcfbd00 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -76,7 +76,7 @@
#MSG_BED_DONE c=20
"Bed done"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
#MSG_BED_CORRECTION_MENU
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c69d883c..2290d1e5 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -102,7 +102,7 @@
"Bed done"
"Bed OK."
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Zahrivani bedu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f7522353..6a911577 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -102,7 +102,7 @@
"Bed done"
"Bett OK"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Bett aufwaermen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index bfe306a4..48ced4d2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -102,7 +102,7 @@
"Bed done"
"Base preparada"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Calentando Base"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b3fd2a6a..1601ce7b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -102,7 +102,7 @@
"Bed done"
"Plateau termine"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Chauffe du lit"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 83e2d521..ea68fb2d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -102,7 +102,7 @@
"Bed done"
"Piano fatto."
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Riscald. piano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index fc289c18..09cc1028 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -102,7 +102,7 @@
"Bed done"
"Bed klaar"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Bed opwarmen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9e961fe6..90c84dde 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -102,7 +102,7 @@
"Bed done"
"Stol OK"
-#MSG_BED_HEATING
+#MSG_BED_HEATING c=20
"Bed Heating"
"Grzanie stolu.."
From 7c906dd0b1fca8fdfe22b01e6e96becb4f9c5c39 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:44:16 +0200
Subject: [PATCH 094/254] Update #MSG_BED_CORRECTION_MENU c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 35718bdd..9c338917 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5713,7 +5713,7 @@ static void lcd_calibration_menu()
#endif //MK1BP
- MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU
+ MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU c=18
MENU_ITEM_SUBMENU_P(_i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17 r=1
#ifndef TMC2130
MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index cbcfbd00..6178fbd6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -79,7 +79,7 @@
#MSG_BED_HEATING c=20
"Bed Heating"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
#MSG_BELTTEST c=17
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2290d1e5..a11bf6d0 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Zahrivani bedu"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Korekce podlozky"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6a911577..53d60b35 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Bett aufwaermen"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Ausgleich Bett ok"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 48ced4d2..6f1ff506 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Calentando Base"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Corr. de la cama"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1601ce7b..85ac82be 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Chauffe du lit"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Corr. niveau plateau"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ea68fb2d..d8b8b089 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Riscald. piano"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Correz. liv.piano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 09cc1028..65c5e650 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Bed opwarmen"
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Bed niveau correct"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 90c84dde..5cf0e00d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -106,7 +106,7 @@
"Bed Heating"
"Grzanie stolu.."
-#MSG_BED_CORRECTION_MENU
+#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
"Korekta stolu"
From 2985c6bd6b6e9d1fa1ee60326261d176760d0020 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:49:37 +0200
Subject: [PATCH 095/254] Update #MSG_BED c=13
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index b8112128..63eaef03 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -11,7 +11,7 @@
const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////c=18
const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18
const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12
-const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////
+const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////c=13
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////c=20
const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=20
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6178fbd6..b0e8141a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -94,7 +94,7 @@
#MSG_BRIGHTNESS c=18
"Brightness"
-#MSG_BED
+#MSG_BED c=13
"Bed"
#MSG_BELT_STATUS c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a11bf6d0..820edfb4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -126,7 +126,7 @@
"Brightness"
"Podsviceni"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Podlozka"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 53d60b35..28147328 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -126,7 +126,7 @@
"Brightness"
"Helligkeit"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Bett"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6f1ff506..4e5e4bb6 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -126,7 +126,7 @@
"Brightness"
"Brillo"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Base"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 85ac82be..0956b205 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -126,7 +126,7 @@
"Brightness"
"Luminosite"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Lit"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d8b8b089..4d11cf2e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -126,7 +126,7 @@
"Brightness"
"Luminosita'"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Piano"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 65c5e650..88589449 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -126,7 +126,7 @@
"Brightness"
"Helderheid"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Bed"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 5cf0e00d..8dfc08d6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -126,7 +126,7 @@
"Brightness"
"Jasnosc"
-#MSG_BED
+#MSG_BED c=13
"Bed"
"Stol"
From fa0382fd3e4e45435f3db1bfc60c843fb329744c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:50:54 +0200
Subject: [PATCH 096/254] Update #MSG_CALIBRATE_BED c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9c338917..4050edab 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5702,7 +5702,7 @@ static void lcd_calibration_menu()
MENU_ITEM_GCODE_P(_T(MSG_HOMEYZ), PSTR("G28 Z"));
#else //MK1BP
// MK2
- MENU_ITEM_FUNCTION_P(_i("Calibrate XYZ"), lcd_mesh_calibration);////MSG_CALIBRATE_BED
+ MENU_ITEM_FUNCTION_P(_i("Calibrate XYZ"), lcd_mesh_calibration);////MSG_CALIBRATE_BED c=18
// "Calibrate Z" with storing the reference values to EEPROM.
MENU_ITEM_SUBMENU_P(_T(MSG_HOMEYZ), lcd_mesh_calibration_z);
#ifndef SNMM
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b0e8141a..e59215d8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -106,7 +106,7 @@
# c=20
"Calibrating home"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
#MSG_HOMEYZ
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 820edfb4..49944726 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Kalibruji vychozi poz."
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Kalibrace XYZ"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 28147328..4b454277 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Kalibriere Start"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Kalibrierung XYZ"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4e5e4bb6..36b999d2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Calibrar posicion inicial"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Calibrar XYZ"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0956b205..5cc780fa 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Calib. mise a 0"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Calibrer XYZ"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4d11cf2e..84c9f6b3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Calibrazione Home"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Calibra XYZ"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 88589449..472a3798 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Kalibreren start"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Kalibratie XYZ"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8dfc08d6..1cc89251 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -142,7 +142,7 @@
"Calibrating home"
"Zerowanie osi"
-#MSG_CALIBRATE_BED
+#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
"Kalibracja XYZ"
From 79aa6b198ddace4d3662dfcd0af957385cc80b26 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:52:24 +0200
Subject: [PATCH 097/254] Update #MSG_HOMEYZ c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 63eaef03..20d190d0 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -50,7 +50,7 @@ const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=13
const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
-const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////
+const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18
const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1
const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1
const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e59215d8..57282f5f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -109,7 +109,7 @@
#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
#MSG_CALIBRATE_PINDA c=17 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 49944726..4aa79acc 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Kalibrace XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Kalibrovat Z"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4b454277..5c1d150d 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Kalibrierung XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Kalibrierung Z"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 36b999d2..1c283d09 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Calibrar XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Calibrar Z"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 5cc780fa..d0eec520 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Calibrer XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Calibrer Z"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 84c9f6b3..4c686402 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Calibra XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Calibra Z"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 472a3798..2496e18d 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Kalibratie XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Kalibratie Z"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1cc89251..51e8bf45 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -146,7 +146,7 @@
"Calibrate XYZ"
"Kalibracja XYZ"
-#MSG_HOMEYZ
+#MSG_HOMEYZ c=18
"Calibrate Z"
"Kalibruj Z"
From 3733c42d38d9342e2fa91ab289cc1c5284c1c2e4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:54:11 +0200
Subject: [PATCH 098/254] Update #MSG_HOMEYZ_DONE c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4050edab..141a75f3 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -649,7 +649,7 @@ void lcdui_print_status_line(void)
if (custom_message_state > 3 && custom_message_state <= 10 ) {
lcd_set_cursor(0, 3);
lcd_space(19);
- lcd_puts_at_P(0, 3, _i("Calibration done"));////MSG_HOMEYZ_DONE
+ lcd_puts_at_P(0, 3, _i("Calibration done"));////MSG_HOMEYZ_DONE c=20
custom_message_state--;
}
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 57282f5f..0d6e2a01 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -124,7 +124,7 @@
#MSG_MOVE_CARRIAGE_TO_THE_TOP_Z c=20 r=8
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
#MSG_MENU_CALIBRATION
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4aa79acc..cd14a5c3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Kalibrace Z. Otacenim tlacitka posunte Z osu az k~hornimu dorazu. Potvrdte tlacitkem."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Kalibrace OK"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5c1d150d..f55092cd 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Z Kalibrieren: Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Anschliessend den Knopf druecken."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Kalibrierung OK"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1c283d09..690ef3cd 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Calibrando Z. Gira el dial para subir el extrusor hasta tocar los topes superiores. Despues haz clic."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Calibracion OK"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d0eec520..d1dfa655 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Calibration de Z. Tournez le bouton pour faire monter l'extrudeur dans l'axe Z jusqu'aux butees. Cliquez une fois fait."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Calibration terminee"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4c686402..7bc346d6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Calibrazione Z. Ruotare la manopola per alzare il carrello Z fino all'altezza massima. Click per terminare."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Calibrazione completa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2496e18d..9050e537 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -166,7 +166,7 @@
"Calibrating Z. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
"Kalibreren van Z. Draai de knop om de Z-wagen omhoog te gaan tot het einde stoppers. Druk knop als klaar."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Kalibratie klaar"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 51e8bf45..d911b4e4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -166,7 +166,7 @@
"Calibrating Z. 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."
-#MSG_HOMEYZ_DONE
+#MSG_HOMEYZ_DONE c=20
"Calibration done"
"Kalibracja OK"
From 1e2f5c8323c781ef3ac4020ade253462fae35a1a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:55:19 +0200
Subject: [PATCH 099/254] Update #MSG_MENU_CALIBRATION c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 20d190d0..d3673010 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -66,7 +66,7 @@ const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14
-const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////
+const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=15
const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0d6e2a01..0fc1d1e3 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -127,7 +127,7 @@
#MSG_HOMEYZ_DONE c=20
"Calibration done"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
#MSG_CANCEL c=9
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cd14a5c3..6bf9daa8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Kalibrace OK"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Kalibrace"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f55092cd..fd0fdae9 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Kalibrierung OK"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Kalibrierung"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 690ef3cd..32807afe 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Calibracion OK"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Calibracion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d1dfa655..76f2b2d2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Calibration terminee"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7bc346d6..3d0e3ae7 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Calibrazione completa"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Calibrazione"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9050e537..be090ed4 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Kalibratie klaar"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Kalibratie"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d911b4e4..c8c85681 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -170,7 +170,7 @@
"Calibration done"
"Kalibracja OK"
-#MSG_MENU_CALIBRATION
+#MSG_MENU_CALIBRATION c=18
"Calibration"
"Kalibracja"
From f2298b1a466b3e71f0a63efbb8e0724049d7c2b3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 07:57:42 +0200
Subject: [PATCH 100/254] Update #MSG_SD_REMOVED c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 141a75f3..110d2b6e 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8862,7 +8862,7 @@ void menu_lcd_lcdupdate_func(void)
if(menu_menu==lcd_sdcard_menu)
menu_back();
card.release();
- LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED
+ LCD_MESSAGERPGM(_i("Card removed"));////MSG_SD_REMOVED c=20
}
}
#endif//CARDINSERTED
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0fc1d1e3..5e0be9e6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -133,7 +133,7 @@
#MSG_CANCEL c=9
"Cancel"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6bf9daa8..bd299574 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -178,7 +178,7 @@
"Cancel"
"Zrusit"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"Karta vyjmuta"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fd0fdae9..9358dbfb 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -178,7 +178,7 @@
"Cancel"
"Abbruch"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"SD Karte entfernt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 32807afe..496516a0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -178,7 +178,7 @@
"Cancel"
"Cancelar"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"Tarjeta retirada"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 76f2b2d2..9285a32d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -178,7 +178,7 @@
"Cancel"
"Annuler"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"Carte retiree"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3d0e3ae7..2d88e6f9 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -178,7 +178,7 @@
"Cancel"
"Annulla"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"SD rimossa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index be090ed4..4232efe3 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -178,7 +178,7 @@
"Cancel"
"Annuleren"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"SD verwijderd"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c8c85681..f3935c5f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -178,7 +178,7 @@
"Cancel"
"Anuluj"
-#MSG_SD_REMOVED
+#MSG_SD_REMOVED c=20
"Card removed"
"Karta wyjeta"
From 02ff05639b9df0adf5d50bf778ac0e772bf9f8a8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:01:26 +0200
Subject: [PATCH 101/254] Define MSG_CHECKING_FILE c=17
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 110d2b6e..1368edb0 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8513,7 +8513,7 @@ static bool check_file(const char* filename) {
cmdqueue_reset();
cmdqueue_serial_disabled = true;
- menu_progressbar_init(bytesToCheck, _i("Checking file"));
+ menu_progressbar_init(bytesToCheck, _i("Checking file"));////MSG_CHECKING_FILE c=17
while (!card.eof() && !result) {
menu_progressbar_update(card.get_sdpos() - startPos);
card.sdprinting = true;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 5e0be9e6..2acdf685 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -136,7 +136,7 @@
#MSG_SD_REMOVED c=20
"Card removed"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
#MSG_NOT_COLOR
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bd299574..8a2e440b 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -182,7 +182,7 @@
"Card removed"
"Karta vyjmuta"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 9358dbfb..2a0f9750 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -182,7 +182,7 @@
"Card removed"
"SD Karte entfernt"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 496516a0..160b27f8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -182,7 +182,7 @@
"Card removed"
"Tarjeta retirada"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 9285a32d..0ade4b3d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -182,7 +182,7 @@
"Card removed"
"Carte retiree"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2d88e6f9..a5a5af2f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -182,7 +182,7 @@
"Card removed"
"SD rimossa"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 4232efe3..5ad680ff 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -182,7 +182,7 @@
"Card removed"
"SD verwijderd"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f3935c5f..3d835027 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -182,7 +182,7 @@
"Card removed"
"Karta wyjeta"
-#
+#MSG_CHECKING_FILE c=17
"Checking file"
"\x00"
From 5f9b66a23ad9939c7cbae3d41c7ff66344722dc3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:04:39 +0200
Subject: [PATCH 102/254] Update #MSG_NOT_COLOR c=19
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1368edb0..311dae01 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2480,7 +2480,7 @@ void lcd_alright() {
lcd_puts_at_P(0, 0, _i("Changed correctly?"));////MSG_CORRECTLY c=20
lcd_puts_at_P(1, 1, _T(MSG_YES));
lcd_puts_at_P(1, 2, _i("Filament not loaded"));////MSG_NOT_LOADED c=19
- lcd_puts_at_P(1, 3, _i("Color not correct"));////MSG_NOT_COLOR
+ lcd_puts_at_P(1, 3, _i("Color not correct"));////MSG_NOT_COLOR c=19
lcd_putc_at(0, 1, '>');
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2acdf685..a068a993 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -139,7 +139,7 @@
#MSG_CHECKING_FILE c=17
"Checking file"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
#MSG_COOLDOWN
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8a2e440b..d41acc46 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Barva neni cista"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2a0f9750..18c59700 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Falsche Farbe"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 160b27f8..821d5c3c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Color no homogeneo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0ade4b3d..597bff55 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Couleur incorrecte"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a5a5af2f..56f7c11e 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Colore non puro"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5ad680ff..1f8019d6 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Kleur niet juist"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3d835027..ea4ca68b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -186,7 +186,7 @@
"Checking file"
"\x00"
-#MSG_NOT_COLOR
+#MSG_NOT_COLOR c=19
"Color not correct"
"Kolor zanieczysz."
From 71638b49fcc16369cf77f99a823235bbc7c5278b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:05:54 +0200
Subject: [PATCH 103/254] Update #MSG_COOLDOWN c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index d3673010..f984304c 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -24,7 +24,7 @@ const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20
const char MSG_CHECKING_Y[] PROGMEM_I1 = ISTR("Checking Y axis"); ////c=20
const char MSG_COMMUNITY_MADE[] PROGMEM_I1 = ISTR("Community made"); ////c=18
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
-const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
+const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////c=18
const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a068a993..49337aef 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -142,7 +142,7 @@
#MSG_NOT_COLOR c=19
"Color not correct"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d41acc46..bf3cd6d0 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Barva neni cista"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Zchladit"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 18c59700..2e9ab5e7 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Falsche Farbe"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Abkuehlen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 821d5c3c..d0e3e5d4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Color no homogeneo"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Enfriar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 597bff55..a759c3b9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Couleur incorrecte"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Refroidissement"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 56f7c11e..d70cf8c4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Colore non puro"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Raffredda"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 1f8019d6..c9847611 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Kleur niet juist"
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Afkoelen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ea4ca68b..e071aa82 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -190,7 +190,7 @@
"Color not correct"
"Kolor zanieczysz."
-#MSG_COOLDOWN
+#MSG_COOLDOWN c=18
"Cooldown"
"Chlodzenie"
From c8af50d3444c5b1a4380c1f25d5fbbd96d22e028 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:09:08 +0200
Subject: [PATCH 104/254] Define #MSG_COPY_SEL_LANG c=20 r=3
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 311dae01..7dc7d6bd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4350,7 +4350,7 @@ void menu_setlang(unsigned char lang)
{
if (!lang_select(lang))
{
- if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, true))
+ if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, true))////MSG_COPY_SEL_LANG c=20 r=3
lang_boot_update_start(lang);
lcd_update_enable(true);
lcd_clear();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 49337aef..401e4b98 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -145,7 +145,7 @@
#MSG_COOLDOWN c=18
"Cooldown"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
#MSG_CRASHDETECT c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bf3cd6d0..001fd04d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Zchladit"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Kopirovat vybrany jazyk?"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2e9ab5e7..e879ac77 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Abkuehlen"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Gewaehlte Sprache kopieren?"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d0e3e5d4..4ec1a30d 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Enfriar"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Copiar idioma seleccionado?"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a759c3b9..59651317 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Refroidissement"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Copier la langue choisie?"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d70cf8c4..a089c686 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Raffredda"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Copiare la lingua selezionata?"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c9847611..d2fa5fc9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Afkoelen"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Geselecteerde taal kopieren?"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e071aa82..c1d28fa4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -194,7 +194,7 @@
"Cooldown"
"Chlodzenie"
-#
+#MSG_COPY_SEL_LANG c=20 r=3
"Copy selected language?"
"Skopiowac wybrany jezyk?"
From 2d2dc23e8186511ad7c4b58354fe5e373248450c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:12:20 +0200
Subject: [PATCH 105/254] Define #MSG_CALIBRATING_HOME c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 7dc7d6bd..5f6750f5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8425,7 +8425,7 @@ static int lcd_selftest_screen(TestScreen screen, int _progress, int _progress_s
if (screen == TestScreen::FsensorOk) lcd_puts_P(_T(MSG_SELFTEST_CHECK_FSENSOR));
if (screen == TestScreen::AllCorrect) lcd_puts_P(_i("All correct "));////MSG_SELFTEST_CHECK_ALLCORRECT c=20
if (screen == TestScreen::Failed) lcd_puts_P(_T(MSG_SELFTEST_FAILED));
- if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////c=20
+ if (screen == TestScreen::Home) lcd_puts_P(_i("Calibrating home"));////MSG_CALIBRATING_HOME c=20
lcd_puts_at_P(0, 1, separator);
if ((screen >= TestScreen::ExtruderFan) && (screen <= TestScreen::FansOk))
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 401e4b98..b5746a7c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -103,7 +103,7 @@
#MSG_RECOVER_PRINT c=20 r=2
"Blackout occurred. Recover print?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
#MSG_CALIBRATE_BED c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 001fd04d..c049b4ca 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Detekovan vypadek proudu.Obnovit tisk?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Kalibruji vychozi poz."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e879ac77..2d6c5f5b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Stromausfall! Druck wiederherstellen?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Kalibriere Start"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4ec1a30d..2ea13202 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Se fue la luz. Re- anudar la impresion?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Calibrar posicion inicial"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 59651317..d03492d3 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Coupure detectee. Reprendre impres.?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Calib. mise a 0"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a089c686..69ce6183 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Blackout rilevato. Recuperare stampa?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Calibrazione Home"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d2fa5fc9..10129d97 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Stroomstoring. Print herstellen?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Kalibreren start"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c1d28fa4..d8027d5d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -138,7 +138,7 @@
"Blackout occurred. Recover print?"
"Wykryto zanik napiecia.Kontynowac?"
-# c=20
+#MSG_CALIBRATING_HOME c=20
"Calibrating home"
"Zerowanie osi"
From 411caddc551160899729e1183fbe7ec3e6a1dfca Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:14:46 +0200
Subject: [PATCH 106/254] Define #MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5f6750f5..43191ffb 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4757,7 +4757,7 @@ static void wizard_lay1cal_message(bool cold)
if (mmu_enabled)
{
lcd_show_fullscreen_message_and_wait_P(
- _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));////c=20 r=7
+ _i("Choose a filament for the First Layer Calibration and select it in the on-screen menu."));////MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
}
else if (cold)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b5746a7c..f63cf321 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -151,7 +151,7 @@
#MSG_CRASHDETECT c=13
"Crash det."
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
#MSG_CRASH_DETECTED c=20 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c049b4ca..060f4640 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -202,7 +202,7 @@
"Crash det."
"\x00"
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2d6c5f5b..be1069b9 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -202,7 +202,7 @@
"Crash det."
"Crash Erk."
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2ea13202..442a4621 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -202,7 +202,7 @@
"Crash det."
"Det. choque"
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d03492d3..7a9054dc 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -202,7 +202,7 @@
"Crash det."
"Detect.crash"
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 69ce6183..d77839e0 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -202,7 +202,7 @@
"Crash det."
"Rileva.crash"
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 10129d97..b5bacd30 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -202,7 +202,7 @@
"Crash det."
"Crashdet."
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in het schermmenu."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d8027d5d..d13c3102 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -202,7 +202,7 @@
"Crash det."
"Wykr.zderzen"
-# c=20 r=7
+#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym."
From 69b9acdfc1b7e52dc654330ee8a9f383c8614452 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:57:42 +0200
Subject: [PATCH 107/254] Define #MSG_CRASH_RESUME c=20 r=3
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 0ed545ed..d08c4cc1 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -650,7 +650,7 @@ void crashdet_detected(uint8_t mask)
enquecommand_P(PSTR("CRASH_RECOVER"));
}else{
setTargetHotend(0, active_extruder);
- bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);////c=20 r=2
+ bool yesno = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Crash detected. Resume print?"), false);////MSG_CRASH_RESUME c=20 r=3
lcd_update_enable(true);
if (yesno)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f63cf321..87aad642 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -157,7 +157,7 @@
#MSG_CRASH_DETECTED c=20 r=1
"Crash detected."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
#MSG_CRASH c=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 060f4640..f1bd5640 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Detekovan naraz."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Detekovan naraz. Obnovit tisk?"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index be1069b9..d34399f0 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Crash erkannt."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Crash erkannt. Druck fortfuehren?"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 442a4621..b7c3c23f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Choque detectado."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Choque detectado. Continuar impresion?"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7a9054dc..00573a26 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Crash detecte."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Crash detecte. Poursuivre l'impression?"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d77839e0..e2235bfa 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Rilevato impatto."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Scontro rilevato. Riprendere la stampa?"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b5bacd30..ae98b8e8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Crash gedetecteerd."
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Crash gedetecteerd. Print voorzetten?"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d13c3102..e8ba2f82 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -210,7 +210,7 @@
"Crash detected."
"Zderzenie wykryte"
-# c=20 r=2
+#MSG_CRASH_RESUME c=20 r=3
"Crash detected. Resume print?"
"Wykryto zderzenie. Wznowic druk?"
From b6031c02a8c7042f08649298c37a668cfc4e56d4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 08:59:27 +0200
Subject: [PATCH 108/254] Update #MSG_DISABLE_STEPPERS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 43191ffb..118ca379 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5593,7 +5593,7 @@ static void lcd_settings_menu()
if (!PRINTER_ACTIVE || isPrintPaused)
{
MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS
- MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS
+ MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=18
}
SETTINGS_FILAMENT_SENSOR;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 87aad642..d2b16c88 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -172,7 +172,7 @@
#MSG_COMMUNITY_MADE c=18
"Community made"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
#MSG_BABYSTEP_Z_NOT_SET c=20 r=12
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f1bd5640..8793f290 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Vypnout motory"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d34399f0..a51668f6 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Motoren aus"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b7c3c23f..abd4fb3b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Apagar motores"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 00573a26..cd0ac132 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Desactiver moteurs"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e2235bfa..d547744c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Disabilita motori"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ae98b8e8..d87c4449 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Motoren uit"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e8ba2f82..c2aa6ef3 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -230,7 +230,7 @@
"Community made"
"\x00"
-#MSG_DISABLE_STEPPERS
+#MSG_DISABLE_STEPPERS c=18
"Disable steppers"
"Wylacz silniki"
From 1b8ca77b0c45e77bfa061bb9bd73bfe78eeaad04 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:01:58 +0200
Subject: [PATCH 109/254] Define #MSG_MMU_CUTTING_FIL c=18
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 697fc8fe..eb888470 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -1383,7 +1383,7 @@ void mmu_cut_filament(uint8_t filament_nr)
{
LcdUpdateDisabler disableLcdUpdate;
lcd_clear();
- lcd_puts_at_P(0, 1, _i("Cutting filament")); //// c=18
+ lcd_puts_at_P(0, 1, _i("Cutting filament")); ////MSG_MMU_CUTTING_FIL c=18
lcd_print(' ');
lcd_print(filament_nr + 1);
mmu_filament_ramming();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d2b16c88..c9e4015d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -211,7 +211,7 @@
#MSG_CUTTER c=9
"Cutter"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
#MSG_FSENS_NOT_RESPONDING c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8793f290..0f8bac5a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -282,7 +282,7 @@
"Cutter"
"Strihani"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Strihani filamentu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a51668f6..1b5e78ba 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -282,7 +282,7 @@
"Cutter"
"Messer"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Schneide filament"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index abd4fb3b..3530cf81 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -282,7 +282,7 @@
"Cutter"
"Cuchillo"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Corte de filament"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cd0ac132..18b7a503 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -282,7 +282,7 @@
"Cutter"
"Coupeur"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Je coupe filament"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d547744c..519793e8 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -282,7 +282,7 @@
"Cutter"
"Tagliatr."
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Tagliando filam."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d87c4449..3457c489 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -282,7 +282,7 @@
"Cutter"
"Mes"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Knippe filament"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c2aa6ef3..ddf056c7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -282,7 +282,7 @@
"Cutter"
"Nozyk"
-# c=18
+#MSG_MMU_CUTTING_FIL c=18
"Cutting filament"
"Obcinanie fil."
From 1b4241f031a45f0975443ee06c8240ca2029261c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:03:38 +0200
Subject: [PATCH 110/254] Update #MSG_ERROR c=10
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index f984304c..f91bf3fa 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -28,7 +28,7 @@ const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////c=18
const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
-const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
+const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=10
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17
const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////c=13
const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=15
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index c9e4015d..6b42ae31 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -220,7 +220,7 @@
#MSG_DIM c=6
"Dim"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0f8bac5a..7d3a4aec 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -294,7 +294,7 @@
"Dim"
"Temny"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"CHYBA:"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1b5e78ba..720cd795 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -294,7 +294,7 @@
"Dim"
"Dimm"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"FEHLER:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 3530cf81..38714fef 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -294,7 +294,7 @@
"Dim"
"\x00"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 18b7a503..1d872a49 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -294,7 +294,7 @@
"Dim"
"\x00"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"ERREUR:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 519793e8..2dfa6ae6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -294,7 +294,7 @@
"Dim"
"Scuro"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"ERRORE:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3457c489..dbe70609 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -294,7 +294,7 @@
"Dim"
"\x00"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"FOUT:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ddf056c7..7d41336a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -294,7 +294,7 @@
"Dim"
"Sciemn"
-#MSG_ERROR
+#MSG_ERROR c=10
"ERROR:"
"BLAD:"
From d427563e2b16bd7d25becf78804ef7da845d8168 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:05:18 +0200
Subject: [PATCH 111/254] Define #MSG_MMU_FAIL_STATS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 118ca379..1ee8e22c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6668,7 +6668,7 @@ static void lcd_main_menu()
MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);////c=18
#endif
if (mmu_enabled) {
- MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////c=18
+ MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////MSG_MMU_FAIL_STATS c=18
}
MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT
#ifdef LCD_TEST
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6b42ae31..9ace2a47 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -232,7 +232,7 @@
#MSG_EXTRUDER c=17
"Extruder"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
#MSG_FSENSOR_AUTOLOAD c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7d3a4aec..28591618 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -310,7 +310,7 @@
"Extruder"
"\x00"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"Selhani MMU"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 720cd795..deda2e34 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -310,7 +310,7 @@
"Extruder"
"\x00"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"MMU-Fehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 38714fef..ee62d913 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -310,7 +310,7 @@
"Extruder"
"Extruir"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"Estadistica de fallos MMU"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1d872a49..e0ce4e2c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -310,7 +310,7 @@
"Extruder"
"Extrudeur"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"Stat. d'echec MMU"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2dfa6ae6..d7b3e9ae 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -310,7 +310,7 @@
"Extruder"
"Estrusore"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"Stat.fall. MMU"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index dbe70609..25aac24a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -310,7 +310,7 @@
"Extruder"
"\x00"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"MMU-Fouten"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7d41336a..67d75d52 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -310,7 +310,7 @@
"Extruder"
"Ekstruder"
-# c=18
+#MSG_MMU_FAIL_STATS c=18
"Fail stats MMU"
"Bledy MMU"
From 7a99f63ffd3cdb44b03de941019799258d8e4d3a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:06:59 +0200
Subject: [PATCH 112/254] Define #MSG_FAIL_STATS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1ee8e22c..e1202caf 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6665,7 +6665,7 @@ static void lcd_main_menu()
}
#if defined(TMC2130) || defined(FILAMENT_SENSOR)
- MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);////c=18
+ MENU_ITEM_SUBMENU_P(_i("Fail stats"), lcd_menu_fails_stats);////MSG_FAIL_STATS c=18
#endif
if (mmu_enabled) {
MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////MSG_MMU_FAIL_STATS c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 9ace2a47..7ba04cae 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -238,7 +238,7 @@
#MSG_FSENSOR_AUTOLOAD c=13
"F. autoload"
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
#MSG_FAN_SPEED c=14
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 28591618..f61f8db8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -318,7 +318,7 @@
"F. autoload"
"F. autozav."
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Selhani"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index deda2e34..e39a980b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -318,7 +318,7 @@
"F. autoload"
"F. autoladen"
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Fehlerstatistik"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ee62d913..ad953a88 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -318,7 +318,7 @@
"F. autoload"
"Autocarg.fil."
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Estadistica de fallos"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e0ce4e2c..390d90f3 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -318,7 +318,7 @@
"F. autoload"
"F. autocharg."
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Stat. d'echec"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d7b3e9ae..a9fbf3a6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -318,7 +318,7 @@
"F. autoload"
"Autocar.fil."
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Stat. fallimenti"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 25aac24a..621286d7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -318,7 +318,7 @@
"F. autoload"
"F. autoladen"
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Foutstatistieken"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 67d75d52..fb6fb32e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -318,7 +318,7 @@
"F. autoload"
"Autolad. fil."
-# c=18
+#MSG_FAIL_STATS c=18
"Fail stats"
"Statystyki bledow"
From 7c9891d85ed64c7f1b5d94b7b3c3cd581cc7145c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:09:11 +0200
Subject: [PATCH 113/254] Update #MSG_FSENSOR c=12
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index f91bf3fa..4e7a35ec 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -47,7 +47,7 @@ const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); /
const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=8
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=9
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=13
-const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////
+const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////c=12
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 7ba04cae..4dd2dc4c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -250,7 +250,7 @@
#MSG_FANS_CHECK c=13
"Fans check"
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
#MSG_FIL_RUNOUTS c=15
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f61f8db8..5ea6ac4b 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -334,7 +334,7 @@
"Fans check"
"Kontr. vent."
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Fil. senzor"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e39a980b..aa795b6d 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -334,7 +334,7 @@
"Fans check"
"Luefter Chk."
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Fil. Sensor"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ad953a88..8cd9a65f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -334,7 +334,7 @@
"Fans check"
"Comprob.vent"
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Sensor Fil."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 390d90f3..4d506d4b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -334,7 +334,7 @@
"Fans check"
"Verif vent."
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Capteur Fil."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a9fbf3a6..35e4b4e4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -334,7 +334,7 @@
"Fans check"
"Control.vent"
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Sensore fil."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 621286d7..504ffd5f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -334,7 +334,7 @@
"Fans check"
"Fans check"
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index fb6fb32e..2ccb3da4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -334,7 +334,7 @@
"Fans check"
"Sprawd.went."
-#MSG_FSENSOR
+#MSG_FSENSOR c=12
"Fil. sensor"
"Czuj. filam."
From db07d55c299b5d3321a6389dd5e0e4fb0dd05fe1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:11:19 +0200
Subject: [PATCH 114/254] Define #MSG_MMU_FIX_ISSUE c=20 r=4
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index eb888470..68d20b22 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -723,7 +723,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
}
else { //screen 1
if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));////c=20 r=4
- else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));////c=20 r=4
+ else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));////MSG_MMU_FIX_ISSUE c=20 r=4
screen=0;
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4dd2dc4c..53436f9d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -286,7 +286,7 @@
#MSG_WIZARD_SELFTEST c=20 r=8
"First, I will run the selftest to check most common assembly problems."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
#MSG_FLOW
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 5ea6ac4b..ed864e25 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Nejdriv pomoci selftestu zkontoluji nejcastejsi chyby vznikajici pri sestaveni tiskarny."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Opravte chybu a pote stisknete tlacitko na jednotce MMU."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index aa795b6d..3416b36d 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Zunaechst fuehre ich den Selbsttest durch, um die haeufigsten Probleme beim Zusammenbau zu ueberpruefen."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8cd9a65f..335b518a 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Primero, hare el Selftest para comprobar los problemas de montaje mas comunes."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Corrige el problema y pulsa el boton en la unidad MMU."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4d506d4b..c72bf623 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"D'abord, je vais lancer le Auto-test pour verifier les problemes d'assemblage les plus communs."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Corrigez le probleme et appuyez sur le bouton sur la MMU."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 35e4b4e4..e480ab82 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Per primo avviero l'autotest per controllare gli errori di assemblaggio piu comuni."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Risolvere il problema e premere il bottone sull'unita MMU. "
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 504ffd5f..becf33f6 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Ten eerste zullen we de zelftest uitvoeren om de meest voorkomende montageproblemen te controleren."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Los het probleem op en druk vervolgens op de knop op de MMU-eenheid."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 2ccb3da4..413750d4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -382,7 +382,7 @@
"First, I will run the selftest to check most common assembly problems."
"Najpierw wlacze selftest w celu sprawdzenia najczestszych problemow podczas montazu."
-# c=20 r=4
+#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
"Rozwiaz problem i wcisnij przycisk na MMU."
From 10c586b577ed27858f302f65735aaaa13af02c64 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:13:09 +0200
Subject: [PATCH 115/254] Update #MSG_FLOW c=15
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index e1202caf..0129bcc6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6808,7 +6808,7 @@ static void lcd_tune_menu()
MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10);//4
MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255);//5
- MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW
+ MENU_ITEM_EDIT_int3_P(_i("Flow"), &extrudemultiply, 10, 999);//6////MSG_FLOW c=15
#ifdef LA_LIVE_K
MENU_ITEM_EDIT_advance_K();//7
#endif
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 53436f9d..7b4baf0a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -289,7 +289,7 @@
#MSG_MMU_FIX_ISSUE c=20 r=4
"Fix the issue and then press button on MMU unit."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
#MSG_PRUSA3D_FORUM
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ed864e25..aa20b823 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Opravte chybu a pote stisknete tlacitko na jednotce MMU."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Prutok"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 3416b36d..549fe3ac 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Beseitigen Sie das Problem und druecken Sie dann den Knopf am MMU."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Durchfluss"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 335b518a..6742564c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Corrige el problema y pulsa el boton en la unidad MMU."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Flujo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c72bf623..8e3231b9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Corrigez le probleme et appuyez sur le bouton sur la MMU."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Flux"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e480ab82..eb9c31f2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Risolvere il problema e premere il bottone sull'unita MMU. "
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Flusso"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index becf33f6..ca4712ea 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Los het probleem op en druk vervolgens op de knop op de MMU-eenheid."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Stromen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 413750d4..1ace243c 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -386,7 +386,7 @@
"Fix the issue and then press button on MMU unit."
"Rozwiaz problem i wcisnij przycisk na MMU."
-#MSG_FLOW
+#MSG_FLOW c=15
"Flow"
"Przeplyw"
From 4e4fb7a59f0d8c72e988b1773e1fcea79efafa28 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:14:20 +0200
Subject: [PATCH 116/254] Update #MSG_PRUSA3D_FORUM c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0129bcc6..b38cd729 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1917,7 +1917,7 @@ static void lcd_support_menu()
}*/
MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D
- MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM
+ MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18
MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO
MENU_ITEM_BACK_P(STR_SEPARATOR);
MENU_ITEM_BACK_P(PSTR(FILAMENT_SIZE));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 7b4baf0a..bbc27819 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -292,7 +292,7 @@
#MSG_FLOW c=15
"Flow"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
#MSG_SELFTEST_COOLING_FAN c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index aa20b823..d24a3b49 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -390,7 +390,7 @@
"Flow"
"Prutok"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 549fe3ac..6ed1b820 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -390,7 +390,7 @@
"Flow"
"Durchfluss"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6742564c..4276f4de 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -390,7 +390,7 @@
"Flow"
"Flujo"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 8e3231b9..417f3971 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -390,7 +390,7 @@
"Flow"
"Flux"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index eb9c31f2..d4b73cdd 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -390,7 +390,7 @@
"Flow"
"Flusso"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ca4712ea..01f47f43 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -390,7 +390,7 @@
"Flow"
"Stromen"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1ace243c..b1641e8a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -390,7 +390,7 @@
"Flow"
"Przeplyw"
-#MSG_PRUSA3D_FORUM
+#MSG_PRUSA3D_FORUM c=18
"forum.prusa3d.com"
"\x00"
From 12bd2f1a09f12d43dc72609345ebffd3d01304f5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:15:21 +0200
Subject: [PATCH 117/254] Update #MSG_PRUSA3D c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index b38cd729..9f23b2e3 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1916,7 +1916,7 @@ static void lcd_support_menu()
MENU_ITEM_BACK_P(PSTR("FW - " FW_version));
}*/
- MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D
+ MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D c=18
MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18
MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO
MENU_ITEM_BACK_P(STR_SEPARATOR);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bbc27819..002fee0a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -670,7 +670,7 @@
#MSG_PLEASE_LOAD_PLA c=20 r=4
"Please load filament first."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
#MSG_BED_CORRECTION_REAR c=14 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d24a3b49..a5f55457 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Prosim nejdriv zavedte filament"
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6ed1b820..98673759 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Bitte laden Sie zuerst das Filament."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4276f4de..5bbc778f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Por favor, cargar primero el filamento. "
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"prusa3d.es"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 417f3971..fa461093 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Veuillez d'abord charger un filament."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d4b73cdd..f5b8503a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Per favore prima carica il filamento."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 01f47f43..3eb9b158 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Laad a.u.b. eerst filament."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b1641e8a..67c9ee2e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -894,7 +894,7 @@
"Please load filament first."
"Najpierw zaladuj filament."
-#MSG_PRUSA3D
+#MSG_PRUSA3D c=18
"prusa3d.com"
"\x00"
From 280a3c4d3a7aa080d77679a73cab476bc76ad38a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:16:14 +0200
Subject: [PATCH 118/254] Update #MSG_PRUSA3D_HOWTO c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9f23b2e3..2d7df7dd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1918,7 +1918,7 @@ static void lcd_support_menu()
MENU_ITEM_BACK_P(_i("prusa3d.com"));////MSG_PRUSA3D c=18
MENU_ITEM_BACK_P(_i("forum.prusa3d.com"));////MSG_PRUSA3D_FORUM c=18
- MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO
+ MENU_ITEM_BACK_P(_i("howto.prusa3d.com"));////MSG_PRUSA3D_HOWTO c=18
MENU_ITEM_BACK_P(STR_SEPARATOR);
MENU_ITEM_BACK_P(PSTR(FILAMENT_SIZE));
MENU_ITEM_BACK_P(PSTR(ELECTRONICS));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 002fee0a..c80a3b34 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -319,7 +319,7 @@
#MSG_WIZARD_WELCOME c=20 r=7
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
#MSG_FILAMENTCHANGE
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a5f55457..6ecff551 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Dobry den, jsem vase tiskarna Original Prusa i3. Chcete abych Vas provedla kalibracnim procesem?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 98673759..21f8c599 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Hallo, ich bin Ihr Original Prusa i3 Drucker. Moechten Sie, dass ich Sie durch den Einrich- tungsablauf fuehre?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5bbc778f..d5b9e547 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Hola, soy tu impresora Original Prusa i3. Quieres que te guie a traves de la configuracion?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index fa461093..774e4bcc 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Bonjour, je suis votre imprimante Original Prusa i3. Voulez-vous que je vous guide a travers le processus d'installation?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f5b8503a..79636eb9 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Ciao, sono la tua stampante Original Prusa i3. Gradiresti un aiuto nel processo di configurazione?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3eb9b158..02297a60 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Hallo, ik ben uw Original Prusa i3 printer. Zullen we beginnen met het installatieproces?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 67c9ee2e..cd873230 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -426,7 +426,7 @@
"Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"
"Czesc, jestem Twoja drukarka Original Prusa i3. Czy potrzebujesz pomocy z ustawieniem?"
-#MSG_PRUSA3D_HOWTO
+#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
"\x00"
From 9c0300df669b5b9f4150a53ade59ff84627da77e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:18:11 +0200
Subject: [PATCH 119/254] Update #MSG_HEATING c=20
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 4e7a35ec..e428d3fd 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -48,7 +48,7 @@ const char MSG_FOLLOW_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("Printer has not been
const char MSG_FOLLOW_Z_CALIBRATION_FLOW[] PROGMEM_I1 = ISTR("There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."); ////c=20 r=9
const char MSG_FSENSOR_AUTOLOAD[] PROGMEM_I1 = ISTR("F. autoload"); ////c=13
const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////c=12
-const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////
+const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=20
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18
const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index c80a3b34..1be72823 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -313,7 +313,7 @@
#MSG_HEATING_COMPLETE c=20
"Heating done."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
#MSG_WIZARD_WELCOME c=20 r=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6ecff551..56826988 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -418,7 +418,7 @@
"Heating done."
"Zahrivani OK."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Zahrivani"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 21f8c599..bc93ea69 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -418,7 +418,7 @@
"Heating done."
"Aufwaermen OK."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Aufwaermen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d5b9e547..84634037 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -418,7 +418,7 @@
"Heating done."
"Calentando acabado."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Calentando..."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 774e4bcc..093ba410 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -418,7 +418,7 @@
"Heating done."
"Chauffe terminee."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Chauffe"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 79636eb9..933f68da 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -418,7 +418,7 @@
"Heating done."
"Riscald. completo"
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Riscaldamento..."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 02297a60..42bcde40 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -418,7 +418,7 @@
"Heating done."
"Opwarmen klaar."
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Opwarmen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index cd873230..6841b6b6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -418,7 +418,7 @@
"Heating done."
"Grzanie zakonczone"
-#MSG_HEATING
+#MSG_HEATING c=20
"Heating"
"Grzanie..."
From 0e86ab88fd7bd40cb084234050f228a3a4447f44 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:20:01 +0200
Subject: [PATCH 120/254] Update #MSG_FILAMENTCHANGE c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index e428d3fd..a4966427 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -40,7 +40,7 @@ const char MSG_FILAMENT_LOADING_T0[] PROGMEM_I1 = ISTR("Insert filament into ext
const char MSG_FILAMENT_LOADING_T1[] PROGMEM_I1 = ISTR("Insert filament into extruder 2. Click when done."); ////c=20 r=4
const char MSG_FILAMENT_LOADING_T2[] PROGMEM_I1 = ISTR("Insert filament into extruder 3. Click when done."); ////c=20 r=4
const char MSG_FILAMENT_LOADING_T3[] PROGMEM_I1 = ISTR("Insert filament into extruder 4. Click when done."); ////c=20 r=4
-const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////
+const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////c=18
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE1[] PROGMEM_I1 = ISTR("Searching bed calibration point"); ////c=20 r=2
const char MSG_FIND_BED_OFFSET_AND_SKEW_LINE2[] PROGMEM_I1 = ISTR(" of 4"); ////c=14
const char MSG_FINISHING_MOVEMENTS[] PROGMEM_I1 = ISTR("Finishing movements"); ////c=20
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1be72823..b3d5e1ee 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -322,7 +322,7 @@
#MSG_PRUSA3D_HOWTO c=18
"howto.prusa3d.com"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
#MSG_CHANGE_SUCCESS
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 56826988..5830d7eb 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Vymenit filament"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index bc93ea69..4482f248 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Filament-Wechsel"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 84634037..c35f7ea8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Cambiar filamento"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 093ba410..bda601e7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Changer filament"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 933f68da..6871ca0c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Cambia filamento"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 42bcde40..8bf5ef82 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Wissel filament"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6841b6b6..7dc9bb98 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -430,7 +430,7 @@
"howto.prusa3d.com"
"\x00"
-#MSG_FILAMENTCHANGE
+#MSG_FILAMENTCHANGE c=18
"Change filament"
"Wymiana filamentu"
From 0139bb5a5e4e4eb0ecddb04e8bec810b4d432ed6 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:20:57 +0200
Subject: [PATCH 121/254] Update #MSG_CHANGE_SUCCESS c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2d7df7dd..d0dee8f9 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2409,7 +2409,7 @@ void lcd_change_success() {
lcd_clear();
- lcd_puts_at_P(0, 2, _i("Change success!"));////MSG_CHANGE_SUCCESS
+ lcd_puts_at_P(0, 2, _i("Change success!"));////MSG_CHANGE_SUCCESS c=20
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b3d5e1ee..b5c2610b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -325,7 +325,7 @@
#MSG_FILAMENTCHANGE c=18
"Change filament"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
#MSG_CORRECTLY c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 5830d7eb..1e7b5e05 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -434,7 +434,7 @@
"Change filament"
"Vymenit filament"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Zmena uspesna!"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4482f248..cb8277f3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -434,7 +434,7 @@
"Change filament"
"Filament-Wechsel"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Wechsel erfolgr.!"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c35f7ea8..09c366f0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -434,7 +434,7 @@
"Change filament"
"Cambiar filamento"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Cambio correcto"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bda601e7..0bddee7d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -434,7 +434,7 @@
"Change filament"
"Changer filament"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Changement reussi!"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6871ca0c..f021e7fa 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -434,7 +434,7 @@
"Change filament"
"Cambia filamento"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Cambio riuscito!"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8bf5ef82..7b51adfd 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -434,7 +434,7 @@
"Change filament"
"Wissel filament"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Wissel geslaagd!"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7dc9bb98..5cecaaf1 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -434,7 +434,7 @@
"Change filament"
"Wymiana filamentu"
-#MSG_CHANGE_SUCCESS
+#MSG_CHANGE_SUCCESS c=20
"Change success!"
"Wymiana ok!"
From a82ca3def406896688e20c0e8e824c82a3919a9d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:21:50 +0200
Subject: [PATCH 122/254] Update #MSG_WATCH c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index a4966427..15fcfa4a 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -114,7 +114,7 @@ const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1
-const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////
+const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18
const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8
const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!"); ////c=20 r=8
const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wait."); ////c=20 r=3
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index b5c2610b..e1909206 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -367,7 +367,7 @@
#MSG_WIZARD_Z_CAL c=20 r=8
"I will run z calibration now."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
#MSG_INSERT_FILAMENT c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 1e7b5e05..f7a675a7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Nyni provedu z kalibraci."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Informace"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index cb8277f3..edda4ccd 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Ich werde jetzt die Z Kalibrierung durchfuehren."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Infoanzeige"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 09c366f0..b00eb69d 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Voy a hacer Calibracion Z ahora."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Monitorizar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0bddee7d..d90db9dd 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Je vais maintenant lancer la calibration Z."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Ecran d'info"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f021e7fa..6a857e46 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Adesso avviero la Calibrazione Z."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Schermata info"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 7b51adfd..6f175ab5 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Begin nu met z-kalibratie."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Info scherm"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 5cecaaf1..2eec21a7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -490,7 +490,7 @@
"I will run z calibration now."
"Przeprowadze kalibracje Z."
-#MSG_WATCH
+#MSG_WATCH c=18
"Info screen"
"Ekran informacyjny"
From 169f8983b645bd2e4532de78144fe4fe6e2ccd2c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:23:35 +0200
Subject: [PATCH 123/254] Define #MSG_ADDITIONAL_SHEETS c=20 r=9
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index d0dee8f9..30f4fdeb 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4944,7 +4944,7 @@ void lcd_wizard(WizState state)
}
else
{
- lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////c=20 r=9
+ lcd_show_fullscreen_message_and_wait_P(_i("If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."));////MSG_ADDITIONAL_SHEETS c=20 r=9
state = S::Finish;
}
break;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e1909206..de563bfc 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -385,7 +385,7 @@
#MSG_WIZARD_WELCOME_SHIPPING c=20 r=16
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
#MSG_LAST_PRINT c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f7a675a7..f590cb67 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ahoj, jsem vase tiskarna Original Prusa i3. Provedu vas kratkym procesem nastaveni, ve kterem zkalibrujeme osu Z. Pak budete moct zacit tisknout."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Mate-li vice tiskovych platu, kalibrujte je v menu Nastaveni - HW nastaveni - Tiskove platy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index edda4ccd..fc55dbbe 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ich bin Ihr Original Prusa i3 Drucker. Ich werde Sie durch einen kurzen Einrichtungsprozess fuehren, bei dem die Z-Achse kalibriert wird. Danach sind Sie bereit fuer den Druck."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Wenn Sie zusaetzliche Stahlbleche haben, kalibrieren Sie deren Voreinstellungen unter Einstellungen - HW Setup - Stahlbleche."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b00eb69d..7b2f08a3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hola, soy tu impresora Original Prusa i3. Te guiare a traves de un breve proceso de configuracion, en el que se calibrara el eje Z. Despues, estaras listo para imprimir."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si tienes planchas de acero adicionales, calibra sus ajustes en Ajustes - Ajustes HW - Planchas acero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d90db9dd..8c8ea524 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Bonjour, je suis votre imprimante Original Prusa i3. Je vais vous accompagner au cours d'un bref processus de reglage, qui permettra de calibrer le Z-axis. Apres cela, tout sera pret pour imprimer."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Si vous avez d'autres feuilles d'acier, calibrez leurs pre-reglages dans Reglages - Config HW - Plaque en acier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6a857e46..0681133f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Ciao, sono la tua stampante Original Prusa i3. Ti guidero attraverso un rapido processo in cui verra calibrato l'asse Z. Poi, sarai pronto a stampare."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Se hai piastre d'acciaio aggiuntive, calibra i preset in Impostazioni - Setup HW - Piastre in Acciaio."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6f175ab5..e6246628 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Hallo, ik ben je originele Prusa i3-printer. Ik zal je door een snel instellingsproces leiden dat de Z-as zal kalibreren. Dan ben je klaar om te printen."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Als u extra staalplaten hebt, kalibreert u hun voorinstellingen in Instellingen - HW Setup - Staalplaten."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 2eec21a7..bdc9cd2a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -514,7 +514,7 @@
"Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."
"Czesc, jestem Twoja drukarka Original Prusa i3. Przeprowadze Cie przez krotka kalibracje osi Z, po ktorej mozesz rozpoczac drukowanie."
-# c=20 r=9
+#MSG_ADDITIONAL_SHEETS c=20 r=9
"If you have additional steel sheets, calibrate their presets in Settings - HW Setup - Steel sheets."
"Jesli masz dodatkowe plyty stalowe, to skalibruj ich ustawienia w menu Ustawienia - Ustawienia HW - Plyty stalowe."
From 2daf1d9114bdd809182d9b4caec8df6f321b3ca8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:26:50 +0200
Subject: [PATCH 124/254] Define #MSG_LEFT c=10
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 30f4fdeb..c9d53939 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2759,7 +2759,7 @@ static void lcd_menu_xyz_y_min()
),
_i("Y distance from min"), ////c=20
separator,
- _i("Left"), ////c=11 r=1
+ _i("Left"), ////MSG_LEFT c=10
_i("Right") ////c=11 r=1
);
for (uint8_t i = 0; i < 2; i++)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index de563bfc..1b07c243 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -394,7 +394,7 @@
#MSG_SELFTEST_EXTRUDER_FAN c=20
"Left hotend fan?"
-#
+#MSG_LEFT c=10
"Left"
#MSG_BED_CORRECTION_LEFT c=14 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index f590cb67..5125c00a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Levy vent na trysce?"
-#
+#MSG_LEFT c=10
"Left"
"Vlevo"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fc55dbbe..b19d24eb 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Extruder Luefter?"
-#
+#MSG_LEFT c=10
"Left"
"Links"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7b2f08a3..b406136e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Vent. izquierdo?"
-#
+#MSG_LEFT c=10
"Left"
"Izquierda"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 8c8ea524..ef39c26c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Ventilo gauche?"
-#
+#MSG_LEFT c=10
"Left"
"Gauche"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0681133f..1332c99b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Vent SX hotend?"
-#
+#MSG_LEFT c=10
"Left"
"Sinistra"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index e6246628..4636abe9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Linker hotend fan?"
-#
+#MSG_LEFT c=10
"Left"
"Links"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index bdc9cd2a..d5ddf91b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -526,7 +526,7 @@
"Left hotend fan?"
"Lewy went hotendu?"
-#
+#MSG_LEFT c=10
"Left"
"Lewa"
From 164226c739c38aefa736225da2b2646a3240cb42 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:29:07 +0200
Subject: [PATCH 125/254] Define #MSG_RIGHT c=10
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c9d53939..2445daa8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2760,7 +2760,7 @@ static void lcd_menu_xyz_y_min()
_i("Y distance from min"), ////c=20
separator,
_i("Left"), ////MSG_LEFT c=10
- _i("Right") ////c=11 r=1
+ _i("Right") ////MSG_RIGHT c=10
);
for (uint8_t i = 0; i < 2; i++)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1b07c243..abd3d334 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -718,7 +718,7 @@
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
"FlashAir"
-#
+#MSG_RIGHT c=10
"Right"
#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 5125c00a..fdd4700d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Vpravo"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b19d24eb..87999fcf 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Rechts"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b406136e..4ed3ba31 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Derecha"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ef39c26c..46f7934c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -958,7 +958,7 @@
"FlashAir"
"FlshAir"
-#
+#MSG_RIGHT c=10
"Right"
"Droite"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1332c99b..21ffadf4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Destra"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 4636abe9..2beff397 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Rechts"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d5ddf91b..476fd6c1 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -958,7 +958,7 @@
"FlashAir"
"\x00"
-#
+#MSG_RIGHT c=10
"Right"
"Prawa"
From 00fedbb08a43a9ccbdca6d1846341838790484e5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:30:04 +0200
Subject: [PATCH 126/254] Update MSG_LANGUAGE_SELECT c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2445daa8..4f8265a9 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5632,7 +5632,7 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_BABYSTEP_Z), lcd_babystep_z);
#if (LANG_MODE != 0)
- MENU_ITEM_SUBMENU_P(_i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT
+ MENU_ITEM_SUBMENU_P(_i("Select language"), lcd_language_menu);////MSG_LANGUAGE_SELECT c=18
#endif //(LANG_MODE != 0)
SETTINGS_SD;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index abd3d334..08bafa11 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -724,7 +724,7 @@
#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
#MSG_SELFTEST_OK
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fdd4700d..b0e5324f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Hledam kalibracni bod podlozky"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Vyber jazyka"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 87999fcf..a97c6648 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Suche Bett Kalibrierpunkt"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Waehle Sprache"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4ed3ba31..3a2db044 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Buscando punto de calibracion base"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Cambiar el idioma"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 46f7934c..d70f937c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Recherche du point de calibration du plateau chauffant"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Choisir langue"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 21ffadf4..e8f2cd05 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Ricerca dei punti di calibrazione del piano"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Seleziona lingua"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2beff397..c2069102 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Zoeken bed kalibratiepunt"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Kies taal"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 476fd6c1..38f8c3c1 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -966,7 +966,7 @@
"Searching bed calibration point"
"Szukam punktu kalibracyjnego na stole"
-#MSG_LANGUAGE_SELECT
+#MSG_LANGUAGE_SELECT c=18
"Select language"
"Wybor jezyka"
From 9bc702ae0ab3c18dfdd894531136d8ed22376249 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:32:27 +0200
Subject: [PATCH 127/254] Update #MSG_SELFTEST_OK c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4f8265a9..33a5e7fc 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7612,7 +7612,7 @@ bool lcd_selftest()
if (_result)
{
- LCD_ALERTMESSAGERPGM(_i("Self test OK"));////MSG_SELFTEST_OK
+ LCD_ALERTMESSAGERPGM(_i("Self test OK"));////MSG_SELFTEST_OK c=20
}
else
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 08bafa11..e6567da7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -727,7 +727,7 @@
#MSG_LANGUAGE_SELECT c=18
"Select language"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
#MSG_SELFTEST_START c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b0e5324f..395f4188 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -970,7 +970,7 @@
"Select language"
"Vyber jazyka"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a97c6648..a4e32482 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -970,7 +970,7 @@
"Select language"
"Waehle Sprache"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"Selbsttest OK"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 3a2db044..fcfb4deb 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -970,7 +970,7 @@
"Select language"
"Cambiar el idioma"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d70f937c..e108dc4c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -970,7 +970,7 @@
"Select language"
"Choisir langue"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"Auto-test OK"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e8f2cd05..0ff07ec4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -970,7 +970,7 @@
"Select language"
"Seleziona lingua"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"Autotest OK"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c2069102..b6da4bf1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -970,7 +970,7 @@
"Select language"
"Kies taal"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"Zelftest OK"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 38f8c3c1..e2b39b2d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -970,7 +970,7 @@
"Select language"
"Wybor jezyka"
-#MSG_SELFTEST_OK
+#MSG_SELFTEST_OK c=20
"Self test OK"
"Selftest OK"
From b697117654adfd3bc52c5f67de12b20ef2a7ce09 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:33:49 +0200
Subject: [PATCH 128/254] Update #MSG_SELFTEST c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 33a5e7fc..1bb1ad5d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5695,7 +5695,7 @@ static void lcd_calibration_menu()
#ifdef TMC2130
MENU_ITEM_FUNCTION_P(_i("Belt test "), lcd_belttest_v);////MSG_BELTTEST c=17
#endif //TMC2130
- MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST c=17
+ MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST c=18
#ifdef MK1BP
// MK1
// "Calibrate Z"
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e6567da7..0675dc2a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -733,7 +733,7 @@
#MSG_SELFTEST_START c=20
"Self test start "
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
#MSG_SELFTEST_ERROR c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 395f4188..242ea97f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -978,7 +978,7 @@
"Self test start "
"Self test start "
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Selftest "
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a4e32482..100623fb 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -978,7 +978,7 @@
"Self test start "
"Selbsttest start "
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Selbsttest "
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index fcfb4deb..c5a33ec3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -978,7 +978,7 @@
"Self test start "
"Iniciar Selftest"
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e108dc4c..04543883 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -978,7 +978,7 @@
"Self test start "
"Debut auto-test"
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Auto-test"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0ff07ec4..e90b5fb6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -978,7 +978,7 @@
"Self test start "
"Avvia autotest"
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Autotest "
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b6da4bf1..07333c53 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -978,7 +978,7 @@
"Self test start "
"Zelftest start "
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Zelftest "
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e2b39b2d..7e2aa265 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -978,7 +978,7 @@
"Self test start "
"Selftest startuje"
-#MSG_SELFTEST
+#MSG_SELFTEST c=18
"Selftest "
"Selftest "
From 12dc48ff1a973a36ed82dd8f839b6c0eb8ed1f0c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:34:41 +0200
Subject: [PATCH 129/254] Update #MSG_BELTTEST c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1bb1ad5d..fd372277 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5693,7 +5693,7 @@ static void lcd_calibration_menu()
}
MENU_ITEM_GCODE_P(_T(MSG_AUTO_HOME), PSTR("G28 W"));
#ifdef TMC2130
- MENU_ITEM_FUNCTION_P(_i("Belt test "), lcd_belttest_v);////MSG_BELTTEST c=17
+ MENU_ITEM_FUNCTION_P(_i("Belt test "), lcd_belttest_v);////MSG_BELTTEST c=18
#endif //TMC2130
MENU_ITEM_FUNCTION_P(_i("Selftest "), lcd_selftest_v);////MSG_SELFTEST c=18
#ifdef MK1BP
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0675dc2a..7907d663 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -82,7 +82,7 @@
#MSG_BED_CORRECTION_MENU c=18
"Bed level correct"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
#MSG_BED_LEVELING_FAILED_POINT_LOW c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 242ea97f..8f26f4b1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Korekce podlozky"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Test remenu "
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 100623fb..eea5426f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Ausgleich Bett ok"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Riementest "
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c5a33ec3..3d6f703c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Corr. de la cama"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Test cinturon "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 04543883..705ffeaa 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Corr. niveau plateau"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Test de courroie "
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e90b5fb6..e814ddc8 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Correz. liv.piano"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Test cinghie "
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 07333c53..374f048b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Bed niveau correct"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Riemtest "
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7e2aa265..7321389b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -110,7 +110,7 @@
"Bed level correct"
"Korekta stolu"
-#MSG_BELTTEST c=17
+#MSG_BELTTEST c=18
"Belt test "
"Test paskow"
From 6900c206cde5476bddb395410323857885dd282e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:36:32 +0200
Subject: [PATCH 130/254] Define #MSG_SEL_PREHEAT_TEMP c=20 r=6
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index fd372277..94da5468 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4913,7 +4913,7 @@ void lcd_wizard(WizState state)
break;
case S::Preheat:
menu_goto(lcd_preheat_menu,0,false,true);
- lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////c=20 r=6
+ lcd_show_fullscreen_message_and_wait_P(_i("Select nozzle preheat temperature which matches your material."));////MSG_SEL_PREHEAT_TEMP c=20 r=6
end = true; // Leave wizard temporarily for lcd_preheat_menu
break;
case S::LoadFilHot:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 7907d663..bf33017c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -745,7 +745,7 @@
#MSG_FORCE_SELFTEST c=20 r=8
"Selftest will be run to calibrate accurate sensorless rehoming."
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
#MSG_SET_TEMPERATURE c=19 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8f26f4b1..8af92c9e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Pro kalibraci presneho rehomovani bude nyni spusten selftest."
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index eea5426f..e661aaba 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Selbsttest im Gang, um die genaue Rueck- kehr zum Nullpunkt ohne Sensor zu kalibrieren"
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 3d6f703c..15ed89fc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Se realizara el auto-test para calibrar con precision la vuelta a la posicion inicial sin sensores."
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 705ffeaa..1659e6cf 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Le Selftest sera lance pour calibrer la remise a zero precise sans capteur"
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e814ddc8..bd183e65 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Verra effettuato un self test per calibrare l'homing senza sensori"
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 374f048b..a8dbdbbd 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zelftest zal worden uitgevoerd om nauwkeurige sensorloze auto positie te kalibreren."
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw materiaal."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7321389b..ef17eb6a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -994,7 +994,7 @@
"Selftest will be run to calibrate accurate sensorless rehoming."
"Zostanie uruchomiony Selftest aby dokladnie skalibrowac punkt bazowy bez krancowek"
-# c=20 r=6
+#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
"Wybierz temperature grzania dyszy odpowiednia dla materialu."
From 440ec49a36cf500892b32e8023b36e0e46c1b4d3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:38:33 +0200
Subject: [PATCH 131/254] Update #MSG_SETTINGS c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 15fcfa4a..03eed71b 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -97,7 +97,7 @@ const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors ");
const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
-const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////
+const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bf33017c..1f5f8131 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -760,7 +760,7 @@
# c=20
"Prusa i3 MK3 OK."
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
#MSG_SHOW_END_STOPS c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8af92c9e..e24a7b2d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Nastaveni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e661aaba..7d5bab6b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Einstellungen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 15ed89fc..63883c9b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Configuracion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1659e6cf..2d89cbc8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Reglages"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index bd183e65..d1d72b8b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Impostazioni"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a8dbdbbd..c9e174bb 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Instellingen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ef17eb6a..2411b776 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1014,7 +1014,7 @@
"Prusa i3 MK3 OK."
"\x00"
-#MSG_SETTINGS
+#MSG_SETTINGS c=18
"Settings"
"Ustawienia"
From c85ebb4aa356019ae71e6ed9022843e8709ce7a8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:40:26 +0200
Subject: [PATCH 132/254] Update #MSG_SORT c=7
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 03eed71b..a0be3a3f 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -141,7 +141,7 @@ 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"); ////
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
-const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////
+const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////
const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1f5f8131..f1acaf80 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -769,7 +769,7 @@
#MSG_FILE_CNT c=20 r=6
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
#MSG_NONE
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e24a7b2d..6e8dd7b2 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Nektere soubory nebudou setrideny. Maximalni pocet souboru ve slozce pro setrideni je 100."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Trideni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7d5bab6b..e9f5b94b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Einige Dateien wur- den nicht sortiert. Max. Dateien pro Verzeichnis = 100."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Sort."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 63883c9b..b5d8dfa0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Algunos archivos no se ordenaran. Maximo 100 archivos por carpeta para ordenar. "
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Ordenar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 2d89cbc8..728b8d52 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Certains fichiers ne seront pas tries. Max 100 fichiers tries par dossier."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Tri"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d1d72b8b..5a7e9c29 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Alcuni file non saranno ordinati. Il numero massimo di file in una cartella e 100 perche siano ordinati."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Ordina"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c9e174bb..8cde2aa6 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Sommige bestanden worden niet gesorteerd omdat het maximum aantal bestanden per map 100 is."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Sort."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 2411b776..90480824 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1026,7 +1026,7 @@
"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
"Niektore pliki nie zostana posortowane. Max. liczba plikow w 1 folderze = 100."
-#MSG_SORT
+#MSG_SORT c=7
"Sort"
"Sortowanie"
From 2ca8a23e4aa42ef5d06beba3dfabccf5d5d9a6b4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:42:53 +0200
Subject: [PATCH 133/254] Update #MSG_SORT_ALPHA c=8 #MSG_SORT_TIME c=8
---
Firmware/messages.c | 4 ++--
lang/lang_en.txt | 4 ++--
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, 18 insertions(+), 18 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index a0be3a3f..8657f06b 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -142,8 +142,8 @@ const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
-const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////
-const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////
+const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
+const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////c=8
const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////
const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////
const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f1acaf80..fd368966 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -775,13 +775,13 @@
#MSG_NONE
"None"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
#
"Severe skew:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
#MSG_SORTING c=20 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6e8dd7b2..baf43b67 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1034,7 +1034,7 @@
"None"
"Zadne"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Cas"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Tezke zkoseni:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"Abeceda"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e9f5b94b..19cde679 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1034,7 +1034,7 @@
"None"
"Ohne"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Zeit"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Schwer.Schr:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b5d8dfa0..24fcc715 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1034,7 +1034,7 @@
"None"
"Ninguno"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Fecha"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Incl.severa:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"Alfabet"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 728b8d52..1e08e8a2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1034,7 +1034,7 @@
"None"
"Aucun"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Heure"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Deviat.sev.:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5a7e9c29..d10c62d3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1034,7 +1034,7 @@
"None"
"Nessuno"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Cron."
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Devia.grave:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"Alfabeti"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8cde2aa6..ac56765f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1034,7 +1034,7 @@
"None"
"Geen"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Tijd"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Erg scheef:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"Alfabet"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 90480824..33ef144d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1034,7 +1034,7 @@
"None"
"Brak"
-#MSG_SORT_TIME
+#MSG_SORT_TIME c=8
"Time"
"Czas"
@@ -1042,7 +1042,7 @@
"Severe skew:"
"Znaczny skos:"
-#MSG_SORT_ALPHA
+#MSG_SORT_ALPHA c=8
"Alphabet"
"Alfab"
From 2ce5d3a840288c3f2cfc711fc05b9a5c703481e2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:44:13 +0200
Subject: [PATCH 134/254] Update #MSG_RPI_PORT c=13
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 8657f06b..7c104987 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -144,7 +144,7 @@ const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir");
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////c=8
-const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////
+const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////c=13
const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////
const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////
const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index fd368966..54726863 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -706,7 +706,7 @@
#MSG_BED_CORRECTION_RIGHT c=14 r=1
"Right side[um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
#MSG_WIZARD_RERUN c=20 r=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index baf43b67..7b8c498d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Vpravo [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 19cde679..53f5362f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Rechts [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 24fcc715..890a96c8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Derecha [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"Puerto RPi"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1e08e8a2..c1ff6535 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Droite [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"Port RPi"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d10c62d3..b1a098ea 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Destra [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"Porta RPi"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ac56765f..9cbd91f8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Recht.kant[um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 33ef144d..cda3bdd4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -942,7 +942,7 @@
"Right side[um]"
"Prawo [um]"
-#MSG_RPI_PORT
+#MSG_RPI_PORT c=13
"RPi port"
"Port RPi"
From e4ed1ffc171445a952df56baa86c4e93e86009d6 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:46:20 +0200
Subject: [PATCH 135/254] Update #MSG_SOUND c=9
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 7c104987..1253ca22 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -145,7 +145,7 @@ const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////c=8
const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////c=13
-const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////
+const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////c=9
const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////
const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////
const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 54726863..d2541d80 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -793,7 +793,7 @@
#
"Slight skew:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
# c=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7b8c498d..353f49c0 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Lehke zkoseni:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Zvuk"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 53f5362f..cbbb05f3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Leicht.Schr:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Ton"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 890a96c8..1c705439 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Liger.incl.:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Sonido"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c1ff6535..2eb7e5e7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Deviat.leg.:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Son"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b1a098ea..e45b8608 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Devia.lieve:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Suono"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9cbd91f8..08e3f69c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Iets scheef:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Geluid"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index cda3bdd4..ef62b73d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Lekki skos:"
-#MSG_SOUND
+#MSG_SOUND c=9
"Sound"
"Dzwiek"
From 4417deb9ea72f360de18b7f3d361697e5844625c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:50:21 +0200
Subject: [PATCH 136/254] Update #MSG_SOUND_BLIND c=7, #MSG_SOUND_LOUD c=7,
MSG_SOUND_ONCE c=7
---
Firmware/messages.c | 6 +++---
lang/lang_en.txt | 6 +++---
lang/lang_en_cz.txt | 6 +++---
lang/lang_en_de.txt | 6 +++---
lang/lang_en_es.txt | 6 +++---
lang/lang_en_fr.txt | 6 +++---
lang/lang_en_it.txt | 6 +++---
lang/lang_en_nl.txt | 6 +++---
lang/lang_en_pl.txt | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 1253ca22..4579e262 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -146,9 +146,9 @@ const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////c=8
const char MSG_RPI_PORT[] PROGMEM_I1 = ISTR("RPi port"); ////c=13
const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////c=9
-const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////
-const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////
-const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////
+const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////c=7
+const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////c=7
+const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////c=7
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
const char MSG_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d2541d80..47eedd2c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -793,7 +793,7 @@
#
"Slight skew:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
# c=7
@@ -802,7 +802,7 @@
#
"Some problem encountered, Z-leveling enforced ..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
#MSG_SPEED
@@ -1078,7 +1078,7 @@
#MSG_SHEET c=10
"Sheet"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
#MSG_STEEL_SHEET c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 353f49c0..239145b4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Lehke zkoseni:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Zvuk"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Vyskytl se problem, srovnavam osu Z ..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Jednou"
@@ -1438,7 +1438,7 @@
"Sheet"
"Plat"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"Asist."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index cbbb05f3..b1362c21 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Leicht.Schr:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Ton"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Fehler aufgetreten, Z-Kalibrierung erforderlich..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Einmal"
@@ -1438,7 +1438,7 @@
"Sheet"
"Stahlblech"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1c705439..54bc7d2c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Liger.incl.:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Sonido"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Problema encontrado, nivelacion Z forzosa ..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Una vez"
@@ -1438,7 +1438,7 @@
"Sheet"
"Lamina"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"Asistido"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 2eb7e5e7..c0f48142 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Deviat.leg.:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Son"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Une fois"
@@ -1438,7 +1438,7 @@
"Sheet"
"Plaque"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e45b8608..f0aa3cf2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Devia.lieve:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Suono"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Sono stati rilevati problemi, avviato livellamento Z ..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Singolo"
@@ -1438,7 +1438,7 @@
"Sheet"
"Piano"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"Assist."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 08e3f69c..530d16b8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Iets scheef:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Geluid"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Er is een probleem opgetreden, Z-kalibratie afgedwongen ..."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"Eenmaal"
@@ -1438,7 +1438,7 @@
"Sheet"
"Staalplaat"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ef62b73d..9107bcc7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1058,7 +1058,7 @@
"Slight skew:"
"Lekki skos:"
-#MSG_SOUND c=9
+#MSG_SOUND c=7
"Sound"
"Dzwiek"
@@ -1070,7 +1070,7 @@
"Some problem encountered, Z-leveling enforced ..."
"Wykryto problem, wymuszono poziomowanie osi Z."
-#MSG_SOUND_ONCE
+#MSG_SOUND_ONCE c=7
"Once"
"1-raz"
@@ -1438,7 +1438,7 @@
"Sheet"
"Plyta"
-#MSG_SOUND_BLIND
+#MSG_SOUND_BLIND c=7
"Assist"
"Asyst."
From c4f80642b3ed9913a17d5fe3f53f135b67ca83bd Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 09:52:52 +0200
Subject: [PATCH 137/254] Update #MSG_MAIN c=18
---
Firmware/messages.c | 2 +-
Firmware/ultralcd.cpp | 2 +-
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 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 4579e262..38e7782e 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -60,7 +60,7 @@ const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////c=2
const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number 1 to 5 is added behind text e.g. "Eject filament 1" c=16
const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); //// Number 1 to 5 is added behind text e.g. "Cut filament 1" c=16
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25
-const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////
+const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////c=18
const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 94da5468..8f223cec 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1454,7 +1454,7 @@ static uint16_t __attribute__((noinline)) clamp999(uint16_t v){
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! | Main | c=18 r=1
+//! | Main | MSG_MAIN c=18
//! | Last print | MSG_LAST_PRINT c=18
//! | Total | MSG_TOTAL c=6
//! | |
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 47eedd2c..9e86464f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -427,7 +427,7 @@
#MSG_M117_V2_CALIBRATION c=25
"M117 First layer cal."
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
#MSG_BL_HIGH c=12
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 239145b4..9c4454b4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Kal. prvni vrstvy"
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Hlavni nabidka"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b1362c21..ac95eec8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Erste-Schicht Kal."
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Hauptmenue"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 54bc7d2c..1a834fee 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Cal. primera cap."
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Menu principal"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c0f48142..ab0dfaa2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Cal. 1ere couche"
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Menu principal"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index f0aa3cf2..40356aaa 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Calibr. primo strato"
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Menu principale"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 530d16b8..4df8712e 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Eerste laag kal."
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Hoofdmenu"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9107bcc7..b76afa7a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -570,7 +570,7 @@
"M117 First layer cal."
"M117 Kal. 1. warstwy"
-#MSG_MAIN
+#MSG_MAIN c=18
"Main"
"Menu glowne"
From b465c963279eb5542877fc30109cebd48a70ac88 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:13:09 +0200
Subject: [PATCH 138/254] Update #MSG_NONE c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 38e7782e..b18006b4 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -129,7 +129,7 @@ const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////
const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////
const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
-const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////
+const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////
const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 9e86464f..a823cfc4 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -772,7 +772,7 @@
#MSG_SORT c=7
"Sort"
-#MSG_NONE
+#MSG_NONE c=8
"None"
#MSG_SORT_TIME c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9c4454b4..8d5e0c60 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Trideni"
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Zadne"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index ac95eec8..e6e5c970 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Sort."
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Ohne"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1a834fee..1a140665 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Ordenar"
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Ninguno"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ab0dfaa2..424787a8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Tri"
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Aucun"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 40356aaa..7688ec6b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Ordina"
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Nessuno"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 4df8712e..eb1a2dc1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Sort."
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Geen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b76afa7a..5f744214 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1030,7 +1030,7 @@
"Sort"
"Sortowanie"
-#MSG_NONE
+#MSG_NONE c=8
"None"
"Brak"
From f60ba6de87faa882b876e2325aec029f5e04bb0d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:13:56 +0200
Subject: [PATCH 139/254] Update #MSG_WARN c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index b18006b4..1a4e3f4c 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -130,7 +130,7 @@ const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////
const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
-const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////
+const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////
const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////
const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a823cfc4..fc2e1499 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1006,7 +1006,7 @@
#MSG_STRICT
"Strict"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
#MSG_HW_SETUP c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8d5e0c60..250d7ba8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Prisne"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Varovat"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e6e5c970..d4217ba1 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Strikt"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Warnen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1a140665..8557a1a6 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Estrict"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Aviso"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 424787a8..a5e6756a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Stricte"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Avert"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7688ec6b..7ba5c826 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Esatto"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Avviso"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index eb1a2dc1..8a11ea08 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Strikt"
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 5f744214..407b490b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1342,7 +1342,7 @@
"Strict"
"Restr."
-#MSG_WARN
+#MSG_WARN c=8
"Warn"
"Ostrzez"
From 5b843c3a4d2e6dcd3736f8cc71a19e10940aa220 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:14:49 +0200
Subject: [PATCH 140/254] Update #MSG_STRICT c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 1a4e3f4c..23ce1c2d 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -131,7 +131,7 @@ const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
-const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////
+const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////c=8
const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////
const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////
const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index fc2e1499..e66a5f46 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1003,7 +1003,7 @@
#MSG_FIRMWARE
"Firmware"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
#MSG_WARN c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 250d7ba8..2f51baf4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Prisne"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d4217ba1..cfb52af8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Strikt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8557a1a6..cc56b637 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Estrict"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a5e6756a..0111a634 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Stricte"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7ba5c826..0e6d56c1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Esatto"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8a11ea08..5027c539 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Strikt"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 407b490b..75a1cc6b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1338,7 +1338,7 @@
"Firmware"
"\x00"
-#MSG_STRICT
+#MSG_STRICT c=8
"Strict"
"Restr."
From 39b8a35f3aa6d78eb4e8f34d552f058bd970bfcb Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:15:48 +0200
Subject: [PATCH 141/254] Update #MSG_MODEL c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 23ce1c2d..7953a8f6 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -132,7 +132,7 @@ const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////c=8
-const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////
+const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////c=8
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
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e66a5f46..4bb798ae 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1027,7 +1027,7 @@
#
"Mode change in progress ..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
#MSG_NOZZLE_DIAMETER
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2f51baf4..7443e028 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Probiha zmena modu..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index cfb52af8..58881e34 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Moduswechsel erfolgt..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"Modell"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index cc56b637..5a42d97b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Cambio de modo progresando ..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"Modelo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0111a634..9e8ddb74 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Changement de mode en cours..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"Modele"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0e6d56c1..6e1163c7 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Cambio modalita in corso ..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"Modello"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5027c539..38ee2904 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Moduswijziging bezig..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 75a1cc6b..178fc926 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1370,7 +1370,7 @@
"Mode change in progress ..."
"Trwa zmiana trybu..."
-#MSG_MODEL
+#MSG_MODEL c=8
"Model"
"\x00"
From 0a634f7d481ce09fe4e64f7930e135c783dbc8dd Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:16:31 +0200
Subject: [PATCH 142/254] Update #MSG_FIRMWARE c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 7953a8f6..7473cf59 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -133,7 +133,7 @@ const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////c=8
const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////c=8
-const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////
+const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////c=8
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=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4bb798ae..ecbc1e3c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1000,7 +1000,7 @@
#
"FINDA"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
#MSG_STRICT c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7443e028..324a96f0 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 58881e34..b3688b40 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5a42d97b..988ff39b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 9e8ddb74..80f832b9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6e1163c7..b603c318 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 38ee2904..0957d58a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1334,7 +1334,7 @@
"FINDA:"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 178fc926..73a0d6fe 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1334,7 +1334,7 @@
"FINDA"
"\x00"
-#MSG_FIRMWARE
+#MSG_FIRMWARE c=8
"Firmware"
"\x00"
From 532c7438d8b3c6ea919a420c1dd3688f392fdcdd Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:19:00 +0200
Subject: [PATCH 143/254] Update #MSG_NOZZLE_DIAMETER c=10, MSG_GCODE c=8
---
Firmware/messages.c | 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/messages.c b/Firmware/messages.c
index 7473cf59..9077ac19 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -134,10 +134,10 @@ const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
const char MSG_STRICT[] PROGMEM_I1 = ISTR("Strict"); ////c=8
const char MSG_MODEL[] PROGMEM_I1 = ISTR("Model"); ////c=8
const char MSG_FIRMWARE[] PROGMEM_I1 = ISTR("Firmware"); ////c=8
-const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////
+const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////c=8
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=8
-const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////
+const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////c=10
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ecbc1e3c..1567da03 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1030,7 +1030,7 @@
#MSG_MODEL c=8
"Model"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
# c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 324a96f0..bf48c0f5 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1374,7 +1374,7 @@
"Model"
"\x00"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Tryska"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b3688b40..61d5ee42 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1374,7 +1374,7 @@
"Model"
"Modell"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Duese D."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 988ff39b..f053d4d8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1374,7 +1374,7 @@
"Model"
"Modelo"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Diam. nozzl"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 80f832b9..ce25ea58 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1374,7 +1374,7 @@
"Model"
"Modele"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Diam. buse"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b603c318..6f7fbe4b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1374,7 +1374,7 @@
"Model"
"Modello"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Diam.Ugello"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0957d58a..bf284b31 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1374,7 +1374,7 @@
"Model"
"\x00"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Tuit d."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 73a0d6fe..9199d6fa 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1374,7 +1374,7 @@
"Model"
"\x00"
-#MSG_NOZZLE_DIAMETER
+#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
"Sr. dyszy"
From e8c3ba89dc9f24111a114fc91b3c74523ccf0e01 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:23:29 +0200
Subject: [PATCH 144/254] Update #MSG_MMU_MODE c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 9077ac19..35480c02 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -138,7 +138,7 @@ const char MSG_GCODE[] PROGMEM_I1 = ISTR("Gcode"); ////c=8
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=8
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////c=10
-const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////
+const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////c=8
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1567da03..324e7f37 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1021,7 +1021,7 @@
#
"MK3S firmware detected on MK3 printer"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bf48c0f5..e190bfe8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"MK3S firmware detekovan na tiskarne MK3"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"MMU mod"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 61d5ee42..de86c5b2 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"MK3S-Firmware auf MK3-Drucker erkannt"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"MMU Modus"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f053d4d8..37c79419 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"Firmware MK3S detectado en impresora MK3"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"Modo MMU"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ce25ea58..a335cfbb 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"Firmware MK3S detecte sur imprimante MK3"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"Mode MMU"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6f7fbe4b..c80fcbb4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"Firmware MK3S rilevato su stampante MK3"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"Mod. MMU"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index bf284b31..525399d2 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"MK3S-firmware op MK3-printer ontdekt"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"MMU Mod"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9199d6fa..c7e2c40d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1362,7 +1362,7 @@
"MK3S firmware detected on MK3 printer"
"Wykryto firmware MK3S w drukarce MK3"
-#MSG_MMU_MODE
+#MSG_MMU_MODE c=8
"MMU Mode"
"Tryb MMU"
From 3367d7f8fa1b0c385696bafc3cdd0b032cf33378 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:24:45 +0200
Subject: [PATCH 145/254] Update #MSG_SD_CARD c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 35480c02..6ad30e3d 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -139,7 +139,7 @@ const char MSG_GCODE_DIFF_PRINTER_CONTINUE[] PROGMEM_I1 = ISTR("G-code sliced fo
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=8
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////c=10
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////c=8
-const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////
+const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////c=8
const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 324e7f37..6269b9fa 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -712,7 +712,7 @@
#MSG_WIZARD_RERUN c=20 r=7
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e190bfe8..46c18479 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Spusteni Pruvodce vymaze ulozene vysledky vsech kalibraci a spusti kalibracni proces od zacatku. Pokracovat?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index de86c5b2..016594b9 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Der Assistent wird die aktuellen Kalibrierungsdaten loeschen und von vorne beginnen. Weiterfahren?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"SD Karte"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 37c79419..1dbc328f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Ejecutar el Wizard borrara los valores de calibracion actuales y comenzara de nuevo. Continuar?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"Tarj. SD"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a335cfbb..119c3ba6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Lancement de l'Assistant supprimera les resultats actuels de calibration et commencera du debut. Continuer?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"Carte SD"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c80fcbb4..98206e44 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Se avvi il Wizard perderai la calibrazione preesistente e dovrai ricominciare dall'inizio. Continuare?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"Mem. SD"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 525399d2..44801295 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Starten van de Wizard verwijdert de huidige kalibreringsresultaten en begint vanaf het begin. Doorgaan?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"SD kaart"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c7e2c40d..9902dab7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -950,7 +950,7 @@
"Running Wizard will delete current calibration results and start from the beginning. Continue?"
"Wlaczenie Asystenta usunie obecne dane kalibracyjne i zacznie od poczatku. Kontynuowac?"
-#MSG_SD_CARD
+#MSG_SD_CARD c=8
"SD card"
"Karta SD"
From bc8a23a0c6c5630dd15c5ee3ea7da38bf08b5147 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:25:35 +0200
Subject: [PATCH 146/254] Update #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 6ad30e3d..6bc4c806 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -140,7 +140,7 @@ const char MSG_GCODE_DIFF_PRINTER_CANCELLED[] PROGMEM_I1 =ISTR("G-code sliced fo
const char MSG_NOZZLE_DIAMETER[] PROGMEM_I1 = ISTR("Nozzle d."); ////c=10
const char MSG_MMU_MODE[] PROGMEM_I1 = ISTR("MMU Mode"); ////c=8
const char MSG_SD_CARD[] PROGMEM_I1 = ISTR("SD card"); ////c=8
-const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////
+const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_I1 = ISTR("FlashAir"); ////c=8
const char MSG_SORT[] PROGMEM_I1 = ISTR("Sort"); ////c=7
const char MSG_SORT_TIME[] PROGMEM_I1 = ISTR("Time"); ////c=8
const char MSG_SORT_ALPHA[] PROGMEM_I1 = ISTR("Alphabet"); ////c=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6269b9fa..65439b21 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -715,7 +715,7 @@
#MSG_SD_CARD c=8
"SD card"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
#MSG_RIGHT c=10
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 46c18479..50d8d046 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -954,7 +954,7 @@
"SD card"
"\x00"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 016594b9..e17b758b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -954,7 +954,7 @@
"SD card"
"SD Karte"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1dbc328f..1ba4ccab 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -954,7 +954,7 @@
"SD card"
"Tarj. SD"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 119c3ba6..d2fff750 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -954,7 +954,7 @@
"SD card"
"Carte SD"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"FlshAir"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 98206e44..1533bd48 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -954,7 +954,7 @@
"SD card"
"Mem. SD"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 44801295..9a36b797 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -954,7 +954,7 @@
"SD card"
"SD kaart"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9902dab7..8a919a19 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -954,7 +954,7 @@
"SD card"
"Karta SD"
-#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY
+#MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY c=8
"FlashAir"
"\x00"
From 7e2c272839b6b7322648381f7994c6198c9a6ca6 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:27:02 +0200
Subject: [PATCH 147/254] Update #MSG_MESH c=12
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 6bc4c806..0e79df68 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -149,7 +149,7 @@ const char MSG_SOUND[] PROGMEM_I1 = ISTR("Sound"); ////c=9
const char MSG_SOUND_LOUD[] PROGMEM_I1 = ISTR("Loud"); ////c=7
const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////c=7
const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////c=7
-const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////
+const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////c=12
const char MSG_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 65439b21..9a8ccce6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1015,7 +1015,7 @@
#MSG_MAGNETS_COMP
"Magnets comp."
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 50d8d046..e00c2e3f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Komp. magnetu"
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e17b758b..62ca27f5 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Magnet Komp."
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"Gitter"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1ba4ccab..5dc59676 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Comp. imanes"
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"Malla"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d2fff750..117e8496 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Compens. aim."
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1533bd48..1429abbb 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Comp. Magneti"
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"Griglia"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9a36b797..32fd1b7c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Magnet. comp."
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8a919a19..aa6273f0 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1354,7 +1354,7 @@
"Magnets comp."
"Kor. magnesow"
-#MSG_MESH
+#MSG_MESH c=12
"Mesh"
"Siatka"
From 12372d65252431c43ea17824b81e402e08888b4e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:28:43 +0200
Subject: [PATCH 148/254] Update #MSG_Z_PROBE_NR c=14
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 0e79df68..fee4f7de 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -151,7 +151,7 @@ const char MSG_SOUND_ONCE[] PROGMEM_I1 = ISTR("Once"); ////c=7
const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////c=7
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////c=12
const char MSG_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18
-const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////
+const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////c=14
const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////c=5
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 9a8ccce6..29328d84 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1087,6 +1087,6 @@
#MSG_Z_CORRECTION c=13
"Z-correct:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e00c2e3f..edaf2e3a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Korekce Z:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Pocet mereni Z"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 62ca27f5..73d0c315 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Z-Korrektur:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5dc59676..ffae4263 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Corregir-Z:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Z-sensor nr."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 117e8496..df497033 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Correct-Z:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Mesurer x-fois"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1429abbb..98034618 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Correzione-Z:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Nr. Z-test"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 32fd1b7c..f338e274 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Z-correctie:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index aa6273f0..8c6e0ae8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1450,7 +1450,7 @@
"Z-correct:"
"Korekcja-Z:"
-#MSG_Z_PROBE_NR
+#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Ilosc Pomiarow"
From 5eb14dc433e9209f1d25289d6207dc2049dbae99 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:29:56 +0200
Subject: [PATCH 149/254] Update #MSG_MAGNETS_COMP c=13
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index fee4f7de..52e28ddc 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -152,7 +152,7 @@ const char MSG_SOUND_BLIND[] PROGMEM_I1 = ISTR("Assist"); ////c=7
const char MSG_MESH[] PROGMEM_I1 = ISTR("Mesh"); ////c=12
const char MSG_MESH_BED_LEVELING[] PROGMEM_I1 = ISTR("Mesh Bed Leveling"); ////c=18
const char MSG_Z_PROBE_NR[] PROGMEM_I1 = ISTR("Z-probe nr."); ////c=14
-const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////
+const char MSG_MAGNETS_COMP[] PROGMEM_I1 = ISTR("Magnets comp."); ////c=13
const char MSG_FS_ACTION[] PROGMEM_I1 = ISTR("FS Action"); ////c=10
const char MSG_FS_CONTINUE[] PROGMEM_I1 = ISTR("Cont."); ////c=5
const char MSG_FS_PAUSE[] PROGMEM_I1 = ISTR("Pause"); ////c=5
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 29328d84..0c28f2c1 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1012,7 +1012,7 @@
#MSG_HW_SETUP c=18
"HW Setup"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
#MSG_MESH c=12
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index edaf2e3a..cce6000d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"HW nastaveni"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Komp. magnetu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 73d0c315..54e00100 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"HW Einstellungen"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Magnet Komp."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ffae4263..becfacb6 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"Configuracion HW"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Comp. imanes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index df497033..3d4f931e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"Config HW"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Compens. aim."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 98034618..83228087 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"Impostazioni HW"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Comp. Magneti"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f338e274..66f8f6a3 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"HW Configuratie"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Magnet. comp."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8c6e0ae8..9469d897 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1350,7 +1350,7 @@
"HW Setup"
"Ustawienia HW"
-#MSG_MAGNETS_COMP
+#MSG_MAGNETS_COMP c=13
"Magnets comp."
"Kor. magnesow"
From 610ba9bc4581f584fe0de2bdd1645dd196373544 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:31:18 +0200
Subject: [PATCH 150/254] Update #MSG_CARD_MENU c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 52e28ddc..6e2ac057 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -19,7 +19,7 @@ const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
-const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////
+const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=18
const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20
const char MSG_CHECKING_Y[] PROGMEM_I1 = ISTR("Checking Y axis"); ////c=20
const char MSG_COMMUNITY_MADE[] PROGMEM_I1 = ISTR("Community made"); ////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0c28f2c1..0bd156e2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -643,7 +643,7 @@
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
"Print fan:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cce6000d..69f9d58f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -858,7 +858,7 @@
"Print fan:"
"Tiskovy vent.:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Tisk z SD"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 54e00100..f1f24195 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -858,7 +858,7 @@
"Print fan:"
"Druckvent.:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Drucken von SD"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index becfacb6..25f7b383 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -858,7 +858,7 @@
"Print fan:"
"Vent.fusor:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Menu tarjeta SD"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3d4f931e..0fc5aac8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -858,7 +858,7 @@
"Print fan:"
"Vent. impr:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Impr. depuis la SD"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 83228087..3175167f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -858,7 +858,7 @@
"Print fan:"
"Vent.stam:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Stampa da SD"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 66f8f6a3..a8866da1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -858,7 +858,7 @@
"Print fan:"
"\x00"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Print van SD"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9469d897..af15cb99 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -858,7 +858,7 @@
"Print fan:"
"WentWydruk:"
-#MSG_CARD_MENU
+#MSG_CARD_MENU c=18
"Print from SD"
"Druk z karty SD"
From a878056be3b430402911b8238eaa3596dc5bf9b9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:32:04 +0200
Subject: [PATCH 151/254] Update MSG_BACK c=18
---
Firmware/messages.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 6e2ac057..62ac6e84 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -61,7 +61,7 @@ const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); //// Number
const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); //// Number 1 to 5 is added behind text e.g. "Cut filament 1" c=16
const char MSG_M117_V2_CALIBRATION[] PROGMEM_I1 = ISTR("M117 First layer cal."); ////c=25
const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////c=18
-const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////
+const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////c=18
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60
From 54f594238b998b2510cb770b1431daafa7ed8135 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:33:15 +0200
Subject: [PATCH 152/254] Update #MSG_NOZZLE c=12
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 62ac6e84..b13121ee 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -70,7 +70,7 @@ const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=15
const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
-const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////
+const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 0bd156e2..d561dcc2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -535,7 +535,7 @@
#MSG_WIZARD_WILL_PREHEAT c=20 r=4
"Now I will preheat nozzle for PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 69f9d58f..87b7af47 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Nyni predehreji trysku pro PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Tryska"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f1f24195..f6da0639 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Jetzt werde ich die Duese fuer PLA vorheizen."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Duese"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 25f7b383..8c2c41d8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Ahora precalentare la boquilla para PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Boquilla"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0fc5aac8..c25e31c9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Maintenant je vais prechauffer la buse pour du PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Buse"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3175167f..261fd4c1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Adesso preriscaldero l'ugello per PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Ugello"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a8866da1..a76e5a4b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Opwarmen van de tuit voor PLA voor."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Tuit"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index af15cb99..386f915b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -714,7 +714,7 @@
"Now I will preheat nozzle for PLA."
"Nagrzewam dysze dla PLA."
-#MSG_NOZZLE
+#MSG_NOZZLE c=12
"Nozzle"
"Dysza"
From 557486ee0b1e6ec77072d987dc7a0c53f8500bc4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:34:00 +0200
Subject: [PATCH 153/254] Update MSG_REFRESH c=18
---
Firmware/messages.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index b13121ee..bf9510b9 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -81,7 +81,7 @@ const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unl
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("\x04" "Refresh"); ////
+const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\x04" "Refresh"); ////c=18
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
From 35b000faea16ddc7d54ff22400dd02f417950e60 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:34:36 +0200
Subject: [PATCH 154/254] Update MSG_RESUMING_PRINT c=20
---
Firmware/messages.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index bf9510b9..96067a92 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -85,7 +85,7 @@ const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\x04" "Refresh"); ////c=18
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_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=20
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
From e6ea843e623d7268296876c95c4426d0f1946f70 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:36:39 +0200
Subject: [PATCH 155/254] Update #MSG_SELFTEST_MOTOR c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 96067a92..1ae50310 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -94,7 +94,7 @@ const char MSG_SELFTEST_FAN_NO[] PROGMEM_I1 = ISTR("Not spinning"); ////c=19
const char MSG_SELFTEST_FAN_YES[] PROGMEM_I1 = ISTR("Spinning"); ////c=19
const char MSG_SELFTEST_CHECK_BED[] PROGMEM_I1 = ISTR("Checking bed "); ////c=20
const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors "); ////c=20
-const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////
+const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////c=18
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d561dcc2..1a075990 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -493,7 +493,7 @@
#
"MMU2 connected"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
#MSG_MOVE_AXIS
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 87b7af47..edbc29e6 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 pripojeno"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f6da0639..466560d9 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 verbunden"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8c2c41d8..2459d3a4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 conectado"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c25e31c9..18444f42 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 connecte"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"Moteur"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 261fd4c1..1afa58bf 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 connessa"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"Motore"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a76e5a4b..cd60d3f8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU2 verbonden"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 386f915b..640f6f43 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -658,7 +658,7 @@
"MMU2 connected"
"MMU podlaczone"
-#MSG_SELFTEST_MOTOR
+#MSG_SELFTEST_MOTOR c=18
"Motor"
"Silnik"
From 2a08a6e441015ea18d07398710e8f67f2e31a43e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:37:50 +0200
Subject: [PATCH 156/254] Update #MSG_SELFTEST_WIRINGERROR c=17
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 1ae50310..08d64695 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -96,7 +96,7 @@ const char MSG_SELFTEST_CHECK_BED[] PROGMEM_I1 = ISTR("Checking bed "); ////
const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors "); ////c=20
const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////c=18
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
-const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////
+const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////c=17
const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1a075990..032bb36c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -919,7 +919,7 @@
#MSG_UNLOAD_SUCCESSFUL c=20 r=2
"Was filament unload successful?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
#MSG_WIZARD c=17 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index edbc29e6..111fe492 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Bylo vysunuti filamentu uspesne?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Chyba zapojeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 466560d9..398d99ed 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Konnten Sie das Filament entnehmen?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Verdrahtungsfehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2459d3a4..1185a926 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"?Se cargocon exito el filamento?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Error de conexion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 18444f42..e4a93177 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Dechargement du filament reussi?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Erreur de cablage"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1afa58bf..50a252a3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Filamento scaricato con successo?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Errore cablaggio"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index cd60d3f8..8d188876 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Is filament succes- vol verwijderd?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Aansluitingsfout"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 640f6f43..dc519b5d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1226,7 +1226,7 @@
"Was filament unload successful?"
"Rozladowanie fil. ok?"
-#MSG_SELFTEST_WIRINGERROR
+#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
"Blad polaczenia"
From dc56b74263c05373bdde5c4f73a803a7d26c3cfc Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:39:43 +0200
Subject: [PATCH 157/254] Update #MSG_MODE c=9
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 08d64695..72692716 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -101,7 +101,7 @@ const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
-const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////
+const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=9
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////
const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////
const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 032bb36c..f7912f1f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -463,7 +463,7 @@
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
# c=20 r=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 111fe492..bc2fd5b1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Pokracuji..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Mod"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 398d99ed..f2f88133 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Weiterdrucken..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Modus"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1185a926..a7e67ee5 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Resumiendo..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Modo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e4a93177..2fac6a3f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Reprise ..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 50a252a3..41865096 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Riprendendo... "
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Mod."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 8d188876..feda6a5f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Hervatten..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Stand"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index dc519b5d..0830b4cd 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Wznawianie..."
-#MSG_MODE
+#MSG_MODE c=9
"Mode"
"Tryb"
From afabfa789d946a071beb5960d8e68cfce7c39a04 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:41:09 +0200
Subject: [PATCH 158/254] Update #MSG_MODE c=6
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 72692716..c441f978 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -101,7 +101,7 @@ const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
-const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=9
+const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=6
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////
const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////
const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f7912f1f..f018bee6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -463,7 +463,7 @@
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
# c=20 r=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bc2fd5b1..0ca6a2cc 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Pokracuji..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Mod"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index f2f88133..d81e2eaa 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Weiterdrucken..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Modus"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index a7e67ee5..212dcb14 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Resumiendo..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Modo"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 2fac6a3f..5d089b4d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Reprise ..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 41865096..8c99e091 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Riprendendo... "
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Mod."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index feda6a5f..6d596f11 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Hervatten..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Stand"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 0830b4cd..f26c206e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -618,7 +618,7 @@
"MMU OK. Resuming..."
"MMU OK. Wznawianie..."
-#MSG_MODE c=9
+#MSG_MODE c=6
"Mode"
"Tryb"
From 877151988033012d6bd46c88d8fa45521a1f1a21 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:41:51 +0200
Subject: [PATCH 159/254] Update #MSG_HIGH_POWER c=10
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index c441f978..e02dbc5c 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -102,7 +102,7 @@ const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=6
-const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////
+const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////c=10
const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////
const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////
const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f018bee6..fedf19a6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -487,7 +487,7 @@
#MSG_AUTO_POWER
"Auto power"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0ca6a2cc..9ae8e088 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -650,7 +650,7 @@
"Auto power"
"Automaticky"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Vys. vykon"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d81e2eaa..03d70fa4 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -650,7 +650,7 @@
"Auto power"
"Auto Leist"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Hohe leist"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 212dcb14..7ceb621b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -650,7 +650,7 @@
"Auto power"
"Fuerza auto"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Rend.pleno"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 5d089b4d..cfac87c9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -650,7 +650,7 @@
"Auto power"
"Puiss.auto"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Haute puiss"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8c99e091..6b2381ad 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -650,7 +650,7 @@
"Auto power"
"Auto"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Forte"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6d596f11..29074411 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -650,7 +650,7 @@
"Auto power"
"\x00"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Hoog verm."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index f26c206e..4a281db9 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -650,7 +650,7 @@
"Auto power"
"Automatycz"
-#MSG_HIGH_POWER
+#MSG_HIGH_POWER c=10
"High power"
"Wysoka wyd."
From 3d848328edfd241f5f9595a835a5c36b604ae4af Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:42:33 +0200
Subject: [PATCH 160/254] Update #MSG_AUTO_POWER c=10
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index e02dbc5c..87beeee5 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -103,7 +103,7 @@ const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=6
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////c=10
-const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////
+const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////c=10
const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////
const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////
const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index fedf19a6..8c4aa32e 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -484,7 +484,7 @@
#MSG_STEALTH
"Stealth"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
#MSG_HIGH_POWER c=10
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9ae8e088..1134905f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -646,7 +646,7 @@
"Stealth"
"Tichy"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Automaticky"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 03d70fa4..800fd8ce 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -646,7 +646,7 @@
"Stealth"
"\x00"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Auto Leist"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 7ceb621b..456a00e2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -646,7 +646,7 @@
"Stealth"
"Silencio"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Fuerza auto"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cfac87c9..cb74f965 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -646,7 +646,7 @@
"Stealth"
"Furtif"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Puiss.auto"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6b2381ad..ca0a7977 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -646,7 +646,7 @@
"Stealth"
"Silenziosa"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Auto"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 29074411..aee60842 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -646,7 +646,7 @@
"Stealth"
"\x00"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4a281db9..fa0b8972 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -646,7 +646,7 @@
"Stealth"
"Cichy"
-#MSG_AUTO_POWER
+#MSG_AUTO_POWER c=10
"Auto power"
"Automatycz"
From 46367c2a33945308d164abeebef4907f4f525ee7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:46:37 +0200
Subject: [PATCH 161/254] Update #MSG_STEALTH c=7, #MSG_SILENT c=7, #MSG_NORMAL
c=7
---
Firmware/messages.c | 6 +++---
lang/lang_en.txt | 6 +++---
lang/lang_en_cz.txt | 6 +++---
lang/lang_en_de.txt | 6 +++---
lang/lang_en_es.txt | 6 +++---
lang/lang_en_fr.txt | 6 +++---
lang/lang_en_it.txt | 6 +++---
lang/lang_en_nl.txt | 6 +++---
lang/lang_en_pl.txt | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 87beeee5..98cef005 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -104,9 +104,9 @@ const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); ////c=18
const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); ////c=6
const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); ////c=10
const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); ////c=10
-const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////
-const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////
-const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////
+const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////c=7
+const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////c=7
+const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////c=7
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 8c4aa32e..39a78ba4 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -469,10 +469,10 @@
# c=20 r=3
"MK3 firmware detected on MK3S printer"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
# c=20 r=3
@@ -481,7 +481,7 @@
#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
#MSG_AUTO_POWER c=10
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 1134905f..be892d4a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"\x00"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"\x00"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Tichy"
@@ -642,7 +642,7 @@
"MMU power fails"
"MMU vypadky proudu"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"Tichy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 800fd8ce..7f60bf89 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"MK3-Firmware am MK3S-Drucker erkannt"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"\x00"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Leise"
@@ -642,7 +642,7 @@
"MMU power fails"
"MMU Netzfehler"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 456a00e2..1a2abbff 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"Firmware MK3 detectado en impresora MK3S"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"\x00"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Silencio"
@@ -642,7 +642,7 @@
"MMU power fails"
"Fallo de energia en MMU"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"Silencio"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cb74f965..4b5cf2c1 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"Firmware MK3 detecte sur imprimante MK3S"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"\x00"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Furtif"
@@ -642,7 +642,7 @@
"MMU power fails"
"Echecs alim. MMU"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"Furtif"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ca0a7977..0ff687ca 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"Firmware MK3 rilevato su stampante MK3S"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"Normale"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Silenzioso"
@@ -642,7 +642,7 @@
"MMU power fails"
"Manc. corr. MMU"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"Silenziosa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index aee60842..c5f4738b 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"MK3-firmware bij MK3S-printer gedetecteerd"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"Normaal"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Stil"
@@ -642,7 +642,7 @@
"MMU power fails"
"MMU stroomstor."
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index fa0b8972..417b4807 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -626,11 +626,11 @@
"MK3 firmware detected on MK3S printer"
"Wykryto firmware MK3 w drukarce MK3S"
-#MSG_NORMAL
+#MSG_NORMAL c=7
"Normal"
"Normalni"
-#MSG_SILENT
+#MSG_SILENT c=7
"Silent"
"Cichy"
@@ -642,7 +642,7 @@
"MMU power fails"
"Zaniki zasil. MMU"
-#MSG_STEALTH
+#MSG_STEALTH c=7
"Stealth"
"Cichy"
From a9ed5139790e0906c40847e3940e012b86f3ae37 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:48:06 +0200
Subject: [PATCH 162/254] Update #MSG_STOP_PRINT c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 98cef005..2f350bb7 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -108,7 +108,7 @@ const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); ////c=7
const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////c=7
const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////c=7
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
-const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////
+const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=18
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 39a78ba4..3b12d35b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -817,7 +817,7 @@
#MSG_STATISTICS
"Statistics "
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
#MSG_STOPPED
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index be892d4a..85140bd4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statistika "
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Zastavit tisk"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7f60bf89..e540818a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statistiken "
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Druck abbrechen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1a2abbff..dc611549 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Estadisticas "
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Detener impresion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4b5cf2c1..a1a56f71 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statistiques"
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Arreter impression"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0ff687ca..784dd705 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statistiche"
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Arresta stampa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c5f4738b..b0e8adfc 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statistieken"
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Print stoppen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 417b4807..66122f51 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1090,7 +1090,7 @@
"Statistics "
"Statystyki"
-#MSG_STOP_PRINT
+#MSG_STOP_PRINT c=18
"Stop print"
"Przerwanie druku"
From d1813890a87710ea227562ab7a0e971d2eab62eb Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:49:02 +0200
Subject: [PATCH 163/254] Update #MSG_STOPPED c=20
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 2f350bb7..b39e96ca 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -109,7 +109,7 @@ const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); ////c=7
const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); ////c=7
const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2
const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=18
-const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////
+const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////c=20
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3b12d35b..6893bc8b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -820,7 +820,7 @@
#MSG_STOP_PRINT c=18
"Stop print"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
#MSG_SUPPORT
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 85140bd4..419aa055 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Zastavit tisk"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"ZASTAVENO."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e540818a..0bc640db 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Druck abbrechen"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"GESTOPPT."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index dc611549..ca66f156 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Detener impresion"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"PARADA"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a1a56f71..d1a1280a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Arreter impression"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"ARRETE."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 784dd705..364a108f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Arresta stampa"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"ARRESTATO."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b0e8adfc..51a8715e 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Print stoppen"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"GESTOPT. "
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 66122f51..914fef0e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1094,7 +1094,7 @@
"Stop print"
"Przerwanie druku"
-#MSG_STOPPED
+#MSG_STOPPED c=20
"STOPPED. "
"ZATRZYMANO."
From ddf47a3cacb2bb4f48cb972319b0f2ee78066155 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:51:31 +0200
Subject: [PATCH 164/254] Update #MSG_NA c=3, #MSG_OFF c=3, #MSG_ON c=3
---
Firmware/messages.c | 6 +++---
lang/lang_en.txt | 6 +++---
lang/lang_en_cz.txt | 6 +++---
lang/lang_en_de.txt | 6 +++---
lang/lang_en_es.txt | 6 +++---
lang/lang_en_fr.txt | 6 +++---
lang/lang_en_it.txt | 6 +++---
lang/lang_en_nl.txt | 6 +++---
lang/lang_en_pl.txt | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index b39e96ca..3e134dc9 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -124,9 +124,9 @@ const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Origin
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
-const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////
-const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////
-const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////
+const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////c=3
+const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////c=3
+const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////c=3
const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6893bc8b..098db57f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -514,7 +514,7 @@
#MSG_NO_CARD
"No SD card"
-#MSG_NA
+#MSG_NA c=3
"N/A"
#MSG_NO
@@ -982,10 +982,10 @@
#MSG_Y_CORRECTION c=13
"Y-correct:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
-#MSG_ON
+#MSG_ON c=3
"On"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 419aa055..c7a9c598 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -686,7 +686,7 @@
"No SD card"
"Zadna SD karta"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"\x00"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Korekce Y:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"Vyp"
-#MSG_ON
+#MSG_ON c=3
"On"
"Zap"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 0bc640db..40e3ba01 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -686,7 +686,7 @@
"No SD card"
"Keine SD Karte"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"N/V"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Y-Korrektur:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"Aus"
-#MSG_ON
+#MSG_ON c=3
"On"
"An"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ca66f156..b1eb5bb5 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -686,7 +686,7 @@
"No SD card"
"No hay tarjeta SD"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"N/A"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Corregir-Y:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"Ina"
-#MSG_ON
+#MSG_ON c=3
"On"
"Act"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d1a1280a..71840fb6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -686,7 +686,7 @@
"No SD card"
"Pas de carte SD"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"\x00"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Correct-Y:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"\x00"
-#MSG_ON
+#MSG_ON c=3
"On"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 364a108f..8fdae562 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -686,7 +686,7 @@
"No SD card"
"Nessuna SD"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"N/D"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Correzione-Y:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"\x00"
-#MSG_ON
+#MSG_ON c=3
"On"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 51a8715e..2e03f34c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -686,7 +686,7 @@
"No SD card"
"Geen SD kaart"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"N/V"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Y-correctie:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"Uit"
-#MSG_ON
+#MSG_ON c=3
"On"
"Aan"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 914fef0e..353d28cb 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -686,7 +686,7 @@
"No SD card"
"Brak karty SD"
-#MSG_NA
+#MSG_NA c=3
"N/A"
"N/D"
@@ -1310,11 +1310,11 @@
"Y-correct:"
"Korekcja-Y:"
-#MSG_OFF
+#MSG_OFF c=3
"Off"
"Wyl"
-#MSG_ON
+#MSG_ON c=3
"On"
"Wl"
From 75c0de741b0c87d081df568bf45372e98c9de2dc Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:52:59 +0200
Subject: [PATCH 165/254] Update #MSG_AUTO_DEPLETE c=13
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 3e134dc9..c0222293 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -127,7 +127,7 @@ const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////c=3
const char MSG_ON[] PROGMEM_I1 = ISTR("On"); ////c=3
const char MSG_NA[] PROGMEM_I1 = ISTR("N/A"); ////c=3
-const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////
+const char MSG_AUTO_DEPLETE[] PROGMEM_I1 = ISTR("SpoolJoin"); ////c=13
const char MSG_CUTTER[] PROGMEM_I1 = ISTR("Cutter"); ////c=9
const char MSG_NONE[] PROGMEM_I1 = ISTR("None"); ////c=8
const char MSG_WARN[] PROGMEM_I1 = ISTR("Warn"); ////c=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 098db57f..78de0a65 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -49,7 +49,7 @@
#MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
"Are left and right Z~carriages all up?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
#MSG_AUTO_HOME c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c7a9c598..d5e7cd49 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Dojely oba Z voziky k~hornimu dorazu?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 40e3ba01..c99ccfa1 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Sind linke+rechte Z- Schlitten ganz oben?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b1eb5bb5..bb98dbac 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Carros Z izq./der. estan arriba maximo?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 71840fb6..7f0f91ab 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Z~carriages gauche + droite tout en haut?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8fdae562..bdb057db 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"I carrelli Z sin/des sono altezza max?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
""
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2e03f34c..1c6e8ea9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Zijn beide Z wagen heelemaal boven?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 353d28cb..bd8e788a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -66,7 +66,7 @@
"Are left and right Z~carriages all up?"
"Obydwa konce osi sa na szczycie?"
-#MSG_AUTO_DEPLETE c=17 r=1
+#MSG_AUTO_DEPLETE c=13
"SpoolJoin"
"\x00"
From 50e69fcca8955022078ceb360e4f1cbcb9e7cc36 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:53:58 +0200
Subject: [PATCH 166/254] Update #MSG_NO c=3
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index c0222293..1b7b8502 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -69,7 +69,7 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=15
-const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////
+const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=3
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 78de0a65..a64eac22 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -517,7 +517,7 @@
#MSG_NA c=3
"N/A"
-#MSG_NO
+#MSG_NO c=3
"No"
#MSG_SELFTEST_NOTCONNECTED c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d5e7cd49..fb66c5ea 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -690,7 +690,7 @@
"N/A"
"\x00"
-#MSG_NO
+#MSG_NO c=3
"No"
"Ne"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c99ccfa1..1c0c364a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -690,7 +690,7 @@
"N/A"
"N/V"
-#MSG_NO
+#MSG_NO c=3
"No"
"Nein"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index bb98dbac..97c11163 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -690,7 +690,7 @@
"N/A"
"N/A"
-#MSG_NO
+#MSG_NO c=3
"No"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7f0f91ab..a37a6801 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -690,7 +690,7 @@
"N/A"
"\x00"
-#MSG_NO
+#MSG_NO c=3
"No"
"Non"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index bdb057db..ba8acdda 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -690,7 +690,7 @@
"N/A"
"N/D"
-#MSG_NO
+#MSG_NO c=3
"No"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 1c6e8ea9..f7c0f747 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -690,7 +690,7 @@
"N/A"
"N/V"
-#MSG_NO
+#MSG_NO c=3
"No"
"Nee"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index bd8e788a..71ae2b0e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -690,7 +690,7 @@
"N/A"
"N/D"
-#MSG_NO
+#MSG_NO c=3
"No"
"Nie"
From 62ecbb3ae3832a5f79568a8b2b295055af2f8f4d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:57:50 +0200
Subject: [PATCH 167/254] Update #MSG_BABYSTEP_Z c=18
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 1b7b8502..43898ef0 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -9,7 +9,7 @@
//internationalized messages
const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); ////c=18
-const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18
+const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); ////c=18
const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12
const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); ////c=13
const char MSG_BED_DONE[] PROGMEM_I1 = ISTR("Bed done"); ////c=20
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a64eac22..451dc2e4 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -403,7 +403,7 @@
# c=18
"Lin. correction"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
# c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fb66c5ea..9f97987d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Korekce lin."
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Doladeni osy Z"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1c0c364a..c7015608 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Lineare Korrektur"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Z einstellen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 97c11163..70e46c81 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Correccion de Linealidad"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Micropaso Eje Z"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index a37a6801..e1ce5058 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Correction lin."
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Ajuster Z en dir."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ba8acdda..df910bd0 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Correzione lineare"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Compensazione Z"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f7c0f747..32d815b9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Lineaire correctie"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Live Z aanpassen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 71ae2b0e..c66015d0 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -538,7 +538,7 @@
"Lin. correction"
"Korekcja liniowa"
-#MSG_BABYSTEP_Z
+#MSG_BABYSTEP_Z c=18
"Live adjust Z"
"Ustaw. Live Z"
From 2408bc9f2e649c055684107c8b0d71938dc7a634 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 17:58:51 +0200
Subject: [PATCH 168/254] Update MSG_LOADING_COLOR c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 8f223cec..c67dba2c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2431,7 +2431,7 @@ void lcd_loading_color() {
lcd_clear();
- lcd_puts_at_P(0, 0, _i("Loading color"));////MSG_LOADING_COLOR
+ lcd_puts_at_P(0, 0, _i("Loading color"));////MSG_LOADING_COLOR c=20
lcd_puts_at_P(0, 2, _T(MSG_PLEASE_WAIT));
lcd_loading_progress_bar((FILAMENTCHANGE_FINALFEED * 1000ul) / FILAMENTCHANGE_EFEED_FINAL); //show progress bar during filament loading slow sequence
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 451dc2e4..e3a0a8e2 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -412,7 +412,7 @@
#MSG_LOAD_FILAMENT c=17
"Load filament"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
#MSG_LOADING_FILAMENT c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9f97987d..9f3dde7a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -550,7 +550,7 @@
"Load filament"
"Zavest filament"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Cisteni barvy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c7015608..38c2a96f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -550,7 +550,7 @@
"Load filament"
"Filament laden"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Lade Farbe"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 70e46c81..e4d3a238 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -550,7 +550,7 @@
"Load filament"
"Introducir filam."
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Cambiando color"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e1ce5058..416254e8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -550,7 +550,7 @@
"Load filament"
"Charger filament"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Charg. de la couleur"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index df910bd0..08b286d2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -550,7 +550,7 @@
"Load filament"
"Carica filamento"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Caricando colore"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 32d815b9..2b1ae9de 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -550,7 +550,7 @@
"Load filament"
"Filament laden"
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Laden kleur"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c66015d0..a96e971f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -550,7 +550,7 @@
"Load filament"
"Ladowanie fil."
-#MSG_LOADING_COLOR
+#MSG_LOADING_COLOR c=20
"Loading color"
"Czyszcz. koloru"
From afb7c82e268dacfe42608ae15b59992ccd204aa1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:00:20 +0200
Subject: [PATCH 169/254] Update #MSG_LOAD_TO_NOZZLE c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index c67dba2c..fb84afd1 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6631,7 +6631,7 @@ static void lcd_main_menu()
if ( ! ( IS_SD_PRINTING || is_usb_printing || (lcd_commands_type == LcdCommands::Layer1Cal) ) ) {
if (mmu_enabled) {
MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), fil_load_menu);
- MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);
+ MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18
//-// MENU_ITEM_FUNCTION_P(_T(MSG_UNLOAD_FILAMENT), extr_unload);
//bFilamentFirstRun=true;
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e3a0a8e2..25a97dc6 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -421,7 +421,7 @@
#MSG_LOOSE_PULLEY c=20
"Loose pulley"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
#MSG_M117_V2_CALIBRATION c=25
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 9f3dde7a..5f1d17a6 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Uvolnena remenicka"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Zavest do trysky"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 38c2a96f..e02e91e4 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Lose Riemenscheibe"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"In Druckduese laden"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index e4d3a238..12495eb0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Polea suelta"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Cargar a la boquilla"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 416254e8..d0045b3a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Poulie lache"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Charger la buse"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 08b286d2..5593fa06 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Puleggia lenta"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Carica ugello"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2b1ae9de..d2ab0eb6 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Losse riemschijf"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Tot tuit laden"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index a96e971f..b9f18ca4 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -562,7 +562,7 @@
"Loose pulley"
"Luzne kolo pasowe"
-#
+#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
"Zaladuj do dyszy"
From 1e2dde9a5281d7e8d9808ccfc061665caaf8c0d4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:02:27 +0200
Subject: [PATCH 170/254] Update #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20
r=3
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 43898ef0..74ee0c1d 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -64,7 +64,7 @@ const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////c=18
const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////c=18
const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////c=10
const char MSG_STEEL_SHEETS[] PROGMEM_I1 = ISTR("Steel sheets"); ////c=18
-const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=60
+const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1[] PROGMEM_I1 = ISTR("Measuring reference height of calibration point"); ////c=20 r=3
const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9"); ////c=14
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 25a97dc6..4308536b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -436,7 +436,7 @@
#MSG_BL_LOW c=12
"Level Dimmed"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
#MSG_MESH_BED_LEVELING c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 5f1d17a6..36ac7e19 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"\x00"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Merim referencni vysku kalibracniho bodu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e02e91e4..3a7eda4a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"Dimmwert"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Messen der Referenzhoehe des Kalibrierpunktes"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 12495eb0..ea776e96 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"\x00"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Midiendo altura del punto de calibracion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d0045b3a..5ce7b313 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"\x00"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Je mesure la hauteur de reference du point de calibrage"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5593fa06..fa4ab8c5 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"Liv. Scuro"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Misura altezza di rif. del punto di calib."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d2ab0eb6..1bd5c4b5 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"Dim waarde"
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Referentie hoogte van het kalibratiepunt meten"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b9f18ca4..9a9e97cb 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -582,7 +582,7 @@
"Level Dimmed"
"Poziom ciem."
-#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=60
+#MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 c=20 r=3
"Measuring reference height of calibration point"
"Okreslam wysokosc odniesienia punktu kalibracyjnego"
From 4d9dffb0420462a1f42682b35574786799a6325b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:06:43 +0200
Subject: [PATCH 171/254] Define #MSG_MEASURED_SKEW c=13
---
Firmware/ultralcd.cpp | 12 ++++++------
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, 14 insertions(+), 14 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index fb84afd1..86d9fc4d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2782,10 +2782,10 @@ float _deg(float rad)
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Measured skew: 0.00D| c=13 r=1
+//! |Measured skew: 0.00D| c=13
//! | -------------- | STR_SEPARATOR
-//! |Slight skew: 0.12D| c=13 r=1 c=4 r=1
-//! |Severe skew: 0.25D| c=13 r=1 c=4 r=1
+//! |Slight skew: 0.12D| c=13 c=4
+//! |Severe skew: 0.25D| c=13 c=4
//! ----------------------
//! D - Degree sysmbol LCD_STR_DEGREE
//! @endcode
@@ -2800,10 +2800,10 @@ static void lcd_menu_xyz_skew()
"%-15.15S%3.2f\x01\n"
"%-15.15S%3.2f\x01"
),
- _i("Measured skew"), ////c=13 r=1
+ _i("Measured skew"), ////MSG_MEASURED_SKEW c=13
separator,
- _i("Slight skew:"), _deg(bed_skew_angle_mild), ////c=13 r=1 c=4 r=1
- _i("Severe skew:"), _deg(bed_skew_angle_extreme) ////c=13 r=1 c=4 r=1
+ _i("Slight skew:"), _deg(bed_skew_angle_mild), ////c=13 c=4
+ _i("Severe skew:"), _deg(bed_skew_angle_extreme) ////c=13 c=4
);
if (angleDiff < 100){
lcd_set_cursor(15,0);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4308536b..6cce093a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -448,7 +448,7 @@
#MSG_MMU_OK_RESUMING_TEMPERATURE c=20 r=4
"MMU OK. Resuming temperature..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
#MSG_MMU_FAILS c=15
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 36ac7e19..416fb23b 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Pokracuji v nahrivani..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Merene zkoseni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 3a7eda4a..79abbc5e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Temperatur wiederherstellen..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Schraeglauf"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ea776e96..9ca29887 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Restaurando temperatura..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Desviacion med:"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 5ce7b313..233aef2a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Rechauffage de la buse..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Deviat.mesuree"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index fa4ab8c5..1de0efd3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Ripristino temperatura... "
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Deviazione mis"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 1bd5c4b5..a869cc9c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Temperatuur hervatten..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Scheefheid"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9a9e97cb..1d449ba1 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -598,7 +598,7 @@
"MMU OK. Resuming temperature..."
"MMU OK. Wznawiam nagrzewanie..."
-#
+#MSG_MEASURED_SKEW c=13
"Measured skew"
"Zmierzony skos"
From 77a7a92a421016c0fa125d2a2da39eb1810e973d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:08:13 +0200
Subject: [PATCH 172/254] Define MSG_MMU_LOAD_FAILED c=20
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 68d20b22..0e34579a 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -1583,7 +1583,7 @@ void mmu_continue_loading(bool blocking)
manage_response(false, true, MMU_UNLOAD_MOVE);
setAllTargetHotends(0);
- lcd_setstatuspgm(_i("MMU load failed "));////c=20 r=1
+ lcd_setstatuspgm(_i("MMU load failed "));////MSG_MMU_LOAD_FAILED c=20
if (blocking)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6cce093a..7792e0aa 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -454,7 +454,7 @@
#MSG_MMU_FAILS c=15
"MMU fails"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
#MSG_MMU_LOAD_FAILS c=15
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 416fb23b..433d6de8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -606,7 +606,7 @@
"MMU fails"
"Selhani MMU"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"Zavedeni MMU selhalo"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 79abbc5e..186b2522 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -606,7 +606,7 @@
"MMU fails"
"MMU Fehler"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"MMU Ladefehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9ca29887..a0fac72c 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -606,7 +606,7 @@
"MMU fails"
"Fallos MMU"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"Carga MMU fallida"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 233aef2a..839fcf55 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -606,7 +606,7 @@
"MMU fails"
"Echecs MMU"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"Echec chargement MMU"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1de0efd3..b1413af2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -606,7 +606,7 @@
"MMU fails"
"Fallimenti MMU"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"Caricamento MMU fallito"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a869cc9c..6d03e59f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -606,7 +606,7 @@
"MMU fails"
"MMU fout"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"MMU laden mislukt "
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1d449ba1..86c0baa5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -606,7 +606,7 @@
"MMU fails"
"Bledy MMU"
-#
+#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
"Blad ladowania MMU"
From 99893d5066dc23d2b9e2b9dfc5ff9afb13cc5708 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:11:22 +0200
Subject: [PATCH 173/254] Define #MSG_MMU_CONNECTED c=18
---
Firmware/mmu.cpp | 2 +-
Firmware/ultralcd.cpp | 6 +++---
lang/lang_en.txt | 4 ++--
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 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 0e34579a..75435ddf 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -718,7 +718,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
//first three lines are used for printing multiscreen message; last line contains measured and target nozzle temperature
if (screen == 0) { //screen 0
- lcd_display_message_fullscreen_P(_i("MMU needs user attention."));////c=20 r=3
+ lcd_display_message_fullscreen_P(_i("MMU needs user attention."));////MSG_MMU_USER_ATTENTION c=20 r=3
screen++;
}
else { //screen 1
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 86d9fc4d..cf86fcd5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1824,14 +1824,14 @@ static void lcd_preheat_menu()
//! If MMU is connected
//!
//! @code{.unparsed}
-//! | MMU2 connected | c=18 r=1
+//! | MMU2 connected | c=18
//! | FW: 1.0.6-7064523 |
//! @endcode
//!
//! If MMU is not connected
//!
//! @code{.unparsed}
-//! | MMU2 N/A | c=18 r=1
+//! | MMU2 N/A | c=18
//! @endcode
//!
//! If Flash Air is connected
@@ -1936,7 +1936,7 @@ static void lcd_support_menu()
MENU_ITEM_BACK_P(STR_SEPARATOR);
if (mmu_enabled)
{
- MENU_ITEM_BACK_P(_i("MMU2 connected")); ////c=18 r=1
+ MENU_ITEM_BACK_P(_i("MMU2 connected")); ////MSG_MMU_CONNECTED c=18
MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17 r=1
if (((menu_item - 1) == menu_line) && lcd_draw_update)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 7792e0aa..6e4cd8f5 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -475,7 +475,7 @@
#MSG_SILENT c=7
"Silent"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
#MSG_MMU_POWER_FAILS c=15
@@ -490,7 +490,7 @@
#MSG_HIGH_POWER c=10
"High power"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
#MSG_SELFTEST_MOTOR c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 433d6de8..57281469 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -634,7 +634,7 @@
"Silent"
"Tichy"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"MMU potrebuje zasah uzivatele."
@@ -654,7 +654,7 @@
"High power"
"Vys. vykon"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 pripojeno"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 186b2522..9843c7d2 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -634,7 +634,7 @@
"Silent"
"Leise"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"MMU erfordert Benutzereingriff."
@@ -654,7 +654,7 @@
"High power"
"Hohe leist"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 verbunden"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index a0fac72c..6bdeb22f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -634,7 +634,7 @@
"Silent"
"Silencio"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"MMU necesita atencion del usuario."
@@ -654,7 +654,7 @@
"High power"
"Rend.pleno"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 conectado"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 839fcf55..45edb811 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -634,7 +634,7 @@
"Silent"
"Furtif"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"Le MMU necessite l'attention de l'utilisateur."
@@ -654,7 +654,7 @@
"High power"
"Haute puiss"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 connecte"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index b1413af2..16554533 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -634,7 +634,7 @@
"Silent"
"Silenzioso"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"Il MMU richiede attenzione dall'utente."
@@ -654,7 +654,7 @@
"High power"
"Forte"
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 connessa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6d03e59f..16d0cdf5 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -634,7 +634,7 @@
"Silent"
"Stil"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"MMU heeft gebruikersaandacht nodig."
@@ -654,7 +654,7 @@
"High power"
"Hoog verm."
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU2 verbonden"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 86c0baa5..8f29ee16 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -634,7 +634,7 @@
"Silent"
"Cichy"
-# c=20 r=3
+#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
"MMU wymaga uwagi uzytkownika."
@@ -654,7 +654,7 @@
"High power"
"Wysoka wyd."
-#
+#MSG_MMU_CONNECTED c=18
"MMU2 connected"
"MMU podlaczone"
From c1f22a5239376bda3d736b8ccde5fbcd58c3a6f1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:12:03 +0200
Subject: [PATCH 174/254] Update #MSG_MOVE_AXIS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index cf86fcd5..f5cbf0b5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5592,7 +5592,7 @@ static void lcd_settings_menu()
if (!PRINTER_ACTIVE || isPrintPaused)
{
- MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS
+ MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=18
MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=18
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6e4cd8f5..ae4a5485 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -496,7 +496,7 @@
#MSG_SELFTEST_MOTOR c=18
"Motor"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
#MSG_MOVE_X
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 57281469..744b078f 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -662,7 +662,7 @@
"Motor"
"\x00"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Posunout osu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 9843c7d2..de4db5f3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -662,7 +662,7 @@
"Motor"
"\x00"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Achse bewegen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 6bdeb22f..481c2ac7 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -662,7 +662,7 @@
"Motor"
"\x00"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Mover ejes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 45edb811..8072043d 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -662,7 +662,7 @@
"Motor"
"Moteur"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Deplacer l'axe"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 16554533..ca313b87 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -662,7 +662,7 @@
"Motor"
"Motore"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Muovi asse"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 16d0cdf5..b8f3868c 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -662,7 +662,7 @@
"Motor"
"\x00"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"As verplaatsen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8f29ee16..76e9a6e0 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -662,7 +662,7 @@
"Motor"
"Silnik"
-#MSG_MOVE_AXIS
+#MSG_MOVE_AXIS c=18
"Move axis"
"Ruch osi"
From 1a1a1d88a77cd2354aecbb102381c68ff619937d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:13:49 +0200
Subject: [PATCH 175/254] Update MSG_MOVE_X/Y/Z c=18
---
Firmware/ultralcd.cpp | 6 +++---
lang/lang_en.txt | 6 +++---
lang/lang_en_cz.txt | 6 +++---
lang/lang_en_de.txt | 6 +++---
lang/lang_en_es.txt | 6 +++---
lang/lang_en_fr.txt | 6 +++---
lang/lang_en_it.txt | 6 +++---
lang/lang_en_nl.txt | 6 +++---
lang/lang_en_pl.txt | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f5cbf0b5..bac1dd0e 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4148,9 +4148,9 @@ void lcd_move_menu_axis()
{
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_SETTINGS));
- MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X
- MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y
- MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z
+ MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X c=18
+ MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y c=18
+ MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z c=18
MENU_ITEM_SUBMENU_P(_T(MSG_EXTRUDER), lcd_move_e);////MSG_EXTRUDER
MENU_END();
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index ae4a5485..49ee1854 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -499,13 +499,13 @@
#MSG_MOVE_AXIS c=18
"Move axis"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
#MSG_NO_MOVE
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 744b078f..b324e296 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -666,15 +666,15 @@
"Move axis"
"Posunout osu"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Posunout X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Posunout Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Posunout Z"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index de4db5f3..2146327e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -666,15 +666,15 @@
"Move axis"
"Achse bewegen"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Bewege X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Bewege Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Bewege Z"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 481c2ac7..ced888b0 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -666,15 +666,15 @@
"Move axis"
"Mover ejes"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Mover X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Mover Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Mover Z"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 8072043d..316100e9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -666,15 +666,15 @@
"Move axis"
"Deplacer l'axe"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Deplacer X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Deplacer Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Deplacer Z"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ca313b87..deb7bfbd 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -666,15 +666,15 @@
"Move axis"
"Muovi asse"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Sposta X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Sposta Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Sposta Z"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index b8f3868c..70fa793a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -666,15 +666,15 @@
"Move axis"
"As verplaatsen"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Verplaats X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Verplaats Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Verplaats Z"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 76e9a6e0..72016c85 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -666,15 +666,15 @@
"Move axis"
"Ruch osi"
-#MSG_MOVE_X
+#MSG_MOVE_X c=18
"Move X"
"Ruch osi X"
-#MSG_MOVE_Y
+#MSG_MOVE_Y c=18
"Move Y"
"Ruch osi Y"
-#MSG_MOVE_Z
+#MSG_MOVE_Z c=18
"Move Z"
"Ruch osi Z"
From 7f3fe6740ba7dc39d05577b5d666942b3d4177b8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:46:56 +0200
Subject: [PATCH 176/254] Update #MSG_NO_MOVE c=20
---
Firmware/Marlin_main.cpp | 2 +-
Firmware/ultralcd.cpp | 2 +-
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 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index d08c4cc1..86e5f5c8 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -5712,7 +5712,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
*/
case 17:
- LCD_MESSAGERPGM(_i("No move."));////MSG_NO_MOVE
+ LCD_MESSAGERPGM(_i("No move."));////MSG_NO_MOVE c=20
enable_x();
enable_y();
enable_z();
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index bac1dd0e..9c587711 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4151,7 +4151,7 @@ void lcd_move_menu_axis()
MENU_ITEM_SUBMENU_P(_i("Move X"), lcd_move_x);////MSG_MOVE_X c=18
MENU_ITEM_SUBMENU_P(_i("Move Y"), lcd_move_y);////MSG_MOVE_Y c=18
MENU_ITEM_SUBMENU_P(_i("Move Z"), lcd_move_z);////MSG_MOVE_Z c=18
- MENU_ITEM_SUBMENU_P(_T(MSG_EXTRUDER), lcd_move_e);////MSG_EXTRUDER
+ MENU_ITEM_SUBMENU_P(_T(MSG_EXTRUDER), lcd_move_e);
MENU_END();
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 49ee1854..bf18c97c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -508,7 +508,7 @@
#MSG_MOVE_Z c=18
"Move Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
#MSG_NO_CARD
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b324e296..07a5e81d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -678,7 +678,7 @@
"Move Z"
"Posunout Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Bez pohybu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2146327e..fc1820f7 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -678,7 +678,7 @@
"Move Z"
"Bewege Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Keine Bewegung."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index ced888b0..1f711ed2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -678,7 +678,7 @@
"Move Z"
"Mover Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Sin movimiento"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 316100e9..3ea6d3c8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -678,7 +678,7 @@
"Move Z"
"Deplacer Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Pas de mouvement."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index deb7bfbd..54c9305f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -678,7 +678,7 @@
"Move Z"
"Sposta Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Nessun movimento."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 70fa793a..a6b0ed67 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -678,7 +678,7 @@
"Move Z"
"Verplaats Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Geen beweging."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 72016c85..89e60866 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -678,7 +678,7 @@
"Move Z"
"Ruch osi Z"
-#MSG_NO_MOVE
+#MSG_NO_MOVE c=20
"No move."
"Brak ruchu."
From 2abdfeb4c53adad886b57998a3ecf7b11a7e28f7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:48:14 +0200
Subject: [PATCH 177/254] Update #MSG_YES c=3
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 74ee0c1d..970af6f0 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -121,7 +121,7 @@ const char MSG_WIZARD_HEATING[] PROGMEM_I1 = ISTR("Preheating nozzle. Please wai
const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard from Calibration -> Wizard."); ////c=20 r=8
const char MSG_WIZARD_WELCOME[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. Would you like me to guide you through the setup process?"); //// c=20 r=7
const char MSG_WIZARD_WELCOME_SHIPPING[] PROGMEM_I1 = ISTR("Hi, I am your Original Prusa i3 printer. I will guide you through a short setup process, in which the Z-axis will be calibrated. Then, you will be ready to print."); ////c=20 r=16
-const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
+const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////c=3
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_OFF[] PROGMEM_I1 = ISTR("Off"); ////c=3
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index bf18c97c..11c4f956 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -931,7 +931,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED c=20 r=8
"XYZ calibration failed. Please consult the manual."
-#MSG_YES
+#MSG_YES c=3
"Yes"
#MSG_WIZARD_QUIT c=20 r=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 07a5e81d..659f7f30 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"Kalibrace XYZ selhala. Nahlednete do manualu."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Ano"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fc1820f7..7aaf5f5c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"XYZ-Kalibrierung fehlgeschlagen. Bitte schauen Sie in das Handbuch."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Ja"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1f711ed2..4fa838c9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"Calibracion XYZ fallada. Consulta el manual por favor."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Si"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3ea6d3c8..9393d141 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"Echec calibration XYZ. Consultez le manuel."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Oui"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 54c9305f..38351bc4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"Calibrazione XYZ fallita. Si prega di consultare il manuale."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Si"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a6b0ed67..852e5911 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"XYZ-kalibratie mislukt. Raadpleeg de handleiding aub."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Ja"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 89e60866..4e1dacd2 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1242,7 +1242,7 @@
"XYZ calibration failed. Please consult the manual."
"Kalibracja XYZ nieudana. Sprawdz przyczyny i rozwiazania w instrukcji."
-#MSG_YES
+#MSG_YES c=3
"Yes"
"Tak"
From 4a5d7bc6b7ed71f85e538e7425e926956e3ec72d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:51:04 +0200
Subject: [PATCH 178/254] Define #MSG_Y_DIST_FROM_MIN c=20
---
Firmware/ultralcd.cpp | 8 ++++----
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, 12 insertions(+), 12 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9c587711..87c5badd 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2739,10 +2739,10 @@ void lcd_move_e()
//! This functionality is applied more often for MK2 printers.
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Y distance from min | c=20
+//! |Y distance from min | MSG_Y_DIST_FROM_MIN
//! | -------------- | STR_SEPARATOR
-//! |Left: 00.00mm | c=11 r=1
-//! |Right: 00.00mm | c=11 r=1
+//! |Left: 00.00mm | MSG_LEFT c=10, c=8
+//! |Right: 00.00mm | MSG_RIGHT c=10, c=8
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -2757,7 +2757,7 @@ static void lcd_menu_xyz_y_min()
"%S:\n"
"%S:"
),
- _i("Y distance from min"), ////c=20
+ _i("Y distance from min"), ////MSG_Y_DIST_FROM_MIN c=20
separator,
_i("Left"), ////MSG_LEFT c=10
_i("Right") ////MSG_RIGHT c=10
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 11c4f956..12857264 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -970,7 +970,7 @@
#MSG_BED_SKEW_OFFSET_DETECTION_FAILED_FRONT_RIGHT_FAR c=20 r=6
"XYZ calibration failed. Right front calibration point not reachable."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
#MSG_WIZARD_V2_CAL_2 c=20 r=12
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 659f7f30..4acc49c3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibrace XYZ selhala. Pravy predni bod moc vpredu. Srovnejte tiskarnu."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Y vzdalenost od min"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 7aaf5f5c..a2612f32 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-Kalibrierung fehlgeschlagen. Rechter vorderer Kalibrierpunkt ist nicht erreichbar."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Y Entfernung vom Min"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4fa838c9..444adfda 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Calibracion XYZ fallad. Punto frontal derecho no alcanzable."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Distancia en Y desde el min"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 9393d141..4b6867c6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Echec calibration XYZ. Le point de calibration avant droit n'est pas atteignable."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Distance Y du min"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 38351bc4..2a119047 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Calibrazione XYZ fallita. Punto anteriore destro non raggiungibile."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Distanza Y dal min"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 852e5911..4a6bcc41 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"XYZ-kalibratie mislukt. Rechter voor kalibratiepunt niet bereikbaar."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Y afstand van min"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4e1dacd2..eb779615 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1294,7 +1294,7 @@
"XYZ calibration failed. Right front calibration point not reachable."
"Kalibr. XYZ nieudana. Prawy przedni punkt nieosiagalny. Nalezy poprawic montaz drukarki."
-# c=20
+#MSG_Y_DIST_FROM_MIN c=20
"Y distance from min"
"Dystans od 0 w osi Y"
From e9750a7312e530a0b0c04606e30523d1bfe141c1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:52:58 +0200
Subject: [PATCH 179/254] Update #MSG_FIL_FAILD c=20 r=5
---
Firmware/ultralcd.cpp | 2 +-
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 87c5badd..f0217d40 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7348,7 +7348,7 @@ static void lcd_detect_IRsensor(){
// the fsensor board has been successfully identified, any previous "not responding" may be cleared now
fsensor_not_responding = false;
} else {
- lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////c=20 r=5
+ lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILD c=20 r=5
// here it is unclear what to to with the fsensor_not_responding flag
}
bMenuFSDetect=false; // de-inhibits some code inside "manage_inactivity()"
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 12857264..8edd4f6a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -976,7 +976,7 @@
#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
#MSG_Y_CORRECTION c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4acc49c3..ab6b31ca 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Overeni selhalo, vyjmete filament a zkuste znovu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a2612f32..15a605df 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4b6867c6..1f5701d5 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Verification en echec, retirez le filament et reessayez."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2a119047..cdeb5db6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):"
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Verifica fallita, rimuovere il filamento e riprovare."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 4a6bcc41..af53f3af 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"De printer begint een zigzaglijn printen. Draai aan de knop totdat je de optimale hoogte hebt bereikt. Bekijk de afbeeldingen in de handleiding (Calibration chapter)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Verificatie mislukt, verwijder het filament en probeer het opnieuw."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index eb779615..40a3ca4e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)."
-# c=20 r=5
+#MSG_FIL_FAILD c=20 r=5
"Verification failed, remove the filament and try again."
"Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie."
From 669ab0f7f71646dd53dcebdb03cdea5d28ba6009 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 18:58:04 +0200
Subject: [PATCH 180/254] Define #MSG_GCODE_DIFF_CONTINUE c=20 r=4,
#MSG_GCODE_DIFF_CANCELLED c=20 r=7
---
Firmware/util.cpp | 4 ++--
lang/lang_en.txt | 4 ++--
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, 18 insertions(+), 18 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 0baab628..33c434f3 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -512,13 +512,13 @@ switch(oCheckGcode)
{
case ClCheckGcode::_Warn:
// lcd_show_fullscreen_message_and_wait_P(_i("Printer G-code level differs from the G-code. Continue?"));
-lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////c=20 r=4
+lcd_display_message_fullscreen_P(_i("G-code sliced for a different level. Continue?"));////MSG_GCODE_DIFF_CONTINUE c=20 r=4
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
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=7
+ lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a different level. Please re-slice the model again. Print cancelled."));////MSG_GCODE_DIFF_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 8edd4f6a..67be2d88 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1033,10 +1033,10 @@
#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
#MSG_GCODE_DIFF_PRINTER_CONTINUE c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ab6b31ca..a6009363 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Tryska"
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"\x00"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 15a605df..570a4d78 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Duese D."
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"G-Code ist fuer einen anderen Level geslict. Fortfahren?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code ist fuer einen anderen Level geslict. Bitte slicen Sie das Modell erneut. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 444adfda..596eb876 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Diam. nozzl"
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"Codigo G laminado para un nivel diferente. ?Continuar?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Codigo G laminado para un nivel 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 1f5701d5..0083b312 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Diam. buse"
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"Le G-code a ete prepare pour un niveau different. Continuer?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"Le G-code a ete prepare pour un niveau different. 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 cdeb5db6..7930c09f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Diam.Ugello"
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"G-code processato per un livello diverso. Continuare?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code processato per un livello diverso. Per favore esegui nuovamente lo slice del modello. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index af53f3af..0ef3d2d8 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Tuit d."
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"G-Code is voor een ander niveau geslict. Doorgaan?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-Code is voor een ander niveau geslict. Slice het model opniew alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 40a3ca4e..fab0ab6a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1378,11 +1378,11 @@
"Nozzle d."
"Sr. dyszy"
-# c=20 r=4
+#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
"G-code pociety dla innej wersji. Kontynuowac?"
-# c=20 r=7
+#MSG_GCODE_DIFF_CANCELLED c=20 r=7
"G-code sliced for a different level. Please re-slice the model again. Print cancelled."
"G-code pociety na innym poziomie. Potnij model ponownie. Druk anulowany."
From d601355d40f7cca1f54440252c69ef37f6298dc1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:01:24 +0200
Subject: [PATCH 181/254] Define #MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5,
#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
---
Firmware/util.cpp | 4 ++--
lang/lang_en.txt | 4 ++--
lang/lang_en_cz.txt | 4 ++--
lang/lang_en_de.txt | 4 ++--
lang/lang_en_es.txt | 2 +-
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, 17 insertions(+), 17 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 33c434f3..3dd53ea8 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -479,13 +479,13 @@ 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=5
+lcd_display_message_fullscreen_P(_i("G-code sliced for a newer firmware. Continue?"));////MSG_GCODE_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
break;
case ClCheckVersion::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////c=20 r=8
+ lcd_show_fullscreen_message_and_wait_P(_i("G-code sliced for a newer firmware. Please update the firmware. Print cancelled."));////MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
lcd_print_stop();
break;
case ClCheckVersion::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 67be2d88..79646f70 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1045,10 +1045,10 @@
#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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a6009363..72e3d52e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
"G-code je pripraven pro novejsi firmware. Pokracovat?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 570a4d78..c6a7fb08 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
"G-Code ist fuer eine neuere Firmware geslict. Fortfahren?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 596eb876..d1f599ad 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1394,7 +1394,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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE 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 0083b312..98a5c6bf 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE 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?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7930c09f..6fa1fee1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
"G-code processato per un firmware piu recente. Continuare?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0ef3d2d8..c7ba8734 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
"G-Code is voor een nieuwere firmware geslict. Doorgaan?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index fab0ab6a..b9bef2b8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1394,11 +1394,11 @@
"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=5
+#MSG_GCODE_NEWER_FIRMWARE_CONTINUE c=20 r=5
"G-code sliced for a newer firmware. Continue?"
"G-code pociety dla nowszego firmware. Kontynuowac?"
-# c=20 r=8
+#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
From de9697b91304d858928bac69cc4b225be9ba8601 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:06:46 +0200
Subject: [PATCH 182/254] Define #MSG_PREHEATING_TO_LOAD/UNLOAD/CUT/EJECT c=20
---
Firmware/ultralcd.cpp | 8 ++++----
lang/lang_en.txt | 8 ++++----
lang/lang_en_cz.txt | 8 ++++----
lang/lang_en_de.txt | 8 ++++----
lang/lang_en_es.txt | 8 ++++----
lang/lang_en_fr.txt | 8 ++++----
lang/lang_en_it.txt | 8 ++++----
lang/lang_en_nl.txt | 8 ++++----
lang/lang_en_pl.txt | 8 ++++----
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f0217d40..ae241602 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2216,19 +2216,19 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
case FilamentAction::Load:
case FilamentAction::AutoLoad:
case FilamentAction::MmuLoad:
- lcd_puts_P(_i("Preheating to load")); ////MSG_ c=20
+ lcd_puts_P(_i("Preheating to load")); ////MSG_PREHEATING_TO_LOAD c=20
raise_z_above(MIN_Z_FOR_LOAD);
break;
case FilamentAction::UnLoad:
case FilamentAction::MmuUnLoad:
- lcd_puts_P(_i("Preheating to unload")); ////MSG_ c=20
+ lcd_puts_P(_i("Preheating to unload")); ////MSG_PREHEATING_TO_UNLOAD c=20
raise_z_above(MIN_Z_FOR_UNLOAD);
break;
case FilamentAction::MmuEject:
- lcd_puts_P(_i("Preheating to eject")); ////MSG_ c=20
+ lcd_puts_P(_i("Preheating to eject")); ////MSG_PREHEATING_TO_EJECT c=20
break;
case FilamentAction::MmuCut:
- lcd_puts_P(_i("Preheating to cut")); ////MSG_ c=20
+ lcd_puts_P(_i("Preheating to cut")); ////MSG_PREHEATING_TO_CUT c=20
break;
case FilamentAction::None:
case FilamentAction::Preheat:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 79646f70..02dfabaa 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -634,10 +634,10 @@
#MSG_PRINT_ABORTED c=20
"Print aborted"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
#MSG_SELFTEST_PRINT_FAN_SPEED c=18
@@ -1051,10 +1051,10 @@
#MSG_GCODE_NEWER_FIRMWARE_CANCELLED c=20 r=8
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
# c=20 r=5
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 72e3d52e..9968e3c5 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Tisk prerusen"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Predehrev k zavedeni"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Predehrev k vyjmuti"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code je pripraven pro novejsi firmware. Prosim aktualizujte firmware. Tisk zrusen."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Predehrev ke strihu"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Predehrev k vysunuti"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c6a7fb08..b461ff76 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Druck abgebrochen"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Heizen zum Laden"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Heizen zum Entladen"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code ist fuer eine neuere Firmware geslict. Bitte die Firmware updaten. Druck abgebrochen."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Heizen zum Schnitt"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Heizen zum Auswurf"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d1f599ad..a77615f4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Impresion cancelada"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Precalent. cargar"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Precalent. descargar"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Codigo G laminado para nuevo firmware. Por favor actualiza el firmware. Impresion cancelada."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Precalent. laminar"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Precalent. expulsar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 98a5c6bf..1ff4d8b4 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Impression annulee"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Chauffe pour charger"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Chauf.pour decharger"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"Le G-code a ete prepare pour une version plus recente du firmware. Veuillez mettre a jour le firmware. L'impression annulee."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Chauffe pour couper"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Chauf. pour remonter"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6fa1fee1..41409aa6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Stampa interrotta"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Preriscald. carico"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Preriscald. scarico"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code processato per un firmware piu recente. Per favore aggiorna il firmware. Stampa annullata."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Preriscalda. taglio"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Preriscalda. espuls."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c7ba8734..c9902637 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Print afgebroken"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Opwarmen invoeren"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Opwarmen uitwerpen"
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-Code is voor een nieuwere firmware geslict. Update de firmware alsjeblieft. Druk geannuleerd."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Opwarm. te snijden"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Opwarm.te uitwerpen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b9bef2b8..44c5692e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -846,11 +846,11 @@
"Print aborted"
"Druk przerwany"
-# c=20
+#MSG_PREHEATING_TO_LOAD c=20
"Preheating to load"
"Nagrzew.do ladowania"
-# c=20
+#MSG_PREHEATING_TO_UNLOAD c=20
"Preheating to unload"
"Nagrzew. do rozlad."
@@ -1402,11 +1402,11 @@
"G-code sliced for a newer firmware. Please update the firmware. Print cancelled."
"G-code pociety dla nowszego firmware. Zaktualizuj firmware. Druk anulowany."
-# c=20
+#MSG_PREHEATING_TO_CUT c=20
"Preheating to cut"
"Nagrzew. obciecia"
-# c=20
+#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
"Nagrzew. wysuniecia"
From bcdaecb46d5b3af25f5994137344cd4ff6896f8e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:10:56 +0200
Subject: [PATCH 183/254] Define #MSG_TO_LOAD_FIL c=20, #MSG_TO_UNLOAD_FIL
c=20, #MSG_PRESS_KNOB c=20
---
Firmware/ultralcd.cpp | 6 +++---
lang/lang_en.txt | 6 +++---
lang/lang_en_cz.txt | 6 +++---
lang/lang_en_de.txt | 6 +++---
lang/lang_en_es.txt | 6 +++---
lang/lang_en_fr.txt | 6 +++---
lang/lang_en_it.txt | 6 +++---
lang/lang_en_nl.txt | 6 +++---
lang/lang_en_pl.txt | 6 +++---
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index ae241602..8536ad14 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2057,18 +2057,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,1, _i("Press the knob")); ////MSG_ c=20
+lcd_puts_at_P(0,1, _i("Press the knob")); ////MSG_PRESS_KNOB 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
+ lcd_puts_P(_i("to load filament")); ////MSG_TO_LOAD_FIL c=20
break;
case FilamentAction::UnLoad:
case FilamentAction::MmuUnLoad:
- lcd_puts_P(_i("to unload filament")); ////MSG_ c=20
+ lcd_puts_P(_i("to unload filament")); ////MSG_TO_UNLOAD_FIL c=20
break;
case FilamentAction::MmuEject:
case FilamentAction::MmuCut:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 02dfabaa..79e06434 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -646,7 +646,7 @@
#MSG_CARD_MENU c=18
"Print from SD"
-# c=20
+#MSG_PRESS_KNOB 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
+#MSG_TO_LOAD_FIL c=20
"to load filament"
-# c=20
+#MSG_TO_UNLOAD_FIL 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 9968e3c5..aaf0a56e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Tisk z SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Stisknete hl. tlacitko"
@@ -1166,11 +1166,11 @@
"Total failures"
"Celkem selhani"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"k zavedeni filamentu"
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"k vyjmuti filamentu"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b461ff76..d23414ea 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Drucken von SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Knopf druecken zum"
@@ -1166,11 +1166,11 @@
"Total failures"
"Gesamte Fehler"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"Filament laden"
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"Filament entladen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index a77615f4..eb36ba45 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Menu tarjeta SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Pulsa el dial"
@@ -1166,11 +1166,11 @@
"Total failures"
"Fallos totales"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"para cargar el fil."
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"para descargar fil."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1ff4d8b4..6abe7d97 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Impr. depuis la SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"App. sur sur bouton"
@@ -1166,11 +1166,11 @@
"Total failures"
"Total des echecs"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"pour charger le fil."
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"pour decharger fil."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 41409aa6..4255e09a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Stampa da SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Premere la manopola"
@@ -1166,11 +1166,11 @@
"Total failures"
"Totale fallimenti"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"per caricare il fil."
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"per scaricare fil."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c9902637..9c9ea81f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Print van SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Druk op knop"
@@ -1166,11 +1166,11 @@
"Total failures"
"Totaal fouten"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"om filament te laden"
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"om fil. uitwerpen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 44c5692e..37906ba8 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -862,7 +862,7 @@
"Print from SD"
"Druk z karty SD"
-# c=20
+#MSG_PRESS_KNOB c=20
"Press the knob"
"Wcisnij pokretlo"
@@ -1166,11 +1166,11 @@
"Total failures"
"Suma bledow"
-# c=20
+#MSG_TO_LOAD_FIL c=20
"to load filament"
"aby zaladow. fil."
-# c=20
+#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
"aby rozlad. filament"
From 44f7be134d0c09c490fafdde84554bbdd9e5e669 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:13:31 +0200
Subject: [PATCH 184/254] Define #MSG_FS_VERIFIED c=20 r=3
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 8536ad14..7366053a 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7344,7 +7344,7 @@ static void lcd_detect_IRsensor(){
bAction = lcd_selftest_IRsensor(true);
}
if(bAction){
- lcd_show_fullscreen_message_and_wait_P(_i("Sensor verified, remove the filament now."));////c=20 r=3
+ lcd_show_fullscreen_message_and_wait_P(_i("Sensor verified, remove the filament now."));////MSG_FS_VERIFIED c=20 r=3
// the fsensor board has been successfully identified, any previous "not responding" may be cleared now
fsensor_not_responding = false;
} else {
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 79e06434..44aa7e30 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -847,7 +847,7 @@
#MSG_TEMP_CALIBRATION_DONE c=20 r=12
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
#MSG_TEMPERATURE
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index aaf0a56e..8306a521 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Teplotni kalibrace dokoncena a je nyni aktivni. Teplotni kalibraci je mozno deaktivovat v menu Nastaveni->Tepl. kal."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Senzor overen, vyjmete filament."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d23414ea..463bc287 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Temp.kalibrierung ist fertig + aktiv. Temp.kalibrierung kann ausgeschaltet werden im Menu Einstellungen -> Temp.kal."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Sensor ueberprueft, entladen Sie jetzt das Filament."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index eb36ba45..8ff60df9 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Calibracion temperatura terminada. Haz clic para continuar."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Sensor verificado, retire el filamento ahora."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 6abe7d97..cdc28299 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"La calibration en temperature est terminee et activee. La calibration en temperature peut etre desactivee dans le menu Reglages-> Cal. Temp."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Capteur verifie, retirez le filament maintenant."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4255e09a..0edaef6d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Calibrazione temperatura completata e attiva. Puo essere disattivata dal menu Impostazioni ->Cal. Temp."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Sensore verificato, rimuovere il filamento."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 9c9ea81f..ac0b80a7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Temperatuurkalibratie kan uitgeschakeld worden in het menu Instellingen-> Tempkalibratie."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Sensor geverifieerd, verwijder nu het filament."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 37906ba8..6894dc33 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1130,7 +1130,7 @@
"Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."
"Kalibracja temperaturowa zakonczona i wlaczona. Moze byc wylaczona z menu Ustawienia -> Kalibracja temp."
-# c=20 r=3
+#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
"Czujnik sprawdzony, wyciagnij filament."
From 243fa68745da90b2c6686658359540a60a350ff8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:16:11 +0200
Subject: [PATCH 185/254] Define #MSG_LIN_CORRECTION c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 7366053a..6de7d69d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5617,7 +5617,7 @@ static void lcd_settings_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bed_leveling_settings);
#if defined (TMC2130) && defined (LINEARITY_CORRECTION)
- MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);////c=18
+ MENU_ITEM_SUBMENU_P(_i("Lin. correction"), lcd_settings_linearity_correction_menu);////MSG_LIN_CORRECTION c=18
#endif //LINEARITY_CORRECTION && TMC2130
if(has_temperature_compensation())
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 44aa7e30..6ba6f6c8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -400,7 +400,7 @@
#MSG_BED_CORRECTION_LEFT c=14 r=1
"Left side [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
#MSG_BABYSTEP_Z c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 8306a521..024bf75a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Vlevo [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Korekce lin."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 463bc287..cc3b344b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Links [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Lineare Korrektur"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8ff60df9..e95efdee 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Izquierda [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Correccion de Linealidad"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cdc28299..c3338805 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Gauche [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Correction lin."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0edaef6d..ca3d4317 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Sinistra [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Correzione lineare"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ac0b80a7..7152b2f4 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Linkerkant[um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Lineaire correctie"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6894dc33..2a6b575d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -534,7 +534,7 @@
"Left side [um]"
"Lewo [um]"
-# c=18
+#MSG_LIN_CORRECTION c=18
"Lin. correction"
"Korekcja liniowa"
From 5fcc731be1d0f665139c489bca93315d4978b658 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:17:48 +0200
Subject: [PATCH 186/254] Define #MSG_INSERT_FIL c=20 r=6
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6de7d69d..8b7b07d3 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7313,7 +7313,7 @@ static bool lcd_selftest_IRsensor(bool bStandalone)
lcd_selftest_error(TestError::FsensorLevel,"HIGH","");
return(false);
}
- lcd_show_fullscreen_message_and_wait_P(_i("Insert the filament (do not load it) into the extruder and then press the knob."));////c=20 r=6
+ lcd_show_fullscreen_message_and_wait_P(_i("Insert the filament (do not load it) into the extruder and then press the knob."));////MSG_INSERT_FIL c=20 r=6
volt_IR_int = current_voltage_raw_IR;
printf_P(PSTR("Measured filament sensor low level: %4.2fV\n"), Raw2Voltage(volt_IR_int));
if(volt_IR_int > (IRsensor_Lmax_TRESHOLD)){
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6ba6f6c8..e56fbadd 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -406,7 +406,7 @@
#MSG_BABYSTEP_Z c=18
"Live adjust Z"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
#MSG_LOAD_FILAMENT c=17
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 024bf75a..c58f58c3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Doladeni osy Z"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Vlozte filament (nezavadejte) do extruderu a stisknete tlacitko"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index cc3b344b..1a55bd7c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Z einstellen"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Stecken Sie das Filament (nicht laden) in den Extruder und druecken Sie dann den Knopf."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index e95efdee..c2144e44 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Micropaso Eje Z"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Inserte el filamento (no lo cargue) en el extrusor y luego presione el dial."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index c3338805..1935000a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Ajuster Z en dir."
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Veuillez inserer le filament ( ne le chargez pas) dans l'extrudeur, puis appuyez sur le bouton."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ca3d4317..2f937c0d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Compensazione Z"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Inserire filamento (senza caricarlo) nell'estrusore e premere la manopola."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 7152b2f4..5c35b0fa 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Live Z aanpassen"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Steek a.u.b. filament (maar niet laden) in de extruder en druk op knop."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 2a6b575d..0873be9f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -542,7 +542,7 @@
"Live adjust Z"
"Ustaw. Live Z"
-# c=20 r=6
+#MSG_INSERT_FIL c=20 r=6
"Insert the filament (do not load it) into the extruder and then press the knob."
"Wsun filament (nie uzywaj funkcji ladowania) do ekstrudera i nacisnij pokretlo."
From 6a266d497b5fe44f21caa80d232e81ea761928a4 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:19:43 +0200
Subject: [PATCH 187/254] Define #MSG_REMOVE_TEST_PRINT c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 8b7b07d3..4152c986 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4873,7 +4873,7 @@ void lcd_wizard(WizState state)
break;
case S::Z:
lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));
- lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));////c=20 r=4
+ lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));////MSG_REMOVE_TEST_PRINT c=20 r=4
lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_STEEL_SHEET_CHECK), false, false);
if (!wizard_event) lcd_show_fullscreen_message_and_wait_P(_T(MSG_PLACE_STEEL_SHEET));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e56fbadd..d2ad06ef 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -541,7 +541,7 @@
#MSG_DEFAULT_SETTINGS_LOADED c=20 r=6
"Old settings found. Default PID, Esteps etc. will be set."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index c58f58c3..3a8dfbae 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Nyni odstrante testovaci vytisk z tiskoveho platu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1a55bd7c..e2274bd5 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Testdruck jetzt von Stahlblech entfernen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c2144e44..43fdcb50 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Ahora retira la prueba de la lamina de acero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 1935000a..7658cd30 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront regles"
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Retirez maintenant l'impression de test de la plaque en acier."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2f937c0d..5e143bc8 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Sono state trovate impostazioni vecchie. Verranno impostati i valori predefiniti di PID, Esteps etc."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Ora rimuovete la stampa di prova dalla piastra in acciaio."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 5c35b0fa..3c56e035 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Oude instellingen gevonden. Standaard PID, E-steps etc. instellingen worden geladen."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Verwijder nu de testprint van staalplaat."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 0873be9f..bb8afc1f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -722,7 +722,7 @@
"Old settings found. Default PID, Esteps etc. will be set."
"Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
-# c=20 r=4
+#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
"Teraz zdejmij wydruk testowy ze stolu."
From 1c09e8411d453b2159be88d61a4fab2761b39169 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:30:26 +0200
Subject: [PATCH 188/254] Define #MSG_PINDA c=6 and remove duplicate saved 8
bytes
---
Firmware/messages.c | 1 +
Firmware/messages.h | 1 +
Firmware/ultralcd.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 +-
11 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 970af6f0..7bfbbbe2 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -73,6 +73,7 @@ const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=3
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
+const char MSG_PINDA[] PROGMEM_I1 = ISTR("PINDA");////c=6
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=15
diff --git a/Firmware/messages.h b/Firmware/messages.h
index afe8342c..ad0b44c8 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -72,6 +72,7 @@ extern const char MSG_NO[];
extern const char MSG_NOZZLE[];
extern const char MSG_PAPER[];
extern const char MSG_PAUSE_PRINT[];
+extern const char MSG_PINDA[];
extern const char MSG_PLACE_STEEL_SHEET[];
extern const char MSG_PLEASE_WAIT[];
extern const char MSG_POWER_FAILURES[];
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4152c986..46218ef6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1724,7 +1724,7 @@ static void lcd_menu_temperatures()
lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT c=14
#endif //AMBIENT_THERMISTOR
#ifdef PINDA_THERMISTOR
- lcd_menu_temperatures_line( _i("PINDA"), (int)current_temperature_pinda ); ////c=14
+ lcd_menu_temperatures_line( _T(MSG_PINDA), (int)current_temperature_pinda ); ////MSG_PINDA
#endif //PINDA_THERMISTOR
menu_back_if_clicked();
}
@@ -3764,7 +3764,7 @@ static void lcd_show_sensors_state()
finda_state = mmu_finda;
}
//lcd_puts_at_P(0, 0, _i("Sensor state"));
- lcd_puts_at_P(0, 0, _i("PINDA"));
+ lcd_puts_at_P(0, 0, _T(MSG_PINDA));
lcd_set_cursor(LCD_WIDTH - 14, 0);
lcd_print_state(pinda_state);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d2ad06ef..d0844c0c 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -616,7 +616,7 @@
#MSG_WIZARD_HEATING c=20 r=3
"Preheating nozzle. Please wait."
-# c=14
+#MSG_PINDA c=6
"PINDA"
#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3a8dfbae..299451d4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Predehrev trysky. Prosim cekejte."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index e2274bd5..1784952b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Vorheizen der Duese. Bitte warten."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 43fdcb50..62fe7e50 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Precalentando nozzle. Espera por favor."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 7658cd30..cbe091b3 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Prechauffage de la buse. Merci de patienter."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5e143bc8..87b44af7 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Preriscaldando l'ugello. Attendere prego."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 3c56e035..bbb5b65a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Opwarmen van de tuit. Wacht aub."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index bb8afc1f..efbac91d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Nagrzewanie dyszy. Prosze czekac."
-# c=14
+#MSG_PINDA c=6
"PINDA"
"\x00"
From 742b9e9197b361e50625d6d31589f6a8c06a2b40 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 30 Mar 2021 19:34:10 +0200
Subject: [PATCH 189/254] Fix #MSG_CRASHDETECT c=13 in Polish lang file
---
lang/lang_en_pl.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index efbac91d..7e9d6969 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -198,7 +198,7 @@
"Copy selected language?"
"Skopiowac wybrany jezyk?"
-#MSG_CRASHDETECT_ON
+#MSG_CRASHDETECT c=13
"Crash det."
"Wykr.zderzen"
From baf231b0f191675749d8800f5bac41aa78c6ce01 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:23:18 +0200
Subject: [PATCH 190/254] Update MSG_NO_CARD c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 46218ef6..7a4c2d8d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6611,7 +6611,7 @@ static void lcd_main_menu()
}
} else {
bMain=true; // flag (i.e. 'fake parameter') for 'lcd_sdcard_menu()' function
- MENU_ITEM_SUBMENU_P(_i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD
+ MENU_ITEM_SUBMENU_P(_i("No SD card"), lcd_sdcard_menu);////MSG_NO_CARD c=18
#if SDCARDDETECT < 1
MENU_ITEM_GCODE_P(_i("Init. SD card"), PSTR("M21")); // Manually initialize the SD-card via user interface////MSG_INIT_SDCARD
#endif //SDCARDDETECT
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d0844c0c..673e4a01 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -511,7 +511,7 @@
#MSG_NO_MOVE c=20
"No move."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
#MSG_NA c=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 299451d4..81f5ef6c 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -682,7 +682,7 @@
"No move."
"Bez pohybu."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Zadna SD karta"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1784952b..601c77d3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -682,7 +682,7 @@
"No move."
"Keine Bewegung."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Keine SD Karte"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 62fe7e50..f84d7f73 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -682,7 +682,7 @@
"No move."
"Sin movimiento"
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"No hay tarjeta SD"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cbe091b3..8dfc4daf 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -682,7 +682,7 @@
"No move."
"Pas de mouvement."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Pas de carte SD"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 87b44af7..e97e3931 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -682,7 +682,7 @@
"No move."
"Nessun movimento."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Nessuna SD"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index bbb5b65a..f982c9a3 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -682,7 +682,7 @@
"No move."
"Geen beweging."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Geen SD kaart"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7e9d6969..d30e520a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -682,7 +682,7 @@
"No move."
"Brak ruchu."
-#MSG_NO_CARD
+#MSG_NO_CARD c=18
"No SD card"
"Brak karty SD"
From 00b100bf26468b760e1f3199ba7ae1f920693ad9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:30:00 +0200
Subject: [PATCH 191/254] Define #MSG_NOZZLE_FAN c=10, #MSG_PRINT_FAN c=10
---
Firmware/ultralcd.cpp | 8 ++++----
lang/lang_en.txt | 4 ++--
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, 20 insertions(+), 20 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 7a4c2d8d..6d4408ea 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1425,8 +1425,8 @@ static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Nozzle FAN: 0000 RPM| FAN c=10 r=1 SPEED c=3 r=1
-//! |Print FAN: 0000 RPM| FAN c=10 r=1 SPEED c=3 r=1
+//! |Nozzle FAN: 0000 RPM| MSG_NOZZLE_FAN c=10 SPEED c=3
+//! |Print FAN: 0000 RPM| MSG_PRINT_FAN c=10 SPEED c=3
//! | |
//! | |
//! ----------------------
@@ -1440,8 +1440,8 @@ void lcd_menu_extruder_info() // NOT static due to using ins
lcd_home();
static const size_t maxChars = 12;
char nozzle[maxChars], print[maxChars];
- pgmtext_with_colon(_i("Nozzle FAN"), nozzle, maxChars); ////c=10 r=1
- pgmtext_with_colon(_i("Print FAN"), print, maxChars); ////c=10 r=1
+ pgmtext_with_colon(_i("Nozzle FAN"), nozzle, maxChars); ////MSG_NOZZLE_FAN c=10
+ pgmtext_with_colon(_i("Print FAN"), print, maxChars); ////MSG_PRINT_FAN c=10
lcd_printf_P(_N("%s %4d RPM\n" "%s %4d RPM\n"), nozzle, 60*fan_speed[0], print, 60*fan_speed[1] );
menu_back_if_clicked();
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 673e4a01..99c8f612 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -544,7 +544,7 @@
#MSG_REMOVE_TEST_PRINT c=20 r=4
"Now remove the test print from steel sheet."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
#MSG_PAUSE_PRINT c=18
@@ -658,7 +658,7 @@
#MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 81f5ef6c..25004cc8 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Nyni odstrante testovaci vytisk z tiskoveho platu."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Vent. trysky"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Tiskarna nebyla jeste zkalibrovana. Postupujte prosim podle manualu, kapitola Zaciname, odstavec Postup kalibrace."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"Tiskovy vent."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 601c77d3..d98616e2 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Testdruck jetzt von Stahlblech entfernen."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Duesevent."
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Drucker wurde noch nicht kalibriert. Bitte folgen Sie dem Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrie- rungsablauf."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"Druckvent."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f84d7f73..654ebab3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Ahora retira la prueba de la lamina de acero."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Vent. capa"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Impresora no esta calibrada todavia. Por favor usa el manual capitulo Primeros pasos Calibracion flujo."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"Vent. extr"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 8dfc4daf..404d9050 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Retirez maintenant l'impression de test de la plaque en acier."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Vent. buse"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"L'imprimante n'a pas encore ete calibree. Suivez le manuel, chapitre Premiers pas, section Processus de calibration."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"Vent. impr"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index e97e3931..5135e487 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Ora rimuovete la stampa di prova dalla piastra in acciaio."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Ventola estrusore"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Stampante non ancora calibrata. Si prega di seguire il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"Ventola di stampa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f982c9a3..ae79f4ca 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Verwijder nu de testprint van staalplaat."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"Tuit fan"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Printer is nog niet gekalibreerd. Volg de handleiding, hoofdstuk First steps, sectie Calibration flow."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d30e520a..bc35a053 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -726,7 +726,7 @@
"Now remove the test print from steel sheet."
"Teraz zdejmij wydruk testowy ze stolu."
-#
+#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
"WentHotend"
@@ -878,7 +878,7 @@
"Printer has not been calibrated yet. Please follow the manual, chapter First steps, section Calibration flow."
"Drukarka nie byla jeszcze kalibrowana. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Konfiguracja przed drukowaniem."
-#
+#MSG_PRINT_FAN c=10
"Print FAN"
"WentWydruk"
From ac810bf03a8c5d876c5562a5919aa6bb54bafdd6 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:36:28 +0200
Subject: [PATCH 192/254] Define #MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6d4408ea..2c0a27b0 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4872,7 +4872,7 @@ void lcd_wizard(WizState state)
else end = true;
break;
case S::Z:
- lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));////MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
lcd_show_fullscreen_message_and_wait_P(_i("Now remove the test print from steel sheet."));////MSG_REMOVE_TEST_PRINT c=20 r=4
lcd_show_fullscreen_message_and_wait_P(_i("I will run z calibration now."));////MSG_WIZARD_Z_CAL c=20 r=8
wizard_event = lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_STEEL_SHEET_CHECK), false, false);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 99c8f612..537b85f7 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -604,7 +604,7 @@
#MSG_PLEASE_WAIT c=20
"Please wait"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
#MSG_PREHEAT_NOZZLE c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 25004cc8..b28fb3a4 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -806,7 +806,7 @@
"Please wait"
"Prosim cekejte"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Nejprve prosim sundejte transportni soucastky."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d98616e2..4f6a0f8c 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -806,7 +806,7 @@
"Please wait"
"Bitte warten"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Bitte zuerst Transportsicherungen entfernen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 654ebab3..1433c417 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -806,7 +806,7 @@
"Please wait"
"Por Favor Espere"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Por favor retira los soportes de envio primero."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 404d9050..12d85b90 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -806,7 +806,7 @@
"Please wait"
"Merci de patienter"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Retirez d'abord les protections de transport."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5135e487..2155f8da 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -806,7 +806,7 @@
"Please wait"
"Attendere"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Per favore rimuovete i materiali da spedizione"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ae79f4ca..1017ce75 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -806,7 +806,7 @@
"Please wait"
"Even geduld aub"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Verwijder eerst de transport beschermers."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index bc35a053..8a8829a5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -806,7 +806,7 @@
"Please wait"
"Prosze czekac"
-#
+#MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
"Please remove shipping helpers first."
"Najpierw usun zabezpieczenia transportowe"
From fbecae17076329b5efe9134efe307dbc9c4143f3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:38:06 +0200
Subject: [PATCH 193/254] Update MSG_PREHEAT c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2c0a27b0..2b2687f0 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6569,7 +6569,7 @@ static void lcd_main_menu()
if ( moves_planned() || PRINTER_ACTIVE ) {
MENU_ITEM_SUBMENU_P(_i("Tune"), lcd_tune_menu);////MSG_TUNE
} else {
- MENU_ITEM_SUBMENU_P(_i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT
+ MENU_ITEM_SUBMENU_P(_i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT c=18
}
if (mesh_bed_leveling_flag == false && homing_flag == false && !isPrintPaused) {
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 537b85f7..c08b7a28 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -610,7 +610,7 @@
#MSG_PREHEAT_NOZZLE c=20
"Preheat the nozzle!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
#MSG_WIZARD_HEATING c=20 r=3
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index b28fb3a4..45d5fc6a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Predehrejte trysku!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Predehrev"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 4f6a0f8c..b64b7ef1 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Duese vorheizen!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Vorheizen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1433c417..31a9a368 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Precalienta extrusor"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Precalentar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 12d85b90..f0662bec 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Prechauffez la buse!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Prechauffage"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2155f8da..566b0851 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Prerisc. ugello!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Preriscalda"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 1017ce75..12d6e6a9 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Tuit voorverwarmen!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Voorverwarmen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8a8829a5..ee6b7acf 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -814,7 +814,7 @@
"Preheat the nozzle!"
"Nagrzej dysze!"
-#MSG_PREHEAT
+#MSG_PREHEAT c=18
"Preheat"
"Grzanie"
From 4f394c8c5a54917b8f43bd134353dd1742cc8a85 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:38:50 +0200
Subject: [PATCH 194/254] Update #MSG_TUNE c=18, #MSG_PREHEAT c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2b2687f0..5b0b6b75 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6567,7 +6567,7 @@ static void lcd_main_menu()
MENU_ITEM_FUNCTION_P(_T(MSG_FILAMENTCHANGE), lcd_colorprint_change);//8
if ( moves_planned() || PRINTER_ACTIVE ) {
- MENU_ITEM_SUBMENU_P(_i("Tune"), lcd_tune_menu);////MSG_TUNE
+ MENU_ITEM_SUBMENU_P(_i("Tune"), lcd_tune_menu);////MSG_TUNE c=18
} else {
MENU_ITEM_SUBMENU_P(_i("Preheat"), lcd_preheat_menu);////MSG_PREHEAT c=18
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index c08b7a28..a45eec26 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -865,7 +865,7 @@
#
"Total print time"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 45d5fc6a..62775aa9 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Celkovy cas tisku"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Ladit"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b64b7ef1..b66d3957 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Gesamte Druckzeit"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Feineinstellung"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 31a9a368..9862c595 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Tiempo total"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Ajustar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f0662bec..75068f34 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Temps total impr."
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Regler"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 566b0851..4d00478c 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Tempo stampa totale"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Regola"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 12d6e6a9..45fe04b7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Totaal printtijd"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Fijnafstemming"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ee6b7acf..613f1ccc 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1154,7 +1154,7 @@
"Total print time"
"Laczny czas druku"
-#MSG_TUNE
+#MSG_TUNE c=18
"Tune"
"Strojenie"
From 0d48a32e875f80f09eae0fdcba277ccfaa974905 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:41:17 +0200
Subject: [PATCH 195/254] Define #MSG_RESUME_NOZZLE_TEMP c=20 r=4
---
Firmware/mmu.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/mmu.cpp b/Firmware/mmu.cpp
index 75435ddf..ba4e21d9 100755
--- a/Firmware/mmu.cpp
+++ b/Firmware/mmu.cpp
@@ -722,7 +722,7 @@ void manage_response(bool move_axes, bool turn_off_nozzle, uint8_t move)
screen++;
}
else { //screen 1
- if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));////c=20 r=4
+ if((degTargetHotend(active_extruder) == 0) && turn_off_nozzle) lcd_display_message_fullscreen_P(_i("Press the knob to resume nozzle temperature."));////MSG_RESUME_NOZZLE_TEMP c=20 r=4
else lcd_display_message_fullscreen_P(_i("Fix the issue and then press button on MMU unit."));////MSG_MMU_FIX_ISSUE c=20 r=4
screen=0;
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a45eec26..17388d84 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -652,7 +652,7 @@
#MSG_PRINT_PAUSED c=20 r=1
"Print paused"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
#MSG_FOLLOW_CALIBRATION_FLOW c=20 r=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 62775aa9..bfabc7ee 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -870,7 +870,7 @@
"Print paused"
"Tisk pozastaven"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Pro pokracovani nahrivani trysky stisknete tlacitko."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b66d3957..458efd18 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -870,7 +870,7 @@
"Print paused"
"Druck pausiert"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9862c595..4642cb48 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -870,7 +870,7 @@
"Print paused"
"Impresion en pausa"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Presiona el dial para continuar con la temperatura de la boquilla."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 75068f34..4f85ed4c 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -870,7 +870,7 @@
"Print paused"
"Impression en pause"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Appuyez sur le bouton pour rechauffer la buse."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4d00478c..289ec9b2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -870,7 +870,7 @@
"Print paused"
"Stampa in pausa"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Premete la manopola per recuperare la temperatura dell'ugello."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 45fe04b7..ae2a775d 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -870,7 +870,7 @@
"Print paused"
"Print pauzeren"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Druk op de knop om de temperatuur van de tuit te hervatten."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 613f1ccc..8809908a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -870,7 +870,7 @@
"Print paused"
"Druk wstrzymany"
-# c=20 r=4
+#MSG_RESUME_NOZZLE_TEMP c=20 r=4
"Press the knob to resume nozzle temperature."
"Wcisnij pokretlo aby wznowic podgrzewanie dyszy."
From 5280a89fba8e2a9a2a30fb04f4c051363de744e7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:43:21 +0200
Subject: [PATCH 196/254] Define #MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 5b0b6b75..3b6db9ec 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4728,7 +4728,7 @@ static void lcd_wizard_load()
{
if (mmu_enabled)
{
- lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////c=20 r=6
+ lcd_show_fullscreen_message_and_wait_P(_i("Please insert filament into the first tube of the MMU, then press the knob to load it."));////MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
tmp_extruder = 0;
}
else
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 17388d84..f18fcabb 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -664,7 +664,7 @@
#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
#MSG_PLEASE_LOAD_PLA c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index bfabc7ee..fe5c5359 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Prosim vlozte filament do extruderu a stisknete tlacitko k jeho zavedeni"
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Prosim vlozte filament do prvni trubicky MMU a stisknete tlacitko k jeho zavedeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 458efd18..40108105 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Bitte legen Sie das Filament in den Extruder ein und druecken Sie dann den Knopf, um es zu laden."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Bitte stecken Sie das Filament in den ersten Schlauch der MMU und druecken Sie dann den Knopf, um es zu laden."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 4642cb48..8e9422cd 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Por favor, coloca el filamento en el extrusor, luego presiona el dial para cargarlo."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Por favor, coloca el filamento en el primer tubo de la MMU, luego pulsa el dial para cargarlo."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4f85ed4c..b5017a43 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Veuillez inserer le filament dans l'extrudeur, puis appuyez sur le bouton pour le charger."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Veuillez inserer le filament dans le premier tube du MMU, puis appuyez sur le bouton pour le charger."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 289ec9b2..d44ca639 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Inserisci il filamento nell'estrusore, poi premi la manopola per caricarlo."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Per favore inserisci il filamento nel primo tubo del MMU, poi premi la manopola per caricarlo."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ae2a775d..f17b0127 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Steek a.u.b. filament in de extruder en druk op de knop om het te laden."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Steek a.u.b. filament in de eerste buis van de MMU en druk op de knop om het te laden."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 8809908a..bcf5864f 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -886,7 +886,7 @@
"Please insert filament into the extruder, then press the knob to load it."
"Wsun filament do ekstrudera i nacisnij pokretlo, aby go zaladowac."
-# c=20 r=6
+#MSG_MMU_INSERT_FILAMENT_FIRST_TUBE c=20 r=6
"Please insert filament into the first tube of the MMU, then press the knob to load it."
"Wsun filament do pierwszego kanalu w MMU2 i nacisnij pokretlo, aby go zaladowac."
From bd8ab39b391e5a5f3ad42d10c1cc3d2aa352f939 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:45:33 +0200
Subject: [PATCH 197/254] Define #MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 3b6db9ec..2f8fa02a 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7337,7 +7337,7 @@ static void lcd_detect_IRsensor(){
/// @todo Add autodetection with MMU2s
loaded = ! READ(IR_SENSOR_PIN);
if(loaded ){
- lcd_show_fullscreen_message_and_wait_P(_i("Please unload the filament first, then repeat this action."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Please unload the filament first, then repeat this action."));////MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
return;
} else {
lcd_show_fullscreen_message_and_wait_P(_i("Please check the IR sensor connection, unload filament if present."));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f18fcabb..e6061b71 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -676,7 +676,7 @@
#MSG_BED_CORRECTION_REAR c=14 r=1
"Rear side [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
# c=20 r=4
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index fe5c5359..0b1185bf 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Vzadu [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Prosim vyjmete filament a zopakujte tuto akci"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 40108105..1f308189 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Hinten [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Bitte entladen Sie erst das Filament und versuchen Sie es nochmal."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8e9422cd..41986cd4 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Trasera [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Primero descargue el filamento, luego repita esta accion."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b5017a43..b0268bd8 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Arriere [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"SVP, dechargez le filament et reessayez."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index d44ca639..2afd6e35 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Retro [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Scaricare prima il filamento, poi ripetere l'operazione."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f17b0127..a644b6b7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Achterkant[um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Verwijder eerst het filament en probeer het opnieuw."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index bcf5864f..267c9795 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -902,7 +902,7 @@
"Rear side [um]"
"Tyl [um]"
-# c=20 r=4
+#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
"Najpierw rozladuj filament, nastepnie powtorz czynnosc."
From 4749dd175059931fd553a0f0946a1d7a46ac0909 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:46:43 +0200
Subject: [PATCH 198/254] Define #MSG_CHECK_IR_CONNECTION c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2f8fa02a..30ed8ffb 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7340,7 +7340,7 @@ static void lcd_detect_IRsensor(){
lcd_show_fullscreen_message_and_wait_P(_i("Please unload the filament first, then repeat this action."));////MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
return;
} else {
- lcd_show_fullscreen_message_and_wait_P(_i("Please check the IR sensor connection, unload filament if present."));
+ lcd_show_fullscreen_message_and_wait_P(_i("Please check the IR sensor connection, unload filament if present."));////MSG_CHECK_IR_CONNECTION c=20 r=4
bAction = lcd_selftest_IRsensor(true);
}
if(bAction){
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e6061b71..2b2ed1b3 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -679,7 +679,7 @@
#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
"Please unload the filament first, then repeat this action."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
#MSG_RECOVERING_PRINT c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0b1185bf..073eeb44 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Prosim vyjmete filament a zopakujte tuto akci"
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"Prosim zkontrolujte zapojeni IR senzoru a vyjmuty filament"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1f308189..d2381f0f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Bitte entladen Sie erst das Filament und versuchen Sie es nochmal."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"Bitte IR Sensor Verbindungen ueber- pruefen und Filament entladen ist."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 41986cd4..9bffe58e 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Primero descargue el filamento, luego repita esta accion."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"Por favor comprueba la conexion del IR sensor y filamento esta descargado."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b0268bd8..226550ef 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"SVP, dechargez le filament et reessayez."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"SVP, verifiez la connexion du capteur IR et decharge le filament."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 2afd6e35..ff070dd6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Scaricare prima il filamento, poi ripetere l'operazione."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"Controllare il collegamento al sensore e rimuovere il filamento."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index a644b6b7..fcdbb740 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Verwijder eerst het filament en probeer het opnieuw."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"AUB IR sensor ver- binding kontrolleren , verwijder filament indien aanwezig."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 267c9795..42def378 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -906,7 +906,7 @@
"Please unload the filament first, then repeat this action."
"Najpierw rozladuj filament, nastepnie powtorz czynnosc."
-# c=20 r=4
+#MSG_CHECK_IR_CONNECTION c=20 r=4
"Please check the IR sensor connection, unload filament if present."
"Sprawdz polaczenie czujnika IR, rozladuj filament, jesli zaladowany."
From 09f4850a8a050a4917f60cd60d3de297eb4ff46b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:53:04 +0200
Subject: [PATCH 199/254] Define #MSG_SLIGHT_SKEW c=13, #MSG_SEVERE_SKEW c=13
---
Firmware/ultralcd.cpp | 10 +++++-----
lang/lang_en.txt | 4 ++--
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, 21 insertions(+), 21 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 30ed8ffb..8f81fd17 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2782,10 +2782,10 @@ float _deg(float rad)
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Measured skew: 0.00D| c=13
+//! |Measured skew: 0.00D| MSG_MEASURED_SKEW, c=4
//! | -------------- | STR_SEPARATOR
-//! |Slight skew: 0.12D| c=13 c=4
-//! |Severe skew: 0.25D| c=13 c=4
+//! |Slight skew: 0.12D| MSG_SLIGHT_SKEW, c=4
+//! |Severe skew: 0.25D| MSG_SEVERE_SKEW, c=4
//! ----------------------
//! D - Degree sysmbol LCD_STR_DEGREE
//! @endcode
@@ -2802,8 +2802,8 @@ static void lcd_menu_xyz_skew()
),
_i("Measured skew"), ////MSG_MEASURED_SKEW c=13
separator,
- _i("Slight skew:"), _deg(bed_skew_angle_mild), ////c=13 c=4
- _i("Severe skew:"), _deg(bed_skew_angle_extreme) ////c=13 c=4
+ _i("Slight skew:"), _deg(bed_skew_angle_mild), ////MSG_SLIGHT_SKEW c=13, c=4
+ _i("Severe skew:"), _deg(bed_skew_angle_extreme) ////MSG_SEVERE_SKEW c=13, c=4
);
if (angleDiff < 100){
lcd_set_cursor(15,0);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 2b2ed1b3..23400198 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -778,7 +778,7 @@
#MSG_SORT_TIME c=8
"Time"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
#MSG_SORT_ALPHA c=8
@@ -790,7 +790,7 @@
#MSG_SOUND_LOUD
"Loud"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
#MSG_SOUND c=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 073eeb44..41640f22 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1038,7 +1038,7 @@
"Time"
"Cas"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Tezke zkoseni:"
@@ -1054,7 +1054,7 @@
"Loud"
"Hlasity"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Lehke zkoseni:"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d2381f0f..8a84f070 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1038,7 +1038,7 @@
"Time"
"Zeit"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Schwer.Schr:"
@@ -1054,7 +1054,7 @@
"Loud"
"Laut"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Leicht.Schr:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9bffe58e..c0d4bb56 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1038,7 +1038,7 @@
"Time"
"Fecha"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Incl.severa:"
@@ -1054,7 +1054,7 @@
"Loud"
"Alto"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Liger.incl.:"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 226550ef..763a9bcd 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1038,7 +1038,7 @@
"Time"
"Heure"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Deviat.sev.:"
@@ -1054,7 +1054,7 @@
"Loud"
"Fort"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Deviat.leg.:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ff070dd6..1a3e21df 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1038,7 +1038,7 @@
"Time"
"Cron."
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Devia.grave:"
@@ -1054,7 +1054,7 @@
"Loud"
"Forte"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Devia.lieve:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index fcdbb740..76d18cf4 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1038,7 +1038,7 @@
"Time"
"Tijd"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Erg scheef:"
@@ -1054,7 +1054,7 @@
"Loud"
"Hard"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Iets scheef:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 42def378..6df99bf5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1038,7 +1038,7 @@
"Time"
"Czas"
-#
+#MSG_SEVERE_SKEW c=13
"Severe skew:"
"Znaczny skos:"
@@ -1054,7 +1054,7 @@
"Loud"
"Glosny"
-#
+#MSG_SLIGHT_SKEW c=13
"Slight skew:"
"Lekki skos:"
From 76e7032279ccff604d9f563c983d87e58154c4be Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:54:51 +0200
Subject: [PATCH 200/254] Update #MSG_SOUND_LOUD c=7
---
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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 23400198..1c85a103 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -787,7 +787,7 @@
#MSG_SORTING c=20 r=1
"Sorting files"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
#MSG_SLIGHT_SKEW c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 41640f22..cd34c481 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Trideni souboru"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Hlasity"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 8a84f070..0f06486f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Sortiere Dateien"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Laut"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c0d4bb56..d6a62755 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Ordenando archivos"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Alto"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 763a9bcd..3a53fec7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Tri des fichiers"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Fort"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 1a3e21df..6aafdeb4 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Ordinando i file"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Forte"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 76d18cf4..82a66159 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Bestanden sorteren"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Hard"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6df99bf5..c4893731 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1050,7 +1050,7 @@
"Sorting files"
"Sortowanie plikow"
-#MSG_SOUND_LOUD
+#MSG_SOUND_LOUD c=7
"Loud"
"Glosny"
From acbdc2ac8d6be3fcbe3556b12e53781877b6dc11 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 06:59:16 +0200
Subject: [PATCH 201/254] Define #MSG_RUNOUTS c=7
---
Firmware/ultralcd.cpp | 10 +++++-----
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, 13 insertions(+), 13 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 8f81fd17..d6565145 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1557,10 +1557,10 @@ static void lcd_menu_fails_stats_total()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Last print failures | c=20 r=1
-//! | Power failures 000| c=14 r=1
-//! | Runouts H 000 S 000| c=14 r=1
-//! | Crash X:000 Y:000| c=7 r=1
+//! |Last print failures | MSG_LAST_PRINT_FAILURES c=20
+//! | Power failures 000| MSG_POWER_FAILURES c=14
+//! | Runouts H 000 S 000| MSG_RUNOUTS c=7
+//! | Crash X:000 Y:000| MSG_CRASH c=7
//! ----------------------
//! @endcode
@@ -1587,7 +1587,7 @@ static void lcd_menu_fails_stats_print()
" %-7.7S X %-3d Y %-3d"),
_T(MSG_LAST_PRINT_FAILURES), ////c=20
_T(MSG_POWER_FAILURES), power, ////c=15
- _i("Runouts"), filam, fsensor_softfail, //c=7
+ _i("Runouts"), filam, fsensor_softfail, //MSG_RUNOUTS c=7
_T(MSG_CRASH), crashX, crashY); ////c=7
#endif
menu_back_if_clicked_fb();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1c85a103..93ba7275 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -796,7 +796,7 @@
#MSG_SOUND c=7
"Sound"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index cd34c481..3c28f099 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Zvuk"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 0f06486f..a6832af4 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Ton"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index d6a62755..46814647 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Sonido"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3a53fec7..4c48f1b9 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Son"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 6aafdeb4..43736dfd 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Suono"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"Esaurim"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 82a66159..758c6221 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Geluid"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c4893731..9f5ebed3 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1062,7 +1062,7 @@
"Sound"
"Dzwiek"
-# c=7
+#MSG_RUNOUTS c=7
"Runouts"
"Konce f"
From b52d87e9a54f5dfbbb31d015ac8964af8d95e02b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:02:42 +0200
Subject: [PATCH 202/254] Define #MSG_Z-LEVELING_ENFORCED c=20 r=4
---
Firmware/Marlin_main.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 86e5f5c8..d4037338 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -5323,7 +5323,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
Sound_MakeSound(e_SOUND_TYPE_StandardAlert);
bool bState;
do { // repeat until Z-leveling o.k.
- lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ..."));
+ lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ..."));////MSG_Z-LEVELING_ENFORCED c=20 r=4
#ifdef TMC2130
lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT);
calibrate_z_auto(); // Z-leveling (X-assembly stay up!!!)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 93ba7275..426b4f27 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -799,7 +799,7 @@
#MSG_RUNOUTS c=7
"Runouts"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
#MSG_SOUND_ONCE c=7
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3c28f099..95e678ca 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"\x00"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Vyskytl se problem, srovnavam osu Z ..."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a6832af4..fe672933 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"\x00"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Fehler aufgetreten, Z-Kalibrierung erforderlich..."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 46814647..894769da 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"\x00"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Problema encontrado, nivelacion Z forzosa ..."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 4c48f1b9..0467f10f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"\x00"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Probleme rencontre, cliquez sur le bouton pour niveller l'axe Z..."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 43736dfd..ff80efcd 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"Esaurim"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Sono stati rilevati problemi, avviato livellamento Z ..."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 758c6221..64da8c91 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"\x00"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Er is een probleem opgetreden, Z-kalibratie afgedwongen ..."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 9f5ebed3..b1016ba7 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1066,7 +1066,7 @@
"Runouts"
"Konce f"
-#
+#MSG_Z-LEVELING_ENFORCED c=20 r=4
"Some problem encountered, Z-leveling enforced ..."
"Wykryto problem, wymuszono poziomowanie osi Z."
From 960ebac02d9ca4e63735ffe9695a0cdb1950e144 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:04:47 +0200
Subject: [PATCH 203/254] Update #MSG_SPEED c=15
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index d6565145..d3b56c65 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6802,7 +6802,7 @@ static void lcd_tune_menu()
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN)); //1
- MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED
+ MENU_ITEM_EDIT_int3_P(_i("Speed"), &feedmultiply, 10, 999);//2////MSG_SPEED c=15
MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10);//3
MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 10);//4
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 426b4f27..3206a64e 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -805,7 +805,7 @@
#MSG_SOUND_ONCE c=7
"Once"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
#MSG_SELFTEST_FAN_YES c=19
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 95e678ca..a4322196 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1074,7 +1074,7 @@
"Once"
"Jednou"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Rychlost"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fe672933..80a829b8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1074,7 +1074,7 @@
"Once"
"Einmal"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Geschwindigkeit"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 894769da..9c5e26a7 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1074,7 +1074,7 @@
"Once"
"Una vez"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Velocidad"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0467f10f..0840092a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1074,7 +1074,7 @@
"Once"
"Une fois"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Vitesse"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ff80efcd..bc6691a1 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1074,7 +1074,7 @@
"Once"
"Singolo"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Velocita"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 64da8c91..ff18b537 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1074,7 +1074,7 @@
"Once"
"Eenmaal"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Snelheid"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b1016ba7..51607387 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1074,7 +1074,7 @@
"Once"
"1-raz"
-#MSG_SPEED
+#MSG_SPEED c=15
"Speed"
"Predkosc"
From ba38262109e936a2493c3e10fd6fda7c7c527f7e Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:05:28 +0200
Subject: [PATCH 204/254] Update #MSG_STATISTICS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index d3b56c65..0fabef38 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6661,7 +6661,7 @@ static void lcd_main_menu()
}
if (!is_usb_printing && (lcd_commands_type != LcdCommands::Layer1Cal)) {
- MENU_ITEM_SUBMENU_P(_i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS
+ MENU_ITEM_SUBMENU_P(_i("Statistics "), lcd_menu_statistics);////MSG_STATISTICS c=18
}
#if defined(TMC2130) || defined(FILAMENT_SENSOR)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3206a64e..92036660 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -814,7 +814,7 @@
#MSG_TEMP_CAL_WARNING c=20 r=4
"Stable ambient temperature 21-26C is needed a rigid stand is required."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
#MSG_STOP_PRINT c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a4322196..7e2c9359 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Je vyzadovana stabilni pokojova teplota 21-26C a pevna podlozka."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statistika "
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 80a829b8..b052fefb 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Stabile Umgebungs- temperatur 21-26C und feste Stand- flaeche erforderlich"
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statistiken "
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9c5e26a7..adb6c630 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Se necesita una temperatura ambiente ente 21 y 26C y un soporte rigido."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Estadisticas "
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 0840092a..e3cb27c4 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Une temperature ambiante stable de 21-26C et un support stable sont requis."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statistiques"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index bc6691a1..bec5560d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Sono necessari una temperatura ambiente di 21-26C e una superficie rigida "
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statistiche"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ff18b537..f2af1ddf 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"En stabiele 21-26C omgevingstemperatuur is nodig,een stevige stand is vereist."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statistieken"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 51607387..4b0b3755 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1086,7 +1086,7 @@
"Stable ambient temperature 21-26C is needed a rigid stand is required."
"Potrzebna jest stabilna temperatura otoczenia 21-26C i stabilne podloze."
-#MSG_STATISTICS
+#MSG_STATISTICS c=18
"Statistics "
"Statystyki"
From 2e43234d3f3d9c00645b1ba83814127377e00f40 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:06:46 +0200
Subject: [PATCH 205/254] Update #MSG_SUPPORT c=18
---
Firmware/ultralcd.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/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0fabef38..95b4ab25 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6670,9 +6670,9 @@ static void lcd_main_menu()
if (mmu_enabled) {
MENU_ITEM_SUBMENU_P(_i("Fail stats MMU"), lcd_menu_fails_stats_mmu);////MSG_MMU_FAIL_STATS c=18
}
- MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT
+ MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=18
#ifdef LCD_TEST
- MENU_ITEM_SUBMENU_P(_i("W25x20CL init"), lcd_test_menu);////MSG_SUPPORT
+ MENU_ITEM_SUBMENU_P(_i("W25x20CL init"), lcd_test_menu);
#endif //LCD_TEST
MENU_END();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 92036660..d602927a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -823,7 +823,7 @@
#MSG_STOPPED c=20
"STOPPED. "
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
#MSG_SELFTEST_SWAPPED c=16
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 7e2c9359..d8cda7be 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"ZASTAVENO."
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"Podpora"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b052fefb..31f2f82b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"GESTOPPT."
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index adb6c630..92f55bdc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"PARADA"
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"Soporte"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e3cb27c4..cfb90f75 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"ARRETE."
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index bec5560d..03161611 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"ARRESTATO."
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"Supporto"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f2af1ddf..85bf1552 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"GESTOPT. "
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 4b0b3755..84c3e8ae 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1098,7 +1098,7 @@
"STOPPED. "
"ZATRZYMANO."
-#MSG_SUPPORT
+#MSG_SUPPORT c=18
"Support"
"Wsparcie"
From 7268f6a824f7ccb3ac8d0467772b6d156d76cbbe Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:08:09 +0200
Subject: [PATCH 206/254] Define #MSG_SELECT_FILAMENT c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 95b4ab25..37273a80 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4621,7 +4621,7 @@ void lcd_v2_calibration()
if (mmu_enabled)
{
const uint8_t filament = choose_menu_P(
- _i("Select filament:"), ////c=20
+ _i("Select filament:"), ////MSG_SELECT_FILAMENT c=20
_T(MSG_FILAMENT),_T(MSG_CANCEL));
if (filament < 5)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d602927a..6276210a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -829,7 +829,7 @@
#MSG_SELFTEST_SWAPPED c=16
"Swapped"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
#MSG_TEMP_CALIBRATION c=14
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d8cda7be..d835b548 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Prohozene"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Zvolte filament:"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 31f2f82b..afe37e1e 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Ausgetauscht"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Filament auswaehlen:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 92f55bdc..69672442 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Intercambiado"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Selecciona filamento"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cfb90f75..608e8a01 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Echange"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Selectionnez le filament:"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 03161611..c50fb5ee 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Scambiato"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Seleziona il filamento:"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 85bf1552..bb8df799 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Gewisseld"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Kies filament:"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 84c3e8ae..00571c4b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1106,7 +1106,7 @@
"Swapped"
"Zamieniono"
-# c=20
+#MSG_SELECT_FILAMENT c=20
"Select filament:"
"Wybierz filament:"
From c0df79d39a25a9ff26cca30114f24af19ab3d36c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:10:03 +0200
Subject: [PATCH 207/254] Define #MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 37273a80..939c3c22 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4762,7 +4762,7 @@ static void wizard_lay1cal_message(bool cold)
else if (cold)
{
lcd_show_fullscreen_message_and_wait_P(
- _i("Select temperature which matches your material."));////c=20 r=4
+ _i("Select temperature which matches your material."));////MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
}
lcd_show_fullscreen_message_and_wait_P(
_i("The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter).")); ////MSG_WIZARD_V2_CAL_2 c=20 r=12
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6276210a..a0924bda 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -835,7 +835,7 @@
#MSG_TEMP_CALIBRATION c=14
"Temp. cal."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
#MSG_CALIBRATION_PINDA_MENU c=17 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d835b548..dd191c54 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Tepl. kal."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Zvolte teplotu, ktera odpovida vasemu materialu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index afe37e1e..29715ee8 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Temp Kalib."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Waehlen Sie die Temperatur, die zu Ihrem Material passt."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 69672442..3cf54330 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Cal. temp."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Selecciona la temperatura adecuada a tu material."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 608e8a01..dbc89f1e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Calib. Temp."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Selectionnez la temperature qui correspond a votre materiau."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index c50fb5ee..0d3cc3a6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Calib. temp."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Seleziona la temperatura appropriata per il tuo materiale."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index bb8df799..fcb47bce 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Tempkalib."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Selecteer de temperatuur die overeenkomt met uw materiaal."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 00571c4b..ff463ba2 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1114,7 +1114,7 @@
"Temp. cal."
"Kalib. temp."
-# c=20 r=4
+#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
"Wybierz temperature, ktora odpowiada Twojemu filamentowi."
From 7a88ce89e4825ffe34090d4d36d8cad390d858a1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:11:01 +0200
Subject: [PATCH 208/254] Update MSG_TEMPERATURE c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 939c3c22..52f350a6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5588,7 +5588,7 @@ static void lcd_settings_menu()
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
- MENU_ITEM_SUBMENU_P(_i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE
+ MENU_ITEM_SUBMENU_P(_i("Temperature"), lcd_control_temperature_menu);////MSG_TEMPERATURE c=18
if (!PRINTER_ACTIVE || isPrintPaused)
{
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index a0924bda..363c820a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -850,7 +850,7 @@
#MSG_FS_VERIFIED c=20 r=3
"Sensor verified, remove the filament now."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
#MSG_MENU_TEMPERATURES c=15 r=1
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index dd191c54..270bf019 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Senzor overen, vyjmete filament."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"Teplota"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 29715ee8..56840a07 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Sensor ueberprueft, entladen Sie jetzt das Filament."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"Temperatur"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 3cf54330..122d4eea 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Sensor verificado, retire el filamento ahora."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"Temperatura"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index dbc89f1e..bfd658c6 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Capteur verifie, retirez le filament maintenant."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0d3cc3a6..4bdb46f2 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Sensore verificato, rimuovere il filamento."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index fcb47bce..902832c3 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Sensor geverifieerd, verwijder nu het filament."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"Temperatuur"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index ff463ba2..103f1421 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1134,7 +1134,7 @@
"Sensor verified, remove the filament now."
"Czujnik sprawdzony, wyciagnij filament."
-#MSG_TEMPERATURE
+#MSG_TEMPERATURE c=18
"Temperature"
"Temperatura"
From 982153fee1e29403298e34e24d96b82484933d84 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:16:36 +0200
Subject: [PATCH 209/254] Define and update #MSG_PRINT_TIME c=19,
#MSG_FILAMENT_USED c=19, #MSG_TOTAL_FILAMENT c=19, #MSG_TOTAL_PRINT_TIME c=19
---
Firmware/ultralcd.cpp | 16 ++++++++--------
lang/lang_en.txt | 4 ++--
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, 24 insertions(+), 24 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 52f350a6..6818066a 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2592,9 +2592,9 @@ static void lcd_LoadFilament()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Filament used: | c=19
+//! |Filament used: | MSG_FILAMENT_USED c=19
//! | 0000.00m |
-//! |Print time: | c=19 r=1
+//! |Print time: | MSG_PRINT_TIME c=19
//! | 00h 00m 00s |
//! ----------------------
//! @endcode
@@ -2603,9 +2603,9 @@ static void lcd_LoadFilament()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |Total filament: | c=19 r=1
+//! |Total filament: | MSG_TOTAL_FILAMENT c=19
//! | 0000.00m |
-//! |Total print time: | c=19 r=1
+//! |Total print time: | MSG_TOTAL_PRINT_TIME c=19
//! | 00d 00h 00m |
//! ----------------------
//! @endcode
@@ -2628,8 +2628,8 @@ void lcd_menu_statistics()
"%S:\n"
"%10ldh %02hhdm %02hhds"
),
- _i("Filament used"), _met, ////c=19
- _i("Print time"), _h, _m, _s); ////c=19 r=1
+ _i("Filament used"), _met, ////MSG_FILAMENT_USED c=19
+ _i("Print time"), _h, _m, _s); ////MSG_PRINT_TIME c=19
menu_back_if_clicked_fb();
}
else
@@ -2650,8 +2650,8 @@ void lcd_menu_statistics()
"%S:\n"
"%10ldd %02hhdh %02hhdm"
),
- _i("Total filament"), _filament_m, ////c=19 r=1
- _i("Total print time"), _days, _hours, _minutes); ////c=19 r=1
+ _i("Total filament"), _filament_m, ////MSG_TOTAL_FILAMENT c=19
+ _i("Total print time"), _days, _hours, _minutes); ////MSG_TOTAL_PRINT_TIME c=19
menu_back_if_clicked_fb();
}
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 363c820a..86243dcc 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -859,10 +859,10 @@
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
#MSG_TUNE c=18
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 270bf019..0624f8af 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Je potreba kalibrovat osu Z. Prosim postupujte dle prirucky, kapitola Zaciname, sekce Postup kalibrace."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Filament celkem"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Celkovy cas tisku"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 56840a07..871608a6 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Es ist noch not- wendig die Z- Kalibrierung aus- zufuehren. Bitte befolgen Sie das Handbuch, Kapitel Erste Schritte, Abschnitt Kalibrierablauf."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Gesamtes Filament"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Gesamte Druckzeit"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 122d4eea..0b084f1f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Todavia es necesario hacer una calibracion Z. Por favor siga el manual, capitulo Primeros pasos, seccion Calibracion del flujo."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Filamento total"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Tiempo total"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bfd658c6..cacd2772 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Il faut toujours effectuer la Calibration Z. Veuillez suivre le manuel, chapitre Premiers pas, section Processus de calibration."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Filament total"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Temps total impr."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 4bdb46f2..49c35e2d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"E ancora necessario effettuare la calibrazione Z. Segui il manuale, capitolo Primi Passi, sezione Sequenza di Calibrazione. "
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Filamento totale"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Tempo stampa totale"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 902832c3..6b7d9d1a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Er is nog steeds een noodzaak om de Z-kalibratie uit te voeren. Volg de handleiding, hoofdstuk First steps, section Calibration flow."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Totaal fil. "
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Totaal printtijd"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 103f1421..363a40a2 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1146,11 +1146,11 @@
"There is still a need to make Z calibration. Please follow the manual, chapter First steps, section Calibration flow."
"Musimy przeprowadzic kalibracje Z. Kieruj sie Samouczkiem: rozdzial Pierwsze Kroki, sekcja Kalibracja."
-#
+#MSG_TOTAL_FILAMENT c=19
"Total filament"
"Zuzycie filamentu"
-#
+#MSG_TOTAL_PRINT_TIME c=19
"Total print time"
"Laczny czas druku"
From 67a0370332ebe73b4041dc5e9e80aa0ae046447d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:19:56 +0200
Subject: [PATCH 210/254] Delete "Unload" as it isn't used anymore
---
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 ----
8 files changed, 31 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 86243dcc..39c480e3 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -868,9 +868,6 @@
#MSG_TUNE c=18
"Tune"
-#
-"Unload"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0624f8af..0e6b3e5e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Ladit"
-#
-"Unload"
-"Vysunout"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Celkem selhani"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 871608a6..2627f3dd 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Feineinstellung"
-#
-"Unload"
-"Entladen"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Gesamte Fehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 0b084f1f..9630299b 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Ajustar"
-#
-"Unload"
-"Descargar"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Fallos totales"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index cacd2772..efe1c4d0 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Regler"
-#
-"Unload"
-"Decharger"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Total des echecs"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 49c35e2d..702550cc 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Regola"
-#
-"Unload"
-"Scarica"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Totale fallimenti"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6b7d9d1a..66996179 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Fijnafstemming"
-#
-"Unload"
-"Verwijderen"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Totaal fouten"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 363a40a2..b2b0ed5d 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1158,10 +1158,6 @@
"Tune"
"Strojenie"
-#
-"Unload"
-"Rozladuj"
-
#MSG_TOTAL_FAILURES c=20
"Total failures"
"Suma bledow"
From 5e049283be628b87cc98ade18e6dfc15324787e0 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:24:41 +0200
Subject: [PATCH 211/254] Define #MSG_UNKNOWN c=13
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6818066a..aa1789d6 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1944,7 +1944,7 @@ static void lcd_support_menu()
if ((mmu_version > 0) && (mmu_buildnr > 0))
lcd_printf_P(PSTR("%d.%d.%d-%d"), mmu_version/100, mmu_version%100/10, mmu_version%10, mmu_buildnr);
else
- lcd_puts_P(_i("unknown"));
+ lcd_puts_P(_i("unknown")); ////MSG_UNKNOWN c=13
}
}
else
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 39c480e3..4360855a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -892,7 +892,7 @@
#MSG_MENU_VOLTAGES c=15 r=1
"Voltages"
-#
+#MSG_UNKNOWN c=13
"unknown"
#MSG_USERWAIT c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 0e6b3e5e..5962e094 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Napeti"
-#
+#MSG_UNKNOWN c=13
"unknown"
"neznamy"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2627f3dd..0ab5a0b2 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Spannungen"
-#
+#MSG_UNKNOWN c=13
"unknown"
"unbekannt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 9630299b..921a1b00 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Voltajes"
-#
+#MSG_UNKNOWN c=13
"unknown"
"desconocido"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index efe1c4d0..5378762f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Tensions"
-#
+#MSG_UNKNOWN c=13
"unknown"
"inconnu"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 702550cc..3ca3559f 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Voltaggi"
-#
+#MSG_UNKNOWN c=13
"unknown"
"sconosciuto"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 66996179..d9b11466 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Spanning"
-#
+#MSG_UNKNOWN c=13
"unknown"
"onbekend"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index b2b0ed5d..c45ffee5 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1190,7 +1190,7 @@
"Voltages"
"Napiecia"
-#
+#MSG_UNKNOWN c=13
"unknown"
"nieznane"
From e470ee96c8f901afcf86ca01d78ff1af15c3375b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:26:41 +0200
Subject: [PATCH 212/254] Update #MSG_BACK c=18
---
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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 4360855a..1454fbae 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -985,7 +985,7 @@
#MSG_ON c=3
"On"
-#
+#MSG_BACK c=18
"Back"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 5962e094..02fed5aa 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1314,7 +1314,7 @@
"On"
"Zap"
-#
+#MSG_BACK c=18
"Back"
"Zpet"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 0ab5a0b2..c6bc1f71 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1314,7 +1314,7 @@
"On"
"An"
-#
+#MSG_BACK c=18
"Back"
"Zurueck"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 921a1b00..c6dd86c2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1314,7 +1314,7 @@
"On"
"Act"
-#
+#MSG_BACK c=18
"Back"
"atras"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 5378762f..6cef69eb 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1314,7 +1314,7 @@
"On"
"\x00"
-#
+#MSG_BACK c=18
"Back"
"Retour"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3ca3559f..152e8987 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1314,7 +1314,7 @@
"On"
"\x00"
-#
+#MSG_BACK c=18
"Back"
"Indietro"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index d9b11466..f2c83901 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1314,7 +1314,7 @@
"On"
"Aan"
-#
+#MSG_BACK c=18
"Back"
"terug"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c45ffee5..3b7072a2 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1314,7 +1314,7 @@
"On"
"Wl"
-#
+#MSG_BACK c=18
"Back"
"Wstecz"
From 1ca443f1f4d22b8f8bf003ea769aed2ca3db4ee8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:28:18 +0200
Subject: [PATCH 213/254] Define #MSG_CHECKS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index aa1789d6..759934a8 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -5556,7 +5556,7 @@ void lcd_hw_setup_menu(void) // can not be "static"
MENU_ITEM_SUBMENU_P(_T(MSG_STEEL_SHEETS), sheets_menu);
SETTINGS_NOZZLE;
- MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu);
+ MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); ////MSG_CHECKS c=18
#ifdef IR_SENSOR_ANALOG
FSENSOR_ACTION_NA;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 1454fbae..46275af5 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -988,7 +988,7 @@
#MSG_BACK c=18
"Back"
-#
+#MSG_CHECKS c=18
"Checks"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 02fed5aa..26bc036d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1318,7 +1318,7 @@
"Back"
"Zpet"
-#
+#MSG_CHECKS c=18
"Checks"
"Kontrola"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index c6bc1f71..1c26bd2b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1318,7 +1318,7 @@
"Back"
"Zurueck"
-#
+#MSG_CHECKS c=18
"Checks"
"Kontrolle"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index c6dd86c2..f98b39d5 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1318,7 +1318,7 @@
"Back"
"atras"
-#
+#MSG_CHECKS c=18
"Checks"
"Comprobaciones"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 6cef69eb..47dddd0b 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1318,7 +1318,7 @@
"Back"
"Retour"
-#
+#MSG_CHECKS c=18
"Checks"
"Verifications"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 152e8987..5df25384 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1318,7 +1318,7 @@
"Back"
"Indietro"
-#
+#MSG_CHECKS c=18
"Checks"
"Controlli"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index f2c83901..28fe3722 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1318,7 +1318,7 @@
"Back"
"terug"
-#
+#MSG_CHECKS c=18
"Checks"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 3b7072a2..92fc503c 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1318,7 +1318,7 @@
"Back"
"Wstecz"
-#
+#MSG_CHECKS c=18
"Checks"
"Testy"
From c0b8eef6cd6245701299906bb604fa3eb68809f5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:29:42 +0200
Subject: [PATCH 214/254] Define #MSG_FALSE_TRIGGERING c=20
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 759934a8..2189f81c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8123,7 +8123,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
break;
case TestError::TriggeringFsensor:
lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR));
- lcd_puts_at_P(0, 3, _i("False triggering"));////c=20
+ lcd_puts_at_P(0, 3, _i("False triggering"));////MSG_FALSE_TRIGGERING c=20
break;
case TestError::FsensorLevel:
lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_FILAMENT_SENSOR));
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 46275af5..6c5cd2ed 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -991,7 +991,7 @@
#MSG_CHECKS c=18
"Checks"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 26bc036d..e0c1bfb7 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Kontrola"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Falesne spusteni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 1c26bd2b..a048e434 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Kontrolle"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Falschtriggerung"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index f98b39d5..8283d771 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Comprobaciones"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Falsa activacion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 47dddd0b..59ebb3ad 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Verifications"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Faux declenchement"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 5df25384..75a63a52 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Controlli"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Falso innesco"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 28fe3722..06224abd 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1322,7 +1322,7 @@
"Checks"
"\x00"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Valse triggering"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 92fc503c..202d9539 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1322,7 +1322,7 @@
"Checks"
"Testy"
-#
+#MSG_FALSE_TRIGGERING c=20
"False triggering"
"Falszywy alarm"
From 268d4020cf198d14e38efb6082608412ff50616b Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:32:43 +0200
Subject: [PATCH 215/254] Define #MSG_FINDA c=5 and update #MSG_PINDA c=5
---
Firmware/messages.c | 2 +-
Firmware/ultralcd.cpp | 4 ++--
lang/lang_en.txt | 4 ++--
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 | 2 +-
lang/lang_en_pl.txt | 4 ++--
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 7bfbbbe2..194a72bd 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -73,7 +73,7 @@ const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=3
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
-const char MSG_PINDA[] PROGMEM_I1 = ISTR("PINDA");////c=6
+const char MSG_PINDA[] PROGMEM_I1 = ISTR("PINDA");////c=5
const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=5
const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20
const char MSG_POWER_FAILURES[] PROGMEM_I1 = ISTR("Power failures"); ////c=15
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2189f81c..b0edd32f 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -3745,7 +3745,7 @@ static void lcd_print_state(uint8_t state)
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |PINDA N/A FINDA N/A| MSG_PINDA c=6 MSG_FINDA c=6
+//! |PINDA N/A FINDA N/A| MSG_PINDA c=5 MSG_FINDA c=5
//! |Fil. sensor N/A| MSG_FSENSOR
//! |Xd 000 Yd 000| MSG_XD
//! |Int 000 Shut 000|
@@ -3770,7 +3770,7 @@ static void lcd_show_sensors_state()
if (mmu_enabled == true)
{
- lcd_puts_at_P(10, 0, _i("FINDA"));
+ lcd_puts_at_P(10, 0, _i("FINDA"));////MSG_FINDA c=5
lcd_set_cursor(LCD_WIDTH - 3, 0);
lcd_print_state(finda_state);
}
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 6c5cd2ed..e8a10a1a 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -616,7 +616,7 @@
#MSG_WIZARD_HEATING c=20 r=3
"Preheating nozzle. Please wait."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
#MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20
@@ -994,7 +994,7 @@
#MSG_FALSE_TRIGGERING c=20
"False triggering"
-#
+#MSG_FINDA c=5
"FINDA"
#MSG_FIRMWARE c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e0c1bfb7..a5f7d702 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Predehrev trysky. Prosim cekejte."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Falesne spusteni"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index a048e434..741cdd83 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Vorheizen der Duese. Bitte warten."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Falschtriggerung"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8283d771..b2be7081 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Precalentando nozzle. Espera por favor."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Falsa activacion"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 59ebb3ad..049efa34 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Prechauffage de la buse. Merci de patienter."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Faux declenchement"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 75a63a52..8c78a763 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Preriscaldando l'ugello. Attendere prego."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Falso innesco"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 06224abd..e85e1a64 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Opwarmen van de tuit. Wacht aub."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 202d9539..59a47cde 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -822,7 +822,7 @@
"Preheating nozzle. Please wait."
"Nagrzewanie dyszy. Prosze czekac."
-#MSG_PINDA c=6
+#MSG_PINDA c=5
"PINDA"
"\x00"
@@ -1326,7 +1326,7 @@
"False triggering"
"Falszywy alarm"
-#
+#MSG_FINDA c=5
"FINDA"
"\x00"
From c0869efc7697c418d45391eda1eaac6fdd92f107 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:36:26 +0200
Subject: [PATCH 216/254] Define #MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4,
#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
---
Firmware/Marlin_main.cpp | 4 ++--
lang/lang_en.txt | 4 ++--
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, 18 insertions(+), 18 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index d4037338..cd04eee3 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -874,14 +874,14 @@ static void check_if_fw_is_on_right_printer(){
if((PRINTER_TYPE == PRINTER_MK3) || (PRINTER_TYPE == PRINTER_MK3S)){
#ifdef IR_SENSOR
if (pat9125_probe()){
- lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));}////c=20 r=3
+ lcd_show_fullscreen_message_and_wait_P(_i("MK3S firmware detected on MK3 printer"));}////MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
#endif //IR_SENSOR
#ifdef PAT9125
//will return 1 only if IR can detect filament in bondtech extruder so this may fail even when we have IR sensor
const uint8_t ir_detected = !READ(IR_SENSOR_PIN);
if (ir_detected){
- lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////c=20 r=3
+ lcd_show_fullscreen_message_and_wait_P(_i("MK3 firmware detected on MK3S printer"));}////MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
#endif //PAT9125
}
#endif //FILAMENT_SENSOR
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e8a10a1a..3e629b26 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -466,7 +466,7 @@
#MSG_MODE c=6
"Mode"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
#MSG_NORMAL c=7
@@ -1015,7 +1015,7 @@
#MSG_MESH c=12
"Mesh"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
#MSG_MMU_MODE c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a5f7d702..3fb5623a 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -622,7 +622,7 @@
"Mode"
"Mod"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"\x00"
@@ -1354,7 +1354,7 @@
"Mesh"
"\x00"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"MK3S firmware detekovan na tiskarne MK3"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 741cdd83..489a8826 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -622,7 +622,7 @@
"Mode"
"Modus"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"MK3-Firmware am MK3S-Drucker erkannt"
@@ -1354,7 +1354,7 @@
"Mesh"
"Gitter"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"MK3S-Firmware auf MK3-Drucker erkannt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index b2be7081..43d594e3 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -622,7 +622,7 @@
"Mode"
"Modo"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"Firmware MK3 detectado en impresora MK3S"
@@ -1354,7 +1354,7 @@
"Mesh"
"Malla"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"Firmware MK3S detectado en impresora MK3"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 049efa34..3b6c4fdd 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -622,7 +622,7 @@
"Mode"
"\x00"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"Firmware MK3 detecte sur imprimante MK3S"
@@ -1354,7 +1354,7 @@
"Mesh"
"\x00"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"Firmware MK3S detecte sur imprimante MK3"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8c78a763..91cf01d6 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -622,7 +622,7 @@
"Mode"
"Mod."
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"Firmware MK3 rilevato su stampante MK3S"
@@ -1354,7 +1354,7 @@
"Mesh"
"Griglia"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"Firmware MK3S rilevato su stampante MK3"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index e85e1a64..0d692e3a 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -622,7 +622,7 @@
"Mode"
"Stand"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"MK3-firmware bij MK3S-printer gedetecteerd"
@@ -1354,7 +1354,7 @@
"Mesh"
"\x00"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"MK3S-firmware op MK3-printer ontdekt"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 59a47cde..6254da79 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -622,7 +622,7 @@
"Mode"
"Tryb"
-# c=20 r=3
+#MSG_MK3_FIRMWARE_ON_MK3S c=20 r=4
"MK3 firmware detected on MK3S printer"
"Wykryto firmware MK3 w drukarce MK3S"
@@ -1354,7 +1354,7 @@
"Mesh"
"Siatka"
-#
+#MSG_MK3S_FIRMWARE_ON_MK3 c=20 r=4
"MK3S firmware detected on MK3 printer"
"Wykryto firmware MK3S w drukarce MK3"
From cdfc40fb628812d59444f5eac133f66f49d664b5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:38:41 +0200
Subject: [PATCH 217/254] Define #MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index b0edd32f..6ac2ba20 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4281,7 +4281,7 @@ static void lcd_silent_mode_set() {
}
eeprom_update_byte((unsigned char *)EEPROM_SILENT, SilentModeMenu);
#ifdef TMC2130
- lcd_display_message_fullscreen_P(_i("Mode change in progress ..."));
+ lcd_display_message_fullscreen_P(_i("Mode change in progress ..."));////MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
// Wait until the planner queue is drained and the stepper routine achieves
// an idle state.
st_synchronize();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3e629b26..3ac5c74d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1021,7 +1021,7 @@
#MSG_MMU_MODE c=8
"MMU Mode"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
#MSG_MODEL c=8
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 3fb5623a..e6648fe3 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"MMU mod"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Probiha zmena modu..."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 489a8826..615f37e7 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"MMU Modus"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Moduswechsel erfolgt..."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 43d594e3..1555efcc 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"Modo MMU"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Cambio de modo progresando ..."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 3b6c4fdd..ede8a71e 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"Mode MMU"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Changement de mode en cours..."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 91cf01d6..ea848fdc 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"Mod. MMU"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Cambio modalita in corso ..."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 0d692e3a..6b65b3b7 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"MMU Mod"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Moduswijziging bezig..."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 6254da79..cd2b5157 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1362,7 +1362,7 @@
"MMU Mode"
"Tryb MMU"
-#
+#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
"Trwa zmiana trybu..."
From 15919a0f093980e66937c4fcb4c67ab2f5e52ada Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:41:21 +0200
Subject: [PATCH 218/254] Define #MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5,
#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
---
Firmware/util.cpp | 4 ++--
lang/lang_en.txt | 4 ++--
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, 18 insertions(+), 18 deletions(-)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index 3dd53ea8..cf9b05b7 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -393,13 +393,13 @@ switch(oCheckMode)
{
case ClCheckMode::_Warn:
// lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));
-lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));////c=20 r=5
+lcd_display_message_fullscreen_P(_i("Printer nozzle diameter differs from the G-code. Continue?"));////MSG_NOZZLE_DIFFERS_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
break;
case ClCheckMode::_Strict:
- lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////c=20 r=9
+ lcd_show_fullscreen_message_and_wait_P(_i("Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."));////MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
lcd_print_stop();
break;
case ClCheckMode::_None:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3ac5c74d..3f689ccb 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1054,10 +1054,10 @@
#MSG_PREHEATING_TO_EJECT c=20
"Preheating to eject"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
# c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index e6648fe3..83aa5759 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Predehrev k vysunuti"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Prumer trysky tiskarny se lisi od G-code. Pokracovat?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Prumer trysky tiskarny se lisi od G-code. Prosim zkontrolujte nastaveni. Tisk zrusen."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 615f37e7..6cc3f9ed 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Heizen zum Auswurf"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Fortfahren?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Der Durchmesser der Druckerduese weicht vom G-Code ab. Bitte ueberpruefen Sie den Wert in den Einstellungen. Druck abgebrochen."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 1555efcc..5a18a9c8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Precalent. expulsar"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro nozzle impresora difiere de cod.G. ?Continuar?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro nozzle Impresora difiere de cod.G. Comprueba los valores en ajustes. Impresion cancelada."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index ede8a71e..b4d98253 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Chauf. pour remonter"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Continuer?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametre de la buse dans les reglages ne correspond pas a celui dans le G-Code. Merci de verifier le parametre dans les reglages. Impression annulee."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index ea848fdc..7e7d68ec 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Preriscalda. espuls."
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Diametro ugello diverso da G-Code. Continuare?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Diametro ugello diverso dal G-Code. Controlla il valore nelle impostazioni. Stampa annullata."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6b65b3b7..43e98510 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Opwarm.te uitwerpen"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"De diameter van de tuit van de printer verschilt van de G-code. Doorgaan?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"De diameter van de tuit van de printer verschilt van de G-code. Controleer de waarde in de instellingen. Afdrukken geannuleerd."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index cd2b5157..e5e517e6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1406,11 +1406,11 @@
"Preheating to eject"
"Nagrzew. wysuniecia"
-# c=20 r=5
+#MSG_NOZZLE_DIFFERS_CONTINUE c=20 r=5
"Printer nozzle diameter differs from the G-code. Continue?"
"Srednica dyszy drukarki rozni sie od tej w G-code. Kontynuowac?"
-# c=20 r=9
+#MSG_NOZZLE_DIFFERS_CANCELLED c=20 r=9
"Printer nozzle diameter differs from the G-code. Please check the value in settings. Print cancelled."
"Srednica dyszy rozni sie od tej w G-code. Sprawdz ustawienia. Druk anulowany."
From 9a0e67c1d73128ee1791ff2f8d164d6fd703d0c8 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:43:48 +0200
Subject: [PATCH 219/254] Define #MSG_RENAME c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 6ac2ba20..f4b76415 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6493,7 +6493,7 @@ static void lcd_sheet_menu()
{
MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), activate_calibrate_sheet);////MSG_V2_CALIBRATION c=18
}
- MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); //// c=18
+ MENU_ITEM_SUBMENU_P(_i("Rename"), lcd_rename_sheet_menu); ////MSG_RENAME c=18
MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_reset_sheet); ////MSG_RESET c=14
MENU_END();
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 3f689ccb..08c0a11f 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1063,7 +1063,7 @@
# c=20
"%s level expected"
-#
+#MSG_RENAME c=18
"Rename"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 83aa5759..29d8429b 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"\x00"
-#
+#MSG_RENAME c=18
"Rename"
"Prejmenovat"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 6cc3f9ed..78cc8b80 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"\x00"
-#
+#MSG_RENAME c=18
"Rename"
"Umbenennen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 5a18a9c8..731d2944 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"\x00"
-#
+#MSG_RENAME c=18
"Rename"
"Renombrar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index b4d98253..f673a34f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"\x00"
-#
+#MSG_RENAME c=18
"Rename"
"Renommer"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7e7d68ec..65245f5d 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"atteso livello %s"
-#
+#MSG_RENAME c=18
"Rename"
"Rinomina"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 43e98510..71de8c09 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"\x00"
-#
+#MSG_RENAME c=18
"Rename"
"Hernoem"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index e5e517e6..27e7a6db 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1418,7 +1418,7 @@
"%s level expected"
"Oczekiwano wersji %s"
-#
+#MSG_RENAME c=18
"Rename"
"Zmien nazwe"
From 3fb90be46f6bd091a133e809908967732f4d2c33 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:50:18 +0200
Subject: [PATCH 220/254] Define #MSG_SELECT c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f4b76415..af06ea8c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -6486,7 +6486,7 @@ static void lcd_sheet_menu()
MENU_ITEM_BACK_P(_T(MSG_STEEL_SHEETS));
if(eeprom_is_sheet_initialized(selected_sheet)){
- MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); //// c=18
+ MENU_ITEM_SUBMENU_P(_i("Select"), change_sheet); ////MSG_SELECT c=18
}
if (lcd_commands_type == LcdCommands::Idle)
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 08c0a11f..999c7f81 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1066,7 +1066,7 @@
#MSG_RENAME c=18
"Rename"
-#
+#MSG_SELECT c=18
"Select"
#
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 29d8429b..6682a8d1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Prejmenovat"
-#
+#MSG_SELECT c=18
"Select"
"Vybrat"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 78cc8b80..909709dd 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Umbenennen"
-#
+#MSG_SELECT c=18
"Select"
"Auswahl"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 731d2944..0945d971 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Renombrar"
-#
+#MSG_SELECT c=18
"Select"
"Seleccionar"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f673a34f..39df3ca5 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Renommer"
-#
+#MSG_SELECT c=18
"Select"
"Selectionner"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 65245f5d..fb22c411 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Rinomina"
-#
+#MSG_SELECT c=18
"Select"
"Seleziona"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 71de8c09..c1fca5a2 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Hernoem"
-#
+#MSG_SELECT c=18
"Select"
"Selecteer"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 27e7a6db..d7fb600e 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1422,7 +1422,7 @@
"Rename"
"Zmien nazwe"
-#
+#MSG_SELECT c=18
"Select"
"Wybierz"
From fb691b44b4a23bb83a2f88c24fcbb70710017075 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:51:22 +0200
Subject: [PATCH 221/254] Update #MSG_INFO_SENSORS c=18
---
Firmware/ultralcd.cpp | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index af06ea8c..9a8a0f88 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1980,7 +1980,7 @@ static void lcd_support_menu()
MENU_ITEM_BACK_P(STR_SEPARATOR);
MENU_ITEM_SUBMENU_P(_i("XYZ cal. details"), lcd_menu_xyz_y_min);////MSG_XYZ_DETAILS c=18
MENU_ITEM_SUBMENU_P(_i("Extruder info"), lcd_menu_extruder_info);////MSG_INFO_EXTRUDER c=18
- MENU_ITEM_SUBMENU_P(_i("Sensor info"), lcd_menu_show_sensors_state);////MSG_INFO_SENSORS c=18 r=1
+ MENU_ITEM_SUBMENU_P(_i("Sensor info"), lcd_menu_show_sensors_state);////MSG_INFO_SENSORS c=18
#ifdef TMC2130
MENU_ITEM_SUBMENU_P(_T(MSG_BELT_STATUS), lcd_menu_belt_status);////MSG_BELT_STATUS c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 999c7f81..96367296 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1069,7 +1069,7 @@
#MSG_SELECT c=18
"Select"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
#MSG_SHEET c=10
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 6682a8d1..62371c3e 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1426,7 +1426,7 @@
"Select"
"Vybrat"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Senzor info"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 909709dd..624af461 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1426,7 +1426,7 @@
"Select"
"Auswahl"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Sensor Info"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 0945d971..2b19e50f 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1426,7 +1426,7 @@
"Select"
"Seleccionar"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Info sensor"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 39df3ca5..035efddc 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1426,7 +1426,7 @@
"Select"
"Selectionner"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Info capteur"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index fb22c411..8643721a 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1426,7 +1426,7 @@
"Select"
"Seleziona"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Info Sensore"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index c1fca5a2..6b273011 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1426,7 +1426,7 @@
"Select"
"Selecteer"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index d7fb600e..703be2f0 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1426,7 +1426,7 @@
"Select"
"Wybierz"
-#
+#MSG_INFO_SENSORS c=18
"Sensor info"
"Info o sensorach"
From 84c3853351894b95e8554bd48f4694cce1965b6a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 07:53:27 +0200
Subject: [PATCH 222/254] Fix Dutch #MSG_FINDA c=5
---
lang/lang_en_nl.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 6b273011..98f2d484 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1326,7 +1326,7 @@
"False triggering"
"Valse triggering"
-#
+#MSG_FINDA c=5
"FINDA:"
"\x00"
From 8e74cbce58d380b4ceb1b0872bc281116364d88d Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 08:07:42 +0200
Subject: [PATCH 223/254] Remove r=1 and some minor fixes
---
Firmware/messages.c | 10 +--
Firmware/ultralcd.cpp | 138 +++++++++++++++++++++---------------------
lang/lang_en.txt | 53 ++++++++--------
lang/lang_en_cz.txt | 53 ++++++++--------
lang/lang_en_de.txt | 53 ++++++++--------
lang/lang_en_es.txt | 53 ++++++++--------
lang/lang_en_fr.txt | 53 ++++++++--------
lang/lang_en_it.txt | 53 ++++++++--------
lang/lang_en_nl.txt | 53 ++++++++--------
lang/lang_en_pl.txt | 53 ++++++++--------
10 files changed, 282 insertions(+), 290 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 194a72bd..23066aad 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -26,13 +26,13 @@ const char MSG_COMMUNITY_MADE[] PROGMEM_I1 = ISTR("Community made"); ////c=18
const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8
const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////c=18
const char MSG_CRASH[] PROGMEM_I1 = ISTR("Crash"); ////c=7
-const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1
+const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20
const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); ////c=13
const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=10
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17
const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////c=13
const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////c=15
-const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
+const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17
const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////c=14
const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////c=20 r=2
const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////c=20 r=2
@@ -51,8 +51,8 @@ const char MSG_FSENSOR[] PROGMEM_I1 = ISTR("Fil. sensor"); ////c=12
const char MSG_HEATING[] PROGMEM_I1 = ISTR("Heating"); ////c=20
const char MSG_HEATING_COMPLETE[] PROGMEM_I1 = ISTR("Heating done."); ////c=20
const char MSG_HOMEYZ[] PROGMEM_I1 = ISTR("Calibrate Z"); ////c=18
-const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20 r=1
-const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20 r=1
+const char MSG_CHOOSE_EXTRUDER[] PROGMEM_I1 = ISTR("Choose extruder:"); ////c=20
+const char MSG_CHOOSE_FILAMENT[] PROGMEM_I1 = ISTR("Choose filament:"); ////c=20
const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////c=18
const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////c=20
const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); //// Number 1 to 5 is added behind text e.g. "Load filament 1" c=16
@@ -114,7 +114,7 @@ const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////c=20
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
-const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20 r=1
+const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20
const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18
const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8
const char MSG_WIZARD_DONE[] PROGMEM_I1 = ISTR("All is done. Happy printing!"); ////c=20 r=8
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9a8a0f88..0609a31d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -676,7 +676,7 @@ void lcdui_print_status_line(void)
lcd_print(statusLine);
break;
case CustomMsg::TempCompPreheat: // temp compensation preheat
- lcd_puts_at_P(0, 3, _i("PINDA Heating"));////MSG_PINDA_PREHEAT c=20 r=1
+ lcd_puts_at_P(0, 3, _i("PINDA Heating"));////MSG_PINDA_PREHEAT c=20
if (custom_message_state <= PINDA_HEAT_T) {
lcd_puts_P(PSTR(": "));
lcd_print(custom_message_state); //seconds
@@ -900,7 +900,7 @@ void lcd_commands()
{
if (!blocks_queued() && !homing_flag)
{
- lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20 r=1
+ lcd_setstatuspgm(_i("Print paused"));////MSG_PRINT_PAUSED c=20
lcd_commands_type = LcdCommands::Idle;
lcd_commands_step = 0;
long_pause();
@@ -1320,13 +1320,13 @@ void lcd_commands()
strcat(cmd1, ftostr3(pid_temp));
// setting the correct target temperature (for visualization) is done in PID_autotune
enquecommand(cmd1);
- lcd_setstatuspgm(_i("PID cal. "));////MSG_PID_RUNNING c=20 r=1
+ lcd_setstatuspgm(_i("PID cal. "));////MSG_PID_RUNNING c=20
lcd_commands_step = 2;
}
if (lcd_commands_step == 2 && pid_tuning_finished) { //saving to eeprom
pid_tuning_finished = false;
custom_message_state = 0;
- lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20 r=1
+ lcd_setstatuspgm(_i("PID cal. finished"));////MSG_PID_FINISHED c=20
setAllTargetHotends(0); // reset all hotends temperature including the number displayed on the main screen
if (_Kp != 0 || _Ki != 0 || _Kd != 0) {
strcpy(cmd1, "M301 P");
@@ -1465,7 +1465,7 @@ static void lcd_menu_fails_stats_mmu()
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print);
- MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18 r=1
+ MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18
MENU_END();
}
@@ -1601,7 +1601,7 @@ static void lcd_menu_fails_stats_print()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! | Main | c=18 r=1
+//! | Main | MSG_MAIN c=18
//! | Last print | MSG_LAST_PRINT c=18
//! | Total | MSG_TOTAL c=6
//! | |
@@ -1612,8 +1612,8 @@ static void lcd_menu_fails_stats()
{
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
- MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18 r=1
- MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18 r=1
+ MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18
+ MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18
MENU_END();
}
@@ -1671,10 +1671,10 @@ extern char* __malloc_heap_end;
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! |RAM statistics | c=20 r=1
-//! | SP_min: 0000| c=14 r=1
-//! | heap_start: 0000| c=14 r=1
-//! | heap_end: 0000| c=14 r=1
+//! |RAM statistics | c=20
+//! | SP_min: 0000| c=14
+//! | heap_start: 0000| c=14
+//! | heap_end: 0000| c=14
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -1682,10 +1682,10 @@ static void lcd_menu_debug()
{
#ifdef DEBUG_STACK_MONITOR
lcd_home();
- lcd_printf_P(PSTR("RAM statistics\n" ////c=20 r=1
- " SP_min: 0x%04x\n" ////c=14 r=1
- " heap_start: 0x%04x\n" ////c=14 r=1
- " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=14 r=1
+ lcd_printf_P(PSTR("RAM statistics\n" ////c=20
+ " SP_min: 0x%04x\n" ////c=14
+ " heap_start: 0x%04x\n" ////c=14
+ " heap_end: 0x%04x"), SP_min, __malloc_heap_start, __malloc_heap_end); ////c=14
#endif //DEBUG_STACK_MONITOR
menu_back_if_clicked_fb();
@@ -1706,10 +1706,10 @@ static void lcd_menu_temperatures_line(const char *ipgmLabel, int value){
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! | Nozzle: 000D| c=14 r=1
-//! | Bed: 000D| c=14 r=1
-//! | Ambient: 000D| c=14
-//! | PINDA: 000D| c=14 r=1
+//! | Nozzle: 000D| MSG_NOZZLE c=14
+//! | Bed: 000D| MSG_BEDc=14
+//! | Ambient: 000D| MSG_AMBIENTc=14
+//! | PINDA: 000D| MSG_PINDA c=14
//! ----------------------
//! D - Degree sysmbol LCD_STR_DEGREE
//! @endcode
@@ -1718,10 +1718,10 @@ static void lcd_menu_temperatures()
{
lcd_timeoutToStatus.stop(); //infinite timeout
lcd_home();
- lcd_menu_temperatures_line( _T(MSG_NOZZLE), (int)current_temperature[0] ); ////c=14 r=1
- lcd_menu_temperatures_line( _T(MSG_BED), (int)current_temperature_bed ); ////c=14 r=1
+ lcd_menu_temperatures_line( _T(MSG_NOZZLE), (int)current_temperature[0] ); ////MSG_NOZZLE
+ lcd_menu_temperatures_line( _T(MSG_BED), (int)current_temperature_bed ); ////MSG_BED
#ifdef AMBIENT_THERMISTOR
- lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT c=14
+ lcd_menu_temperatures_line( _i("Ambient"), (int)current_temperature_ambient ); ////MSG_AMBIENT
#endif //AMBIENT_THERMISTOR
#ifdef PINDA_THERMISTOR
lcd_menu_temperatures_line( _T(MSG_PINDA), (int)current_temperature_pinda ); ////MSG_PINDA
@@ -1739,9 +1739,9 @@ static void lcd_menu_temperatures()
//! @code{.unparsed}
//! |01234567890123456789|
//! | |
-//! | PWR: 00.0V | c=12 r=1
-//! | Bed: 00.0V | c=12 r=1
-//! | IR : 00.0V | c=12 r=1 optional
+//! | PWR: 00.0V | c=12
+//! | Bed: 00.0V | c=12
+//! | IR : 00.0V | c=12 optional
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -1805,9 +1805,9 @@ static void lcd_preheat_menu()
//!
//! @code{.unparsed}
//! |01234567890123456789|
-//! | Main |
-//! | Firmware: | c=18 r=1
-//! | 3.7.2.-2363 | c=16 r=1
+//! | Main | MSG_MAIN c=18
+//! | Firmware: | c=18
+//! | 3.7.2.-2363 | c=16
//! | prusa3d.com | MSG_PRUSA3D
//! | forum.prusa3d.com | MSG_PRUSA3D_FORUM
//! | howto.prusa3d.com | MSG_PRUSA3D_HOWTO
@@ -1816,7 +1816,7 @@ static void lcd_preheat_menu()
//! | howto.prusa3d.com | ELECTRONICS
//! | howto.prusa3d.com | NOZZLE_TYPE
//! | -------------- | STR_SEPARATOR
-//! | Date: | c=17 r=1
+//! | Date: | c=17
//! | MMM DD YYYY | __DATE__
//! | -------------- | STR_SEPARATOR
//! @endcode
@@ -1838,7 +1838,7 @@ static void lcd_preheat_menu()
//!
//! @code{.unparsed}
//! | -------------- | STR_SEPARATOR
-//! | FlashAir IP Addr: | c=18 r=1
+//! | FlashAir IP Addr: | c=18
//! | 192.168.1.100 |
//! @endcode
//!
@@ -1869,7 +1869,7 @@ static void lcd_preheat_menu()
//! If DEBUG_BUILD is defined
//!
//! @code{.unparsed}
-//! | Debug | c=18 r=1
+//! | Debug | c=18
//! @endcode
//! ----------------------
//! @endcode
@@ -1924,7 +1924,7 @@ static void lcd_support_menu()
MENU_ITEM_BACK_P(PSTR(ELECTRONICS));
MENU_ITEM_BACK_P(PSTR(NOZZLE_TYPE));
MENU_ITEM_BACK_P(STR_SEPARATOR);
- MENU_ITEM_BACK_P(_i("Date:"));////MSG_DATE c=17 r=1
+ MENU_ITEM_BACK_P(_i("Date:"));////MSG_DATE c=17
MENU_ITEM_BACK_P(PSTR(__DATE__));
#ifdef IR_SENSOR_ANALOG
@@ -1937,7 +1937,7 @@ static void lcd_support_menu()
if (mmu_enabled)
{
MENU_ITEM_BACK_P(_i("MMU2 connected")); ////MSG_MMU_CONNECTED c=18
- MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17 r=1
+ MENU_ITEM_BACK_P(PSTR(" FW:")); ////c=17
if (((menu_item - 1) == menu_line) && lcd_draw_update)
{
lcd_set_cursor(6, menu_row);
@@ -1954,7 +1954,7 @@ static void lcd_support_menu()
// Show the FlashAir IP address, if the card is available.
if (_md->is_flash_air) {
MENU_ITEM_BACK_P(STR_SEPARATOR);
- MENU_ITEM_BACK_P(PSTR("FlashAir IP Addr:")); //c=18 r=1
+ MENU_ITEM_BACK_P(PSTR("FlashAir IP Addr:")); ////MSG_FLASHAIR c=18
MENU_ITEM_BACK_P(PSTR(" "));
if (((menu_item - 1) == menu_line) && lcd_draw_update) {
lcd_set_cursor(2, menu_row);
@@ -1967,7 +1967,7 @@ static void lcd_support_menu()
if (IP_address) {
MENU_ITEM_BACK_P(STR_SEPARATOR);
- MENU_ITEM_BACK_P(PSTR("Printer IP Addr:")); //c=18 r=1
+ MENU_ITEM_BACK_P(PSTR("Printer IP Addr:")); ////c=18
MENU_ITEM_BACK_P(PSTR(" "));
if (((menu_item - 1) == menu_line) && lcd_draw_update) {
lcd_set_cursor(2, menu_row);
@@ -1986,15 +1986,15 @@ static void lcd_support_menu()
MENU_ITEM_SUBMENU_P(_T(MSG_BELT_STATUS), lcd_menu_belt_status);////MSG_BELT_STATUS c=18
#endif //TMC2130
- MENU_ITEM_SUBMENU_P(_i("Temperatures"), lcd_menu_temperatures);////MSG_MENU_TEMPERATURES c=18 r=1
+ MENU_ITEM_SUBMENU_P(_i("Temperatures"), lcd_menu_temperatures);////MSG_MENU_TEMPERATURES c=18
#if defined (VOLT_BED_PIN) || defined (VOLT_PWR_PIN)
- MENU_ITEM_SUBMENU_P(_i("Voltages"), lcd_menu_voltages);////MSG_MENU_VOLTAGES c=18 r=1
+ MENU_ITEM_SUBMENU_P(_i("Voltages"), lcd_menu_voltages);////MSG_MENU_VOLTAGES c=18
#endif //defined VOLT_BED_PIN || defined VOLT_PWR_PIN
#ifdef DEBUG_BUILD
- MENU_ITEM_SUBMENU_P(PSTR("Debug"), lcd_menu_debug);////c=18 r=1
+ MENU_ITEM_SUBMENU_P(PSTR("Debug"), lcd_menu_debug);////MSG_DEBUG c=18
#endif /* DEBUG_BUILD */
#endif //MK1BP
@@ -2395,7 +2395,7 @@ void lcd_wait_interact() {
lcd_set_cursor(0, 1);
#ifdef SNMM
- lcd_puts_P(_i("Prepare new filament"));////MSG_PREPARE_FILAMENT c=20 r=1
+ lcd_puts_P(_i("Prepare new filament"));////MSG_PREPARE_FILAMENT c=20
#else
lcd_puts_P(_i("Insert filament"));////MSG_INSERT_FILAMENT c=20
#endif
@@ -2765,7 +2765,7 @@ static void lcd_menu_xyz_y_min()
for (uint8_t i = 0; i < 2; i++)
{
lcd_set_cursor(11,2+i);
- if (distanceMin[i] >= 200) lcd_puts_P(_T(MSG_NA)); ////c=3 r=1
+ if (distanceMin[i] >= 200) lcd_puts_P(_T(MSG_NA));
else lcd_printf_P(_N("%6.2fmm"), distanceMin[i]);
}
if (lcd_clicked())
@@ -2821,8 +2821,8 @@ static void lcd_menu_xyz_skew()
//! |01234567890123456789|
//! |[0;0] point offset | MSG_MEASURED_OFFSET c=20
//! | -------------- | STR_SEPARATOR
-//! |X: 000.00mm| c=10 r=1
-//! |Y: 000.00mm| c=10 r=1
+//! |X: 000.00mm| c=10
+//! |Y: 000.00mm| c=10
//! ----------------------
//! @endcode
//! @todo Positioning of the messages and values on LCD aren't fixed to their exact place. This causes issues with translations.
@@ -2830,8 +2830,8 @@ static void lcd_menu_xyz_offset()
{
lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=20
lcd_puts_at_P(0, 1, separator);
- lcd_puts_at_P(0, 2, PSTR("X")); ////c=10 r=1
- lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10 r=1
+ lcd_puts_at_P(0, 2, PSTR("X")); ////c=10
+ lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10
float vec_x[2];
float vec_y[2];
@@ -3029,10 +3029,10 @@ void lcd_adjust_bed(void)
eeprom_update_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID, 1);
);
MENU_ITEM_BACK_P(_T(MSG_SETTINGS));
- MENU_ITEM_EDIT_int3_P(_i("Left side [um]"), &_md->left, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_LEFT c=14 r=1
- MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14 r=1
- MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14 r=1
- MENU_ITEM_EDIT_int3_P(_i("Rear side [um]"), &_md->rear, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14 r=1
+ MENU_ITEM_EDIT_int3_P(_i("Left side [um]"), &_md->left, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_LEFT c=14
+ MENU_ITEM_EDIT_int3_P(_i("Right side[um]"), &_md->right, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_RIGHT c=14
+ MENU_ITEM_EDIT_int3_P(_i("Front side[um]"), &_md->front, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_FRONT c=14
+ MENU_ITEM_EDIT_int3_P(_i("Rear side [um]"), &_md->rear, -BED_ADJUSTMENT_UM_MAX, BED_ADJUSTMENT_UM_MAX);////MSG_BED_CORRECTION_REAR c=14
MENU_ITEM_FUNCTION_P(_T(MSG_RESET), lcd_adjust_bed_reset);////MSG_RESET c=14
MENU_END();
}
@@ -3050,7 +3050,7 @@ void lcd_adjust_bed(void)
void pid_extruder()
{
lcd_clear();
- lcd_puts_at_P(1, 0, _i("Set temperature:"));////MSG_SET_TEMPERATURE c=19 r=1
+ lcd_puts_at_P(1, 0, _i("Set temperature:"));////MSG_SET_TEMPERATURE c=19
pid_temp += int(lcd_encoder);
if (pid_temp > HEATER_0_MAXTEMP) pid_temp = HEATER_0_MAXTEMP;
if (pid_temp < HEATER_0_MINTEMP) pid_temp = HEATER_0_MINTEMP;
@@ -3803,9 +3803,9 @@ static void lcd_show_sensors_state()
lcd_set_cursor(0, 2);
lcd_printf_P(_N(
"Xd: %3d "
- "Yd: %3d\n" ////c=4 r=1
- "Int: %3d " ////c=4 r=1
- "Shut: %3d" ////c=4 r=1
+ "Yd: %3d\n" ////c=4
+ "Int: %3d " ////c=4
+ "Shut: %3d" ////c=4
),
pat9125_x, pat9125_y,
pat9125_b, pat9125_s
@@ -4444,7 +4444,7 @@ void lcd_pinda_calibration_menu()
{
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MENU_CALIBRATION));
- MENU_ITEM_SUBMENU_P(_i("Calibrate"), lcd_calibrate_pinda);////MSG_CALIBRATE_PINDA c=17 r=1
+ MENU_ITEM_SUBMENU_P(_i("Calibrate"), lcd_calibrate_pinda);////MSG_CALIBRATE_PINDA c=17
MENU_END();
}
@@ -5039,13 +5039,13 @@ do\
if (mmu_enabled == false)\
{\
if (fsensor_autoload_enabled)\
- MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_ON), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17 r=1*/\
+ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_ON), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_ON c=17*/\
else\
- MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_OFF), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17 r=1*/\
+ MENU_ITEM_TOGGLE_P(_T(MSG_FSENSOR_AUTOLOAD), _T(MSG_OFF), lcd_set_filament_autoload);/*////MSG_FSENS_AUTOLOAD_OFF c=17*/\
/*if (fsensor_oq_meassure_enabled)*/\
- /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass. [on]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_ON c=17 r=1*/\
+ /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass. [on]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_ON c=17*/\
/*else*/\
- /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass.[off]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_OFF c=17 r=1*/\
+ /*MENU_ITEM_FUNCTION_P(_i("F. OQ meass.[off]"), lcd_set_filament_oq_meass);*//*////MSG_FSENS_OQMEASS_OFF c=17*/\
}\
}\
}\
@@ -5686,7 +5686,7 @@ static void lcd_calibration_menu()
MENU_ITEM_BACK_P(_T(MSG_MAIN));
if (!isPrintPaused)
{
- MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17 r=1
+ MENU_ITEM_FUNCTION_P(_i("Wizard"), lcd_wizard);////MSG_WIZARD c=17
if (lcd_commands_type == LcdCommands::Idle)
{
MENU_ITEM_SUBMENU_P(_T(MSG_V2_CALIBRATION), lcd_first_layer_calibration_reset);////MSG_V2_CALIBRATION c=18
@@ -5706,7 +5706,7 @@ static void lcd_calibration_menu()
// "Calibrate Z" with storing the reference values to EEPROM.
MENU_ITEM_SUBMENU_P(_T(MSG_HOMEYZ), lcd_mesh_calibration_z);
#ifndef SNMM
- //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20 r=1
+ //MENU_ITEM_FUNCTION_P(_i("Calibrate E"), lcd_calibrate_extruder);////MSG_CALIBRATE_E c=20
#endif
// "Mesh Bed Leveling"
MENU_ITEM_SUBMENU_P(_T(MSG_MESH_BED_LEVELING), lcd_mesh_bedleveling);
@@ -5714,7 +5714,7 @@ static void lcd_calibration_menu()
#endif //MK1BP
MENU_ITEM_SUBMENU_P(_i("Bed level correct"), lcd_adjust_bed);////MSG_BED_CORRECTION_MENU c=18
- MENU_ITEM_SUBMENU_P(_i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17 r=1
+ MENU_ITEM_SUBMENU_P(_i("PID calibration"), pid_extruder);////MSG_PID_EXTRUDER c=17
#ifndef TMC2130
MENU_ITEM_SUBMENU_P(_i("Show end stops"), menu_show_end_stops);////MSG_SHOW_END_STOPS c=18
#endif
@@ -5727,7 +5727,7 @@ static void lcd_calibration_menu()
#ifndef MK1BP
if(has_temperature_compensation())
{
- MENU_ITEM_SUBMENU_P(_i("Temp. calibration"), lcd_pinda_calibration_menu);////MSG_CALIBRATION_PINDA_MENU c=17 r=1
+ MENU_ITEM_SUBMENU_P(_i("Temp. calibration"), lcd_pinda_calibration_menu);////MSG_CALIBRATION_PINDA_MENU c=17
}
#endif //MK1BP
}
@@ -5843,8 +5843,8 @@ static char snmm_stop_print_menu() { //menu for choosing which filaments will be
lcd_clear();
lcd_puts_at_P(0,0,_T(MSG_UNLOAD_FILAMENT)); lcd_print(':');
lcd_set_cursor(0, 1); lcd_print('>');
- lcd_puts_at_P(1,2,_i("Used during print"));////MSG_USED c=19 r=1
- lcd_puts_at_P(1,3,_i("Current"));////MSG_CURRENT c=19 r=1
+ lcd_puts_at_P(1,2,_i("Used during print"));////MSG_USED c=19
+ lcd_puts_at_P(1,3,_i("Current"));////MSG_CURRENT c=19
char cursor_pos = 1;
int enc_dif = 0;
KEEPALIVE_STATE(PAUSED_FOR_USER);
@@ -6191,10 +6191,10 @@ static void fil_unload_menu()
static void change_extr_menu(){
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
- MENU_ITEM_FUNCTION_P(_i("Extruder 1"), extr_change_0);////MSG_EXTRUDER_1 c=17 r=1
- MENU_ITEM_FUNCTION_P(_i("Extruder 2"), extr_change_1);////MSG_EXTRUDER_2 c=17 r=1
- MENU_ITEM_FUNCTION_P(_i("Extruder 3"), extr_change_2);////MSG_EXTRUDER_3 c=17 r=1
- MENU_ITEM_FUNCTION_P(_i("Extruder 4"), extr_change_3);////MSG_EXTRUDER_4 c=17 r=1
+ MENU_ITEM_FUNCTION_P(_i("Extruder 1"), extr_change_0);////MSG_EXTRUDER_1 c=17
+ MENU_ITEM_FUNCTION_P(_i("Extruder 2"), extr_change_1);////MSG_EXTRUDER_2 c=17
+ MENU_ITEM_FUNCTION_P(_i("Extruder 3"), extr_change_2);////MSG_EXTRUDER_3 c=17
+ MENU_ITEM_FUNCTION_P(_i("Extruder 4"), extr_change_3);////MSG_EXTRUDER_4 c=17
MENU_END();
}
@@ -6642,7 +6642,7 @@ static void lcd_main_menu()
} else {
#ifdef SNMM
MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), fil_unload_menu);
- MENU_ITEM_SUBMENU_P(_i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20 r=1
+ MENU_ITEM_SUBMENU_P(_i("Change extruder"), change_extr_menu);////MSG_CHANGE_EXTR c=20
#endif
#ifdef FILAMENT_SENSOR
if ((fsensor_autoload_enabled == true) && (fsensor_enabled == true) && (mmu_enabled == false))
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 96367296..d0fb7cf8 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -112,7 +112,7 @@
#MSG_HOMEYZ c=18
"Calibrate Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
#MSG_MOVE_CARRIAGE_TO_THE_TOP c=20 r=8
@@ -154,7 +154,7 @@
#MSG_CHOOSE_FIL_1ST_LAYERCAL c=20 r=7
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
#MSG_CRASH_RESUME c=20 r=3
@@ -163,10 +163,10 @@
#MSG_CRASH c=7
"Crash"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
#MSG_COMMUNITY_MADE c=18
@@ -190,7 +190,7 @@
#MSG_EJECT_FILAMENT c=16
"Eject filament"
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
#MSG_SELFTEST_ENDSTOP_NOTHIT c=20
@@ -268,7 +268,7 @@
#MSG_FILAMENT_USED c=19
"Filament used"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
#MSG_FS_ACTION c=10
@@ -298,7 +298,7 @@
#MSG_SELFTEST_COOLING_FAN c=20
"Front print fan?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
#MSG_SELFTEST_FANS c=20
@@ -352,13 +352,13 @@
#MSG_SELFTEST_CHECK_Z c=20
"Checking Z axis"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
#MSG_WIZARD_XYZ_CAL c=20 r=8
@@ -397,7 +397,7 @@
#MSG_LEFT c=10
"Left"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
#MSG_LIN_CORRECTION c=18
@@ -550,16 +550,16 @@
#MSG_PAUSE_PRINT c=18
"Pause print"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
#MSG_PAPER c=20 r=10
@@ -649,7 +649,7 @@
#MSG_PRESS_KNOB c=20
"Press the knob"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
#MSG_RESUME_NOZZLE_TEMP c=20 r=4
@@ -673,7 +673,7 @@
#MSG_PRUSA3D c=18
"prusa3d.com"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
#MSG_UNLOAD_FILAMENT_REPEAT c=20 r=4
@@ -703,7 +703,7 @@
#MSG_RESUMING_PRINT c=20
"Resuming print"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
#MSG_RPI_PORT c=13
@@ -748,7 +748,7 @@
#MSG_SEL_PREHEAT_TEMP c=20 r=6
"Select nozzle preheat temperature which matches your material."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
# c=20
@@ -784,7 +784,7 @@
#MSG_SORT_ALPHA c=8
"Alphabet"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
#MSG_SOUND_LOUD c=7
@@ -838,7 +838,7 @@
#MSG_SELECT_TEMP_MATCHES_MATERIAL c=20 r=4
"Select temperature which matches your material."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
#MSG_TEMP_CAL_FAILED c=20 r=8
@@ -853,7 +853,7 @@
#MSG_TEMPERATURE c=18
"Temperature"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
#MSG_FOLLOW_Z_CALIBRATION_FLOW c=20 r=9
@@ -880,16 +880,16 @@
#MSG_UNLOAD_FILAMENT c=17
"Unload filament"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
#MSG_TOTAL c=6
"Total"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
#MSG_UNKNOWN c=13
@@ -919,7 +919,7 @@
#MSG_SELFTEST_WIRINGERROR c=17
"Wiring error"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
#MSG_XYZ_DETAILS c=18
@@ -1086,4 +1086,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
-
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 62371c3e..d8104bee 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Kalibrovat Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Zkalibrovat"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Zvolte filament pro kalibraci prvni vrstvy z nasledujiciho menu"
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Detekovan naraz."
@@ -218,11 +218,11 @@
"Crash"
"Naraz"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Pouze aktualni"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Datum:"
@@ -254,7 +254,7 @@
"Eject filament"
"Vysunout fil."
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Vysouvam filament"
@@ -358,7 +358,7 @@
"Filament used"
"Spotrebovano filam."
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Cas tisku"
@@ -398,7 +398,7 @@
"Front print fan?"
"Predni tiskovy vent?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Vpredu [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Kontrola osy Z"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Vyberte extruder:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Vyber filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"\x00"
@@ -530,7 +530,7 @@
"Left"
"Vlevo"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Vlevo [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Pozastavit tisk"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"PID kal. "
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"PID kal. ukoncena"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"PID kalibrace"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"Nahrivani PINDA"
@@ -866,7 +866,7 @@
"Press the knob"
"Stisknete hl. tlacitko"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Tisk pozastaven"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Vzadu [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Obnoveni tisku"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Vpravo [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Vyberte teplotu predehrati trysky ktera odpovida vasemu materialu."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Nastavte teplotu:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"Abeceda"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Trideni souboru"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Zvolte teplotu, ktera odpovida vasemu materialu."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Teplot. kalibrace"
@@ -1138,7 +1138,7 @@
"Temperature"
"Teplota"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Teploty"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Vyjmout filament"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Vysouvam filament"
@@ -1182,11 +1182,11 @@
"Total"
"Celkem"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Pouzite behem tisku"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Napeti"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Chyba zapojeni"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"Pruvodce"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Pocet mereni Z"
-
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 624af461..ea1b042f 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Kalibrierung Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Kalibrieren"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Waehlen Sie ein Filament fuer Erste Schichtkalibrierung aus und waehlen Sie es im On-Screen-Menu aus."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Crash erkannt."
@@ -218,11 +218,11 @@
"Crash"
"\x00"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Aktuelles"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Datum:"
@@ -254,7 +254,7 @@
"Eject filament"
"Filamentauswurf"
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"werfe Filament aus"
@@ -358,7 +358,7 @@
"Filament used"
"Filament benutzt"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Druckzeit"
@@ -398,7 +398,7 @@
"Front print fan?"
"Teile Luefter?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Vorne [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Pruefe Z Achse"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Extruder waehlen:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Waehle Filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"\x00"
@@ -530,7 +530,7 @@
"Left"
"Links"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Links [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Druck pausieren"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"PID Kal. "
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"PID Kalib. fertig"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"PID Kalibrierung"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"PINDA erwaermen"
@@ -866,7 +866,7 @@
"Press the knob"
"Knopf druecken zum"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Druck pausiert"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Hinten [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Druck fortgesetzt"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Rechts [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Bitte Vorheiztemperatur auswaehlen, die Ihrem Material entspricht."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Temp. einstellen:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"\x00"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Sortiere Dateien"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Waehlen Sie die Temperatur, die zu Ihrem Material passt."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Temp. kalibrieren"
@@ -1138,7 +1138,7 @@
"Temperature"
"Temperatur"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Temperaturen"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Filament entladen"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Filament auswerfen"
@@ -1182,11 +1182,11 @@
"Total"
"Gesamt"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Beim Druck benutzt"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Spannungen"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Verdrahtungsfehler"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"Assistent"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
-
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 2b19e50f..55443905 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Calibrar Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Calibrar"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Escoge un filamento para la Calibracion de la Primera Capa y seleccionalo en el menu en pantalla."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Choque detectado."
@@ -218,11 +218,11 @@
"Crash"
"Choque"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Actual"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Fecha:"
@@ -254,7 +254,7 @@
"Eject filament"
"Expulsar fil."
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Expulsando filamento"
@@ -358,7 +358,7 @@
"Filament used"
"Filamento usado"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Tiempo de imp.:"
@@ -398,7 +398,7 @@
"Front print fan?"
"Vent. frontal?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Frontal [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Control sensor Z"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Elegir extrusor:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Elije filamento:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"Filamento"
@@ -530,7 +530,7 @@
"Left"
"Izquierda"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Izquierda [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Pausar impresion"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"Cal. PID "
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"Cal. PID terminada"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"Calibracion PID"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"Calentando PINDA"
@@ -866,7 +866,7 @@
"Press the knob"
"Pulsa el dial"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Impresion en pausa"
@@ -898,7 +898,7 @@
"prusa3d.com"
"prusa3d.es"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Trasera [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Continuan. impresion"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Derecha [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Selecciona la temperatura para precalentar la boquilla que se ajuste a tu material. "
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Establecer temp.:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"Alfabet"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Ordenando archivos"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Selecciona la temperatura adecuada a tu material."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Calibracion temp."
@@ -1138,7 +1138,7 @@
"Temperature"
"Temperatura"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Temperaturas"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Soltar filamento"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Soltando filamento"
@@ -1182,11 +1182,11 @@
"Total"
"\x00"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Usado en impresion"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Voltajes"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Error de conexion"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"\x00"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Z-sensor nr."
-
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 035efddc..d8dc347a 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Calibrer Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Calibrer"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Choisissez un filament pour la Calibration de la Premiere Couche et selectionnez-le depuis le menu a l'ecran."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Crash detecte."
@@ -218,11 +218,11 @@
"Crash"
"\x00"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Actuel"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Date:"
@@ -254,7 +254,7 @@
"Eject filament"
"Remonter le fil."
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Le fil. remonte"
@@ -358,7 +358,7 @@
"Filament used"
"Filament utilise"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Temps d'impression"
@@ -398,7 +398,7 @@
"Front print fan?"
"Ventilo impr avant?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Avant [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Verification axe Z"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Choisir extrudeur:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Choix du filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"\x00"
@@ -530,7 +530,7 @@
"Left"
"Gauche"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Gauche [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Pause de l'impr."
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"Calib. PID"
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"Calib. PID terminee"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"Calibration PID"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"Chauffe de la PINDA"
@@ -866,7 +866,7 @@
"Press the knob"
"App. sur sur bouton"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Impression en pause"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Arriere [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Reprise de l'impr."
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Droite [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Selectionnez la temperature de prechauffage de la buse qui correspond a votre materiau."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Regler temp.:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"\x00"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Tri des fichiers"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Selectionnez la temperature qui correspond a votre materiau."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Calibration temp."
@@ -1138,7 +1138,7 @@
"Temperature"
"\x00"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"\x00"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Decharger fil."
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Dechargement fil."
@@ -1182,11 +1182,11 @@
"Total"
"Totale"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Utilise pdt impr."
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Tensions"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Erreur de cablage"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"Assistant"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Mesurer x-fois"
-
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 8643721a..0e6528eb 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Calibra Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Calibra"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Scegli un filamento per la calibrazione del primo strato e selezionalo nel menu sullo schermo."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Rilevato impatto."
@@ -218,11 +218,11 @@
"Crash"
"Impatto"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Attuale"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Data:"
@@ -254,7 +254,7 @@
"Eject filament"
"Espelli fil."
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Espellendo filamento"
@@ -358,7 +358,7 @@
"Filament used"
"Fil. utilizzato"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Tempo di stampa"
@@ -398,7 +398,7 @@
"Front print fan?"
"Ventola frontale?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Fronte [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Verifica asse Z"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Seleziona estrusore:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Scegliere filamento:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"Filamento"
@@ -530,7 +530,7 @@
"Left"
"Sinistra"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Sinistra [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Metti in pausa"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"Calibrazione PID"
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"Calib. PID completa"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"Calibrazione PID"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"Riscaldamento PINDA"
@@ -866,7 +866,7 @@
"Press the knob"
"Premere la manopola"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Stampa in pausa"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Retro [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Riprendi stampa"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Destra [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Selezionate la temperatura per il preriscaldamento dell'ugello adatta al vostro materiale."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Imposta temperatura"
@@ -1046,7 +1046,7 @@
"Alphabet"
"Alfabeti"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Ordinando i file"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Seleziona la temperatura appropriata per il tuo materiale."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Calib. Temp."
@@ -1138,7 +1138,7 @@
"Temperature"
"\x00"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Temperature"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Scarica filamento"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Scaricando filamento"
@@ -1182,11 +1182,11 @@
"Total"
"Totale"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Usati nella stampa"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Voltaggi"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Errore cablaggio"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"\x00"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Nr. Z-test"
-
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 98f2d484..639b0386 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Kalibratie Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Kalibreren"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Kies een filament voor de kalibratie van de eerste laag en selecteer deze in het schermmenu."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Crash gedetecteerd."
@@ -218,11 +218,11 @@
"Crash"
"\x00"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Actueel"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Datum:"
@@ -254,7 +254,7 @@
"Eject filament"
"Fil. uitwerpen"
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Fil. word ontladen"
@@ -358,7 +358,7 @@
"Filament used"
"Gebruikte filament"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Print tijd"
@@ -398,7 +398,7 @@
"Front print fan?"
"Voorzijde fan?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Voorkant [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Controleer Z as"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Kies extruder:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Kies filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"\x00"
@@ -530,7 +530,7 @@
"Left"
"Links"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Linkerkant[um]"
@@ -734,19 +734,19 @@
"Pause print"
"Print pauzeren"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"PID kal. "
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"PID kalibratie klaar"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"PID kalibratie"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"PINDA opwarmen"
@@ -866,7 +866,7 @@
"Press the knob"
"Druk op knop"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Print pauzeren"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Achterkant[um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Hervatten print"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Recht.kant[um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Selecteer de voorverwarmingstemperatuur van de tuit die overeenkomt met uw materiaal."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Temp. instellen:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"Alfabet"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Bestanden sorteren"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Selecteer de temperatuur die overeenkomt met uw materiaal."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Tempkalibratie"
@@ -1138,7 +1138,7 @@
"Temperature"
"Temperatuur"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Temperaturen"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Filament uitwerpen"
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Uitwerpen filament"
@@ -1182,11 +1182,11 @@
"Total"
"Totaal"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Gebruikt bij print"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Spanning"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Aansluitingsfout"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"Wizard"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
-
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 703be2f0..7d0be035 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -150,7 +150,7 @@
"Calibrate Z"
"Kalibruj Z"
-#MSG_CALIBRATE_PINDA c=17 r=1
+#MSG_CALIBRATE_PINDA c=17
"Calibrate"
"Kalibruj"
@@ -206,7 +206,7 @@
"Choose a filament for the First Layer Calibration and select it in the on-screen menu."
"Wybierz filament do Kalibracji Pierwszej Warstwy i potwierdz w menu ekranowym."
-#MSG_CRASH_DETECTED c=20 r=1
+#MSG_CRASH_DETECTED c=20
"Crash detected."
"Zderzenie wykryte"
@@ -218,11 +218,11 @@
"Crash"
"Zderzen"
-#MSG_CURRENT c=19 r=1
+#MSG_CURRENT c=19
"Current"
"Aktualne"
-#MSG_DATE c=17 r=1
+#MSG_DATE c=17
"Date:"
"Data:"
@@ -254,7 +254,7 @@
"Eject filament"
"Wysun filament"
-#MSG_EJECTING_FILAMENT c=20 r=1
+#MSG_EJECTING_FILAMENT c=20
"Ejecting filament"
"Wysuwanie filamentu"
@@ -358,7 +358,7 @@
"Filament used"
"Uzyty filament"
-#MSG_PRINT_TIME c=19 r=1
+#MSG_PRINT_TIME c=19
"Print time"
"Czas druku"
@@ -398,7 +398,7 @@
"Front print fan?"
"Przedni went. druku?"
-#MSG_BED_CORRECTION_FRONT c=14 r=1
+#MSG_BED_CORRECTION_FRONT c=14
"Front side[um]"
"Przod [um]"
@@ -470,15 +470,15 @@
"Checking Z axis"
"Kontrola osi Z"
-#MSG_CHOOSE_EXTRUDER c=20 r=1
+#MSG_CHOOSE_EXTRUDER c=20
"Choose extruder:"
"Wybierz ekstruder:"
-#MSG_CHOOSE_FILAMENT c=20 r=1
+#MSG_CHOOSE_FILAMENT c=20
"Choose filament:"
"Wybierz filament:"
-#MSG_FILAMENT c=17 r=1
+#MSG_FILAMENT c=17
"Filament"
"\x00"
@@ -530,7 +530,7 @@
"Left"
"Lewa"
-#MSG_BED_CORRECTION_LEFT c=14 r=1
+#MSG_BED_CORRECTION_LEFT c=14
"Left side [um]"
"Lewo [um]"
@@ -734,19 +734,19 @@
"Pause print"
"Wstrzymanie wydruku"
-#MSG_PID_RUNNING c=20 r=1
+#MSG_PID_RUNNING c=20
"PID cal. "
"Kalibracja PID"
-#MSG_PID_FINISHED c=20 r=1
+#MSG_PID_FINISHED c=20
"PID cal. finished"
"Kal. PID zakonczona"
-#MSG_PID_EXTRUDER c=17 r=1
+#MSG_PID_EXTRUDER c=17
"PID calibration"
"Kalibracja PID"
-#MSG_PINDA_PREHEAT c=20 r=1
+#MSG_PINDA_PREHEAT c=20
"PINDA Heating"
"Grzanie sondy PINDA"
@@ -866,7 +866,7 @@
"Press the knob"
"Wcisnij pokretlo"
-#MSG_PRINT_PAUSED c=20 r=1
+#MSG_PRINT_PAUSED c=20
"Print paused"
"Druk wstrzymany"
@@ -898,7 +898,7 @@
"prusa3d.com"
"\x00"
-#MSG_BED_CORRECTION_REAR c=14 r=1
+#MSG_BED_CORRECTION_REAR c=14
"Rear side [um]"
"Tyl [um]"
@@ -938,7 +938,7 @@
"Resuming print"
"Wznawianie druku"
-#MSG_BED_CORRECTION_RIGHT c=14 r=1
+#MSG_BED_CORRECTION_RIGHT c=14
"Right side[um]"
"Prawo [um]"
@@ -998,7 +998,7 @@
"Select nozzle preheat temperature which matches your material."
"Wybierz temperature grzania dyszy odpowiednia dla materialu."
-#MSG_SET_TEMPERATURE c=19 r=1
+#MSG_SET_TEMPERATURE c=19
"Set temperature:"
"Ustaw temperature:"
@@ -1046,7 +1046,7 @@
"Alphabet"
"Alfab"
-#MSG_SORTING c=20 r=1
+#MSG_SORTING c=20
"Sorting files"
"Sortowanie plikow"
@@ -1118,7 +1118,7 @@
"Select temperature which matches your material."
"Wybierz temperature, ktora odpowiada Twojemu filamentowi."
-#MSG_CALIBRATION_PINDA_MENU c=17 r=1
+#MSG_CALIBRATION_PINDA_MENU c=17
"Temp. calibration"
"Kalibracja temp."
@@ -1138,7 +1138,7 @@
"Temperature"
"Temperatura"
-#MSG_MENU_TEMPERATURES c=15 r=1
+#MSG_MENU_TEMPERATURES c=15
"Temperatures"
"Temperatury"
@@ -1174,7 +1174,7 @@
"Unload filament"
"Rozladowanie fil."
-#MSG_UNLOADING_FILAMENT c=20 r=1
+#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
"Rozladowuje filament"
@@ -1182,11 +1182,11 @@
"Total"
"Suma"
-#MSG_USED c=19 r=1
+#MSG_USED c=19
"Used during print"
"Uzyte podczas druku"
-#MSG_MENU_VOLTAGES c=15 r=1
+#MSG_MENU_VOLTAGES c=15
"Voltages"
"Napiecia"
@@ -1226,7 +1226,7 @@
"Wiring error"
"Blad polaczenia"
-#MSG_WIZARD c=17 r=1
+#MSG_WIZARD c=17
"Wizard"
"Asystent"
@@ -1449,4 +1449,3 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Ilosc Pomiarow"
-
From 9922774fa70af749e1d2c99d133b14f1ff6c0785 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 08:11:19 +0200
Subject: [PATCH 224/254] Cleanup some comments ////c=
---
Firmware/ultralcd.cpp | 52 +++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 0609a31d..2aa9f3b5 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1465,7 +1465,7 @@ static void lcd_menu_fails_stats_mmu()
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_mmu_print);
- MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total); ////c=18
+ MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_mmu_total);
MENU_END();
}
@@ -1485,9 +1485,9 @@ static void lcd_menu_fails_stats_mmu_print()
lcd_timeoutToStatus.stop(); //infinite timeout
lcd_home();
lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d"),
- _T(MSG_LAST_PRINT_FAILURES), ////c=20
- _T(MSG_MMU_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL) ), ////c=14
- _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL) )); ////c=14
+ _T(MSG_LAST_PRINT_FAILURES),
+ _T(MSG_MMU_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_FAIL) ),
+ _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_byte((uint8_t*)EEPROM_MMU_LOAD_FAIL) ));
menu_back_if_clicked_fb();
}
@@ -1508,9 +1508,9 @@ static void lcd_menu_fails_stats_mmu_total()
lcd_timeoutToStatus.stop(); //infinite timeout
lcd_home();
lcd_printf_P(PSTR("%S\n" " %-16.16S%-3d\n" " %-16.16S%-3d\n" " %-16.16S%-3d"),
- _T(MSG_TOTAL_FAILURES), ////c=20
- _T(MSG_MMU_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_FAIL_TOT) ), ////c=14
- _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) ), ////c=14
+ _T(MSG_TOTAL_FAILURES),
+ _T(MSG_MMU_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_FAIL_TOT) ),
+ _T(MSG_MMU_LOAD_FAILS), clamp999( eeprom_read_word((uint16_t*)EEPROM_MMU_LOAD_FAIL_TOT) ),
_i("MMU power fails"), clamp999( mmu_power_failures )); ////MSG_MMU_POWER_FAILS c=15
menu_back_if_clicked_fb();
}
@@ -1534,10 +1534,10 @@ static void lcd_menu_fails_stats_total()
lcd_timeoutToStatus.stop(); //infinite timeout
lcd_home();
lcd_printf_P(failStatsFmt,
- _T(MSG_TOTAL_FAILURES), ////c=20
- _T(MSG_POWER_FAILURES), clamp999( eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) ), ////c=14
- _T(MSG_FIL_RUNOUTS), clamp999( eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) ), ////c=14
- _T(MSG_CRASH), ////c=7
+ _T(MSG_TOTAL_FAILURES),
+ _T(MSG_POWER_FAILURES), clamp999( eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) ),
+ _T(MSG_FIL_RUNOUTS), clamp999( eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) ),
+ _T(MSG_CRASH),
clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_X_TOT) ),
clamp999( eeprom_read_word((uint16_t*)EEPROM_CRASH_COUNT_Y_TOT) ));
menu_back_if_clicked_fb();
@@ -1575,20 +1575,20 @@ static void lcd_menu_fails_stats_print()
lcd_home();
#ifndef PAT9125
lcd_printf_P(failStatsFmt,
- _T(MSG_LAST_PRINT_FAILURES), ////c=20
- _T(MSG_POWER_FAILURES), power, ////c=15
- _T(MSG_FIL_RUNOUTS), filam, ////c=15
- _T(MSG_CRASH), crashX, crashY); ////c=7
+ _T(MSG_LAST_PRINT_FAILURES),
+ _T(MSG_POWER_FAILURES), power,
+ _T(MSG_FIL_RUNOUTS), filam,
+ _T(MSG_CRASH), crashX, crashY);
#else
// On the MK3 include detailed PAT9125 statistics about soft failures
lcd_printf_P(PSTR("%S\n"
" %-16.16S%-3d\n"
" %-7.7S H %-3d S %-3d\n"
" %-7.7S X %-3d Y %-3d"),
- _T(MSG_LAST_PRINT_FAILURES), ////c=20
- _T(MSG_POWER_FAILURES), power, ////c=15
+ _T(MSG_LAST_PRINT_FAILURES),
+ _T(MSG_POWER_FAILURES), power,
_i("Runouts"), filam, fsensor_softfail, //MSG_RUNOUTS c=7
- _T(MSG_CRASH), crashX, crashY); ////c=7
+ _T(MSG_CRASH), crashX, crashY);
#endif
menu_back_if_clicked_fb();
}
@@ -1612,8 +1612,8 @@ static void lcd_menu_fails_stats()
{
MENU_BEGIN();
MENU_ITEM_BACK_P(_T(MSG_MAIN));
- MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print); ////c=18
- MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total); ////c=18
+ MENU_ITEM_SUBMENU_P(_T(MSG_LAST_PRINT), lcd_menu_fails_stats_print);
+ MENU_ITEM_SUBMENU_P(_T(MSG_TOTAL), lcd_menu_fails_stats_total);
MENU_END();
}
@@ -1642,10 +1642,10 @@ static void lcd_menu_fails_stats()
uint16_t filamentTotal = clamp999( eeprom_read_word((uint16_t*)EEPROM_FERROR_COUNT_TOT) );
lcd_home();
lcd_printf_P(failStatsFmt,
- _T(MSG_LAST_PRINT_FAILURES), ////c=20
- _T(MSG_FIL_RUNOUTS), filamentLast, ////c=15
- _T(MSG_TOTAL_FAILURES), ////c=20
- _T(MSG_FIL_RUNOUTS), filamentTotal); ////c=15
+ _T(MSG_LAST_PRINT_FAILURES),
+ _T(MSG_FIL_RUNOUTS), filamentLast,
+ _T(MSG_TOTAL_FAILURES),
+ _T(MSG_FIL_RUNOUTS), filamentTotal);
menu_back_if_clicked();
}
@@ -2830,8 +2830,8 @@ static void lcd_menu_xyz_offset()
{
lcd_puts_at_P(0, 0, _i("[0;0] point offset"));////MSG_MEASURED_OFFSET c=20
lcd_puts_at_P(0, 1, separator);
- lcd_puts_at_P(0, 2, PSTR("X")); ////c=10
- lcd_puts_at_P(0, 3, PSTR("Y")); ////c=10
+ lcd_puts_at_P(0, 2, PSTR("X"));
+ lcd_puts_at_P(0, 3, PSTR("Y"));
float vec_x[2];
float vec_y[2];
From d864a5cfdb4ac9196e30e3d1c8e23c546e734923 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 08:46:17 +0200
Subject: [PATCH 225/254] Define #MSG_PRINTER_IP c=18
---
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 2aa9f3b5..9677f2da 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1967,7 +1967,7 @@ static void lcd_support_menu()
if (IP_address) {
MENU_ITEM_BACK_P(STR_SEPARATOR);
- MENU_ITEM_BACK_P(PSTR("Printer IP Addr:")); ////c=18
+ MENU_ITEM_BACK_P(PSTR("Printer IP Addr:")); ////MSG_PRINTER_IP c=18
MENU_ITEM_BACK_P(PSTR(" "));
if (((menu_item - 1) == menu_line) && lcd_draw_update) {
lcd_set_cursor(2, menu_row);
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index d0fb7cf8..63898a67 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1086,3 +1086,6 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index d8104bee..99756be1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Pocet mereni Z"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index ea1b042f..a35152a1 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"Drucker IP Adr.:"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 55443905..8f049ef1 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Z-sensor nr."
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index d8dc347a..09f98396 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Mesurer x-fois"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 0e6528eb..4607f3d3 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Nr. Z-test"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 639b0386..03ffe77d 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"\x00"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 7d0be035..36c31c91 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1449,3 +1449,7 @@
#MSG_Z_PROBE_NR c=14
"Z-probe nr."
"Ilosc Pomiarow"
+
+#MSG_PRINTER_IP c=18
+"Printer IP Addr:"
+"\x00"
From 3b431bcbc1df7f428da2c445a219c68daa0047b2 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 31 Mar 2021 08:54:16 +0200
Subject: [PATCH 226/254] Fix output "Y distance from min" by removing ":" so
translations can use 20 chars
---
Firmware/ultralcd.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 9677f2da..cb921619 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2752,7 +2752,7 @@ static void lcd_menu_xyz_y_min()
count_xyz_details(distanceMin);
lcd_home();
lcd_printf_P(_N(
- "%S:\n"
+ "%S\n"
"%S\n"
"%S:\n"
"%S:"
From e12c1dde5cc30055968bb5b927f6546da21c805c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 1 Apr 2021 19:06:31 +0200
Subject: [PATCH 227/254] Updated RepRap Wiki and removed the @todos
---
Firmware/Marlin_main.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index cd04eee3..59a19fd1 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -6382,7 +6382,6 @@ Sigma_Exit:
- `C` - Time to change/pause/user interaction in normal mode
- `D` - Time to change/pause/user interaction in silent mode
*/
- //!@todo update RepRap Gcode wiki
case 73: //M73 show percent done, time remaining and time to change/pause
{
if(code_seen('P')) print_percent_done_normal = code_value();
@@ -6500,8 +6499,6 @@ Sigma_Exit:
bit 6 = free
bit 7 = free
*/
- //!@todo update RepRap Gcode wiki
- //!@todo Should be temperature always? Octoprint doesn't switch to M105 if M155 timer is set
case 155:
{
if (code_seen('S')){
@@ -7068,7 +7065,6 @@ Sigma_Exit:
E0:3240 RPM PRN1:4560 RPM E0@:255 PRN1@:255
*/
- //!@todo Update RepRap Gcode wiki
case 123:
gcode_M123();
break;
From b74e1d6062ea309715ff88741c6f74f56b1e1213 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 1 Apr 2021 19:48:14 +0200
Subject: [PATCH 228/254] Update RepRap url for `M123`
---
Firmware/Marlin_main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 59a19fd1..ab46a894 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -7049,7 +7049,7 @@ Sigma_Exit:
#if (defined(FANCHECK) && (((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1)))))
/*!
- ### M123 - Tachometer value M123: Tachometer value
+ ### M123 - Tachometer value M123: Tachometer value
This command is used to report fan speeds and fan pwm values.
#### Usage
From e18d688b649fbad70e6263b9ba80c047bf92dde7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 22 Apr 2021 20:48:26 +0200
Subject: [PATCH 229/254] Fix merge issues
---
Firmware/Marlin_main.cpp | 396 ---------------------------------------
Firmware/ultralcd.cpp | 7 -
2 files changed, 403 deletions(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 24266903..e55f9f6c 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -5495,403 +5495,7 @@ if(eSoundMode!=e_SOUND_MODE_SILENT)
#ifdef MK1BP
break;
#endif //MK1BP
-<<<<<<< HEAD
- case_G80:
- {
- mesh_bed_leveling_flag = true;
-#ifndef PINDA_THERMISTOR
- static bool run = false; // thermistor-less PINDA temperature compensation is running
-#endif // ndef PINDA_THERMISTOR
-
-#ifdef SUPPORT_VERBOSITY
- int8_t verbosity_level = 0;
- if (code_seen('V')) {
- // Just 'V' without a number counts as V1.
- char c = strchr_pointer[1];
- verbosity_level = (c == ' ' || c == '\t' || c == 0) ? 1 : code_value_short();
- }
-#endif //SUPPORT_VERBOSITY
- // Firstly check if we know where we are
- if (!(axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])) {
- // We don't know where we are! HOME!
- // Push the commands to the front of the message queue in the reverse order!
- // There shall be always enough space reserved for these commands.
- repeatcommand_front(); // repeat G80 with all its parameters
- enquecommand_front_P(G28W0);
- break;
- }
-
- uint8_t nMeasPoints = MESH_MEAS_NUM_X_POINTS;
- if (code_seen('N')) {
- nMeasPoints = code_value_uint8();
- if (nMeasPoints != 7) {
- nMeasPoints = 3;
- }
- }
- else {
- nMeasPoints = eeprom_read_byte((uint8_t*)EEPROM_MBL_POINTS_NR);
- }
-
- uint8_t nProbeRetry = 3;
- if (code_seen('R')) {
- nProbeRetry = code_value_uint8();
- if (nProbeRetry > 10) {
- nProbeRetry = 10;
- }
- }
- else {
- nProbeRetry = eeprom_read_byte((uint8_t*)EEPROM_MBL_PROBE_NR);
- }
- bool magnet_elimination = (eeprom_read_byte((uint8_t*)EEPROM_MBL_MAGNET_ELIMINATION) > 0);
-
-#ifndef PINDA_THERMISTOR
- if (run == false && temp_cal_active == true && calibration_status_pinda() == true && target_temperature_bed >= 50)
- {
- temp_compensation_start();
- run = true;
- repeatcommand_front(); // repeat G80 with all its parameters
- enquecommand_front_P(G28W0);
- break;
- }
- run = false;
-#endif //PINDA_THERMISTOR
- // Save custom message state, set a new custom message state to display: Calibrating point 9.
- CustomMsg custom_message_type_old = custom_message_type;
- unsigned int custom_message_state_old = custom_message_state;
- custom_message_type = CustomMsg::MeshBedLeveling;
- custom_message_state = (nMeasPoints * nMeasPoints) + 10;
- lcd_update(1);
-
- mbl.reset(); //reset mesh bed leveling
-
- // Reset baby stepping to zero, if the babystepping has already been loaded before.
- babystep_undo();
-
- // Cycle through all points and probe them
- // First move up. During this first movement, the babystepping will be reverted.
- current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
- plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 60);
- // The move to the first calibration point.
- current_position[X_AXIS] = BED_X0;
- current_position[Y_AXIS] = BED_Y0;
-
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 1)
- {
- bool clamped = world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]);
- clamped ? SERIAL_PROTOCOLPGM("First calibration point clamped.\n") : SERIAL_PROTOCOLPGM("No clamping for first calibration point.\n");
- }
- #else //SUPPORT_VERBOSITY
- world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]);
- #endif //SUPPORT_VERBOSITY
-
- plan_buffer_line_curposXYZE(homing_feedrate[X_AXIS] / 30);
- // Wait until the move is finished.
- st_synchronize();
-
- uint8_t mesh_point = 0; //index number of calibration point
-
- int XY_AXIS_FEEDRATE = homing_feedrate[X_AXIS] / 20;
- int Z_LIFT_FEEDRATE = homing_feedrate[Z_AXIS] / 40;
- bool has_z = is_bed_z_jitter_data_valid(); //checks if we have data from Z calibration (offsets of the Z heiths of the 8 calibration points from the first point)
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 1) {
- has_z ? SERIAL_PROTOCOLPGM("Z jitter data from Z cal. valid.\n") : SERIAL_PROTOCOLPGM("Z jitter data from Z cal. not valid.\n");
- }
- #endif // SUPPORT_VERBOSITY
- int l_feedmultiply = setup_for_endstop_move(false); //save feedrate and feedmultiply, sets feedmultiply to 100
- while (mesh_point != nMeasPoints * nMeasPoints) {
- // Get coords of a measuring point.
- uint8_t ix = mesh_point % nMeasPoints; // from 0 to MESH_NUM_X_POINTS - 1
- uint8_t iy = mesh_point / nMeasPoints;
- /*if (!mbl_point_measurement_valid(ix, iy, nMeasPoints, true)) {
- printf_P(PSTR("Skipping point [%d;%d] \n"), ix, iy);
- custom_message_state--;
- mesh_point++;
- continue; //skip
- }*/
- if (iy & 1) ix = (nMeasPoints - 1) - ix; // Zig zag
- if (nMeasPoints == 7) //if we have 7x7 mesh, compare with Z-calibration for points which are in 3x3 mesh
- {
- has_z = ((ix % 3 == 0) && (iy % 3 == 0)) && is_bed_z_jitter_data_valid();
- }
- float z0 = 0.f;
- if (has_z && (mesh_point > 0)) {
- uint16_t z_offset_u = 0;
- if (nMeasPoints == 7) {
- z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * ((ix/3) + iy - 1)));
- }
- else {
- z_offset_u = eeprom_read_word((uint16_t*)(EEPROM_BED_CALIBRATION_Z_JITTER + 2 * (ix + iy * 3 - 1)));
- }
- z0 = mbl.z_values[0][0] + *reinterpret_cast(&z_offset_u) * 0.01;
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 1) {
- printf_P(PSTR("Bed leveling, point: %d, calibration Z stored in eeprom: %d, calibration z: %f \n"), mesh_point, z_offset_u, z0);
- }
- #endif // SUPPORT_VERBOSITY
- }
-
- // Move Z up to MESH_HOME_Z_SEARCH.
- if((ix == 0) && (iy == 0)) current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
- else current_position[Z_AXIS] += 2.f / nMeasPoints; //use relative movement from Z coordinate where PINDa triggered on previous point. This makes calibration faster.
- float init_z_bckp = current_position[Z_AXIS];
- plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE);
- st_synchronize();
-
- // Move to XY position of the sensor point.
- current_position[X_AXIS] = BED_X(ix, nMeasPoints);
- current_position[Y_AXIS] = BED_Y(iy, nMeasPoints);
-
- //printf_P(PSTR("[%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]);
-
-
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 1) {
- bool clamped = world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]);
- SERIAL_PROTOCOL(mesh_point);
- clamped ? SERIAL_PROTOCOLPGM(": xy clamped.\n") : SERIAL_PROTOCOLPGM(": no xy clamping\n");
- }
- #else //SUPPORT_VERBOSITY
- world2machine_clamp(current_position[X_AXIS], current_position[Y_AXIS]);
- #endif // SUPPORT_VERBOSITY
-
- //printf_P(PSTR("after clamping: [%f;%f]\n"), current_position[X_AXIS], current_position[Y_AXIS]);
- plan_buffer_line_curposXYZE(XY_AXIS_FEEDRATE);
- st_synchronize();
-
- // Go down until endstop is hit
- const float Z_CALIBRATION_THRESHOLD = 1.f;
- if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point
- printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
- break;
- }
- if (init_z_bckp - current_position[Z_AXIS] < 0.1f) { //broken cable or initial Z coordinate too low. Go to MESH_HOME_Z_SEARCH and repeat last step (z-probe) again to distinguish between these two cases.
- //printf_P(PSTR("Another attempt! Current Z position: %f\n"), current_position[Z_AXIS]);
- current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
- plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE);
- st_synchronize();
-
- if (!find_bed_induction_sensor_point_z((has_z && mesh_point > 0) ? z0 - Z_CALIBRATION_THRESHOLD : -10.f, nProbeRetry)) { //if we have data from z calibration max allowed difference is 1mm for each point, if we dont have data max difference is 10mm from initial point
- printf_P(_T(MSG_BED_LEVELING_FAILED_POINT_LOW));
- break;
- }
- if (MESH_HOME_Z_SEARCH - current_position[Z_AXIS] < 0.1f) {
- puts_P(PSTR("Bed leveling failed. Sensor disconnected or cable broken."));
- break;
- }
- }
- if (has_z && fabs(z0 - current_position[Z_AXIS]) > Z_CALIBRATION_THRESHOLD) { //if we have data from z calibration, max. allowed difference is 1mm for each point
- puts_P(PSTR("Bed leveling failed. Sensor triggered too high."));
- break;
- }
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 10) {
- SERIAL_ECHOPGM("X: ");
- MYSERIAL.print(current_position[X_AXIS], 5);
- SERIAL_ECHOLNPGM("");
- SERIAL_ECHOPGM("Y: ");
- MYSERIAL.print(current_position[Y_AXIS], 5);
- SERIAL_PROTOCOLPGM("\n");
- }
- #endif // SUPPORT_VERBOSITY
- float offset_z = 0;
-
-#ifdef PINDA_THERMISTOR
- offset_z = temp_compensation_pinda_thermistor_offset(current_temperature_pinda);
-#endif //PINDA_THERMISTOR
-// #ifdef SUPPORT_VERBOSITY
-/* if (verbosity_level >= 1)
- {
- SERIAL_ECHOPGM("mesh bed leveling: ");
- MYSERIAL.print(current_position[Z_AXIS], 5);
- SERIAL_ECHOPGM(" offset: ");
- MYSERIAL.print(offset_z, 5);
- SERIAL_ECHOLNPGM("");
- }*/
-// #endif // SUPPORT_VERBOSITY
- mbl.set_z(ix, iy, current_position[Z_AXIS] - offset_z); //store measured z values z_values[iy][ix] = z - offset_z;
-
- custom_message_state--;
- mesh_point++;
- lcd_update(1);
- }
- current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 20) {
- SERIAL_ECHOLNPGM("Mesh bed leveling while loop finished.");
- SERIAL_ECHOLNPGM("MESH_HOME_Z_SEARCH: ");
- MYSERIAL.print(current_position[Z_AXIS], 5);
- }
- #endif // SUPPORT_VERBOSITY
- plan_buffer_line_curposXYZE(Z_LIFT_FEEDRATE);
- st_synchronize();
- if (mesh_point != nMeasPoints * nMeasPoints) {
- Sound_MakeSound(e_SOUND_TYPE_StandardAlert);
- bool bState;
- do { // repeat until Z-leveling o.k.
- lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ..."));////MSG_Z-LEVELING_ENFORCED c=20 r=4
-#ifdef TMC2130
- lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT);
- calibrate_z_auto(); // Z-leveling (X-assembly stay up!!!)
-#else // TMC2130
- lcd_wait_for_click_delay(0); // ~ no timeout
- lcd_calibrate_z_end_stop_manual(true); // Z-leveling (X-assembly stay up!!!)
-#endif // TMC2130
- // ~ Z-homing (can not be used "G28", because X & Y-homing would have been done before (Z-homing))
- bState=enable_z_endstop(false);
- current_position[Z_AXIS] -= 1;
- plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40);
- st_synchronize();
- enable_z_endstop(true);
-#ifdef TMC2130
- tmc2130_home_enter(Z_AXIS_MASK);
-#endif // TMC2130
- current_position[Z_AXIS] = MESH_HOME_Z_SEARCH;
- plan_buffer_line_curposXYZE(homing_feedrate[Z_AXIS] / 40);
- st_synchronize();
-#ifdef TMC2130
- tmc2130_home_exit();
-#endif // TMC2130
- enable_z_endstop(bState);
- } while (st_get_position_mm(Z_AXIS) > MESH_HOME_Z_SEARCH); // i.e. Z-leveling not o.k.
-// plan_set_z_position(MESH_HOME_Z_SEARCH); // is not necessary ('do-while' loop always ends at the expected Z-position)
- custom_message_type=CustomMsg::Status; // display / status-line recovery
- lcd_update_enable(true); // display / status-line recovery
- gcode_G28(true, true, true); // X & Y & Z-homing (must be after individual Z-homing (problem with spool-holder)!)
- repeatcommand_front(); // re-run (i.e. of "G80")
- break;
- }
- clean_up_after_endstop_move(l_feedmultiply);
-// SERIAL_ECHOLNPGM("clean up finished ");
-
-#ifndef PINDA_THERMISTOR
- if(temp_cal_active == true && calibration_status_pinda() == true) temp_compensation_apply(); //apply PINDA temperature compensation
-#endif
- babystep_apply(); // Apply Z height correction aka baby stepping before mesh bed leveing gets activated.
-// SERIAL_ECHOLNPGM("babystep applied");
- bool eeprom_bed_correction_valid = eeprom_read_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID) == 1;
- #ifdef SUPPORT_VERBOSITY
- if (verbosity_level >= 1) {
- eeprom_bed_correction_valid ? SERIAL_PROTOCOLPGM("Bed correction data valid\n") : SERIAL_PROTOCOLPGM("Bed correction data not valid\n");
- }
- #endif // SUPPORT_VERBOSITY
-
- for (uint8_t i = 0; i < 4; ++i) {
- unsigned char codes[4] = { 'L', 'R', 'F', 'B' };
- long correction = 0;
- if (code_seen(codes[i]))
- correction = code_value_long();
- else if (eeprom_bed_correction_valid) {
- unsigned char *addr = (i < 2) ?
- ((i == 0) ? (unsigned char*)EEPROM_BED_CORRECTION_LEFT : (unsigned char*)EEPROM_BED_CORRECTION_RIGHT) :
- ((i == 2) ? (unsigned char*)EEPROM_BED_CORRECTION_FRONT : (unsigned char*)EEPROM_BED_CORRECTION_REAR);
- correction = eeprom_read_int8(addr);
- }
- if (correction == 0)
- continue;
-
- if (labs(correction) > BED_ADJUSTMENT_UM_MAX) {
- SERIAL_ERROR_START;
- SERIAL_ECHOPGM("Excessive bed leveling correction: ");
- SERIAL_ECHO(correction);
- SERIAL_ECHOLNPGM(" microns");
- }
- else {
- float offset = float(correction) * 0.001f;
- switch (i) {
- case 0:
- for (uint8_t row = 0; row < nMeasPoints; ++row) {
- for (uint8_t col = 0; col < nMeasPoints - 1; ++col) {
- mbl.z_values[row][col] += offset * (nMeasPoints - 1 - col) / (nMeasPoints - 1);
- }
- }
- break;
- case 1:
- for (uint8_t row = 0; row < nMeasPoints; ++row) {
- for (uint8_t col = 1; col < nMeasPoints; ++col) {
- mbl.z_values[row][col] += offset * col / (nMeasPoints - 1);
- }
- }
- break;
- case 2:
- for (uint8_t col = 0; col < nMeasPoints; ++col) {
- for (uint8_t row = 0; row < nMeasPoints; ++row) {
- mbl.z_values[row][col] += offset * (nMeasPoints - 1 - row) / (nMeasPoints - 1);
- }
- }
- break;
- case 3:
- for (uint8_t col = 0; col < nMeasPoints; ++col) {
- for (uint8_t row = 1; row < nMeasPoints; ++row) {
- mbl.z_values[row][col] += offset * row / (nMeasPoints - 1);
- }
- }
- break;
- }
- }
- }
-// SERIAL_ECHOLNPGM("Bed leveling correction finished");
- if (nMeasPoints == 3) {
- mbl.upsample_3x3(); //interpolation from 3x3 to 7x7 points using largrangian polynomials while using the same array z_values[iy][ix] for storing (just coppying measured data to new destination and interpolating between them)
- }
-/*
- SERIAL_PROTOCOLPGM("Num X,Y: ");
- SERIAL_PROTOCOL(MESH_NUM_X_POINTS);
- SERIAL_PROTOCOLPGM(",");
- SERIAL_PROTOCOL(MESH_NUM_Y_POINTS);
- SERIAL_PROTOCOLPGM("\nZ search height: ");
- SERIAL_PROTOCOL(MESH_HOME_Z_SEARCH);
- SERIAL_PROTOCOLLNPGM("\nMeasured points:");
- for (int y = MESH_NUM_Y_POINTS-1; y >= 0; y--) {
- for (int x = 0; x < MESH_NUM_X_POINTS; x++) {
- SERIAL_PROTOCOLPGM(" ");
- SERIAL_PROTOCOL_F(mbl.z_values[y][x], 5);
- }
- SERIAL_PROTOCOLPGM("\n");
- }
-*/
- if (nMeasPoints == 7 && magnet_elimination) {
- mbl_interpolation(nMeasPoints);
- }
-/*
- SERIAL_PROTOCOLPGM("Num X,Y: ");
- SERIAL_PROTOCOL(MESH_NUM_X_POINTS);
- SERIAL_PROTOCOLPGM(",");
- SERIAL_PROTOCOL(MESH_NUM_Y_POINTS);
- SERIAL_PROTOCOLPGM("\nZ search height: ");
- SERIAL_PROTOCOL(MESH_HOME_Z_SEARCH);
- SERIAL_PROTOCOLLNPGM("\nMeasured points:");
- for (int y = MESH_NUM_Y_POINTS-1; y >= 0; y--) {
- for (int x = 0; x < MESH_NUM_X_POINTS; x++) {
- SERIAL_PROTOCOLPGM(" ");
- SERIAL_PROTOCOL_F(mbl.z_values[y][x], 5);
- }
- SERIAL_PROTOCOLPGM("\n");
- }
-*/
-// SERIAL_ECHOLNPGM("Upsample finished");
- mbl.active = 1; //activate mesh bed leveling
-// SERIAL_ECHOLNPGM("Mesh bed leveling activated");
- go_home_with_z_lift();
-// SERIAL_ECHOLNPGM("Go home finished");
- //unretract (after PINDA preheat retraction)
- if ((degHotend(active_extruder) > EXTRUDE_MINTEMP) && eeprom_read_byte((unsigned char *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() && (target_temperature_bed >= 50)) {
- current_position[E_AXIS] += default_retraction;
- plan_buffer_line_curposXYZE(400);
- }
- KEEPALIVE_STATE(NOT_BUSY);
- // Restore custom message state
- lcd_setstatuspgm(_T(WELCOME_MSG));
- custom_message_type = custom_message_type_old;
- custom_message_state = custom_message_state_old;
- mesh_bed_leveling_flag = false;
- mesh_bed_run_from_menu = false;
- lcd_update(2);
-
-=======
gcode_G80();
->>>>>>> upstream/MK3_3.10.0
}
break;
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2b8bc248..ebf2b205 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -2237,10 +2237,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
// handled earlier
break;
}
-<<<<<<< HEAD
lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
-=======
->>>>>>> upstream/MK3_3.10.0
}
lcd_set_cursor(0, 0);
@@ -6680,11 +6677,7 @@ static void lcd_main_menu()
}
MENU_ITEM_SUBMENU_P(_i("Support"), lcd_support_menu);////MSG_SUPPORT c=18
#ifdef LCD_TEST
-<<<<<<< HEAD
- MENU_ITEM_SUBMENU_P(_i("W25x20CL init"), lcd_test_menu);
-=======
MENU_ITEM_SUBMENU_P(_i("XFLASH init"), lcd_test_menu);////MSG_SUPPORT
->>>>>>> upstream/MK3_3.10.0
#endif //LCD_TEST
MENU_END();
From 8eeb177c7e03766575479a33644a29d99f0795a5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 08:46:32 +0200
Subject: [PATCH 230/254] Use textwarp to check the message length and rows
@DRracer: Added origial English text to the output, added cols and rows as
well
---
lang/lang-check.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 9446d827..1e6ff519 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -4,11 +4,12 @@
#
#############################################################################
# Change log:
-# 7 May 2019, Ondrej Tuma, Initial
-# 9 June 2020, 3d-gussner, Added version and Change log
-# 9 June 2020, 3d-gussner, Wrap text to 20 char and rows
-# 9 June 2020, 3d-gussner, colored output
-# 2 Apr. 2021, 3d-gussner, Fix and improve text warp
+# 7 May 2019, Ondrej Tuma, Initial
+# 9 June 2020, 3d-gussner, Added version and Change log
+# 9 June 2020, 3d-gussner, Wrap text to 20 char and rows
+# 9 June 2020, 3d-gussner, colored output
+# 2 Apr. 2021, 3d-gussner, Fix and improve text warp
+# 22 Apr. 2021, DRracer, add English source to output
#############################################################################
#
"""Check lang files."""
@@ -76,7 +77,8 @@ def parse_txt(lang, no_warning):
rows = 1
if rows_count_translation > rows_count_source and rows_count_translation > rows:
- print(red("[E]: Text %s is longer then definiton on line %d rows diff=%d, EN=%s\n" % (translation, lines, rows_count_translation-rows, source)))
+ print(red("[E]: Text %s is longer then definition on line %d rows diff=%d\n[EN]:Text %s cols=%d rows=%d\n" % (translation, lines, rows_count_translation-rows, source, cols, rows)))
+
if len(src.readline()) != 1: # empty line
break
From 044c0a0a6a2462845231d0d047ea4c6935ddc834 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 08:49:22 +0200
Subject: [PATCH 231/254] Update "\04Refresh" message as two "abcd" "efgh" in
one line cause issues in lang-build scripts
---
Firmware/messages.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 23066aad..d9f45c2a 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -82,7 +82,7 @@ const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unl
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("\x04" "Refresh"); ////c=18
+const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\x04Refresh"); ////c=18
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
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 232/254] 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."
From 28aec049a2ac34a0a8c5ff3d3c58eb82ea19dced Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 09:41:12 +0200
Subject: [PATCH 233/254] Fix Typo in MSG_FIL_FAILED
---
Firmware/ultralcd.cpp | 2 +-
lang/lang_en.txt | 2 +-
lang/lang_en_cz.txt | 2 +-
lang/lang_en_de.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 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f5e47a50..41f5b10c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -7353,7 +7353,7 @@ static void lcd_detect_IRsensor(){
// the fsensor board has been successfully identified, any previous "not responding" may be cleared now
fsensor_not_responding = false;
} else {
- lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILD c=20 r=5
+ lcd_show_fullscreen_message_and_wait_P(_i("Verification failed, remove the filament and try again."));////MSG_FIL_FAILED c=20 r=5
// here it is unclear what to to with the fsensor_not_responding flag
}
bMenuFSDetect=false; // de-inhibits some code inside "manage_inactivity()"
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 30c36001..824de1e9 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -976,7 +976,7 @@
#MSG_WIZARD_V2_CAL_2 c=20 r=12
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
#MSG_Y_CORRECTION c=13
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 4db4248c..a57ef4ba 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Tiskarna zacne tisknout lomenou caru. Otacenim tlacitka nastavte optimalni vysku. Postupujte podle obrazku v handbooku (kapitola Kalibrace)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Overeni selhalo, vyjmete filament a zkuste znovu."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 32aa0498..b74d9ecd 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Der Drucker beginnt mit dem Drucken einer Zickzacklinie. Drehen Sie den Knopf, bis Sie die optimale Hoehe erreicht haben. Ueberpruefen Sie die Bilder im Handbuch (Kapitel Kalibrierung)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Ueberpruefung fehl- geschlagen, entladen Sie das Filament und versuchen Sie es erneut."
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index f763d581..e96fc376 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"L'imprimante commencera a imprimer une ligne en zig-zag. Tournez le bouton jusqu'a atteindre la hauteur optimale. Consultez les photos dans le manuel (chapitre Calibration)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Verification en echec, retirez le filament et reessayez."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 7c309f06..51fc01f8 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"La stampante iniziera a stampare una linea a zig-zag. Gira la manopola fino a che non hai raggiungo l'altezza ottimale. Verifica con le immagini nel manuale (capitolo sulla calibrazione):"
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Verifica fallita, rimuovere il filamento e riprovare."
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 4a4a2343..2d878b87 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"De printer begint een zigzaglijn printen. Draai aan de knop totdat je de optimale hoogte hebt bereikt. Bekijk de afbeeldingen in de handleiding (Calibration chapter)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Verificatie mislukt, verwijder het filament en probeer het opnieuw."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 68dee501..c96aa21b 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1302,7 +1302,7 @@
"The printer will start printing a zig-zag line. Rotate the knob until you reach the optimal height. Check the pictures in the handbook (Calibration chapter)."
"Drukarka zacznie drukowanie linii w ksztalcie zygzaka. Ustaw optymalna wysokosc obracajac pokretlo. Porownaj z ilustracjami w Podreczniku (rozdzial Kalibracja)."
-#MSG_FIL_FAILD c=20 r=5
+#MSG_FIL_FAILED c=20 r=5
"Verification failed, remove the filament and try again."
"Niepowodzenie sprawdzenia, wyciagnij filament i sprobuj ponownie."
From 403b340f198e5f851e4c0be8cb70a84401b81bc7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 11:02:42 +0200
Subject: [PATCH 234/254] Added ` EXTENDED_M20` to RepRap Gcode wiki `M115` see
https://reprap.org/mediawiki/index.php?title=G-code&type=revision&diff=189034&oldid=189033
---
Firmware/Marlin_main.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index e55f9f6c..a708b72e 100755
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -3965,7 +3965,6 @@ static void extended_capabilities_report()
cap_line(PSTR("AUTOREPORT_POSITION"), ENABLED(AUTO_REPORT));
// EXTENDED_M20 (support for L and T parameters)
cap_line(PSTR("EXTENDED_M20"), 1);
- //@todo Update RepRap cap
}
#endif //EXTENDED_CAPABILITIES_REPORT
From a9f0ff441d3dd647134f9d8999efcd7d02197016 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 12:15:48 +0200
Subject: [PATCH 235/254] Allow to customize OUTDIR in config.sh
Useful for custom build trees.
---
lang/config.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lang/config.sh b/lang/config.sh
index f518693f..954424c2 100755
--- a/lang/config.sh
+++ b/lang/config.sh
@@ -17,7 +17,9 @@ export OBJCOPY=$ARDUINO/hardware/tools/avr/bin/avr-objcopy
export OBJDUMP=$ARDUINO/hardware/tools/avr/bin/avr-objdump
#
# Output folder:
-export OUTDIR="../../Prusa-Firmware-build"
+if [ -z "$OUTDIR" ]; then
+ export OUTDIR="../../Prusa-Firmware-build"
+fi
#
# Objects folder:
export OBJDIR="$OUTDIR/sketch"
From 8b5d01e3b1a697b272995abf49e20c873a4b42ac Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 12:18:50 +0200
Subject: [PATCH 236/254] Be more strict when checking translation lenght
Strip quotes immediately so that we can measure strings easily.
For single-line strings, check the translation lenght correctly.
---
lang/lang-check.py | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 1e6ff519..3ddbdc67 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -36,20 +36,20 @@ def parse_txt(lang, no_warning):
while True:
comment = src.readline().split(' ')
#print (comment) #Debug
- source = src.readline()[:-1]
+ source = src.readline()[:-1].strip('"')
#print (source) #Debug
- translation = src.readline()[:-1]
+ translation = src.readline()[:-1].strip('"')
#print (translation) #Debug
#Wrap text to 20 chars and rows
wrapper = textwrap.TextWrapper(width=20)
#wrap original/source
rows_count_source = 0
- for line in wrapper.wrap(source.strip('"')):
+ for line in wrapper.wrap(source):
rows_count_source += 1
#print (line) #Debug
#wrap translation
rows_count_translation = 0
- for line in wrapper.wrap(translation.strip('"')):
+ for line in wrapper.wrap(translation):
rows_count_translation += 1
#print (line) #Debug
#End wrap text
@@ -76,9 +76,11 @@ def parse_txt(lang, no_warning):
if rows is None:
rows = 1
- if rows_count_translation > rows_count_source and rows_count_translation > rows:
- print(red("[E]: Text %s is longer then definition on line %d rows diff=%d\n[EN]:Text %s cols=%d rows=%d\n" % (translation, lines, rows_count_translation-rows, source, cols, rows)))
-
+ if (rows_count_translation > rows_count_source and rows_count_translation > rows) or \
+ (rows == 1 and len(translation) > cols):
+ print(red('[E]: Text "%s" is longer then definition on line %d (rows diff=%d)\n'
+ '[EN]:Text "%s" cols=%d rows=%d\n' % (translation, lines, rows_count_translation-rows, source, cols, rows)))
+
if len(src.readline()) != 1: # empty line
break
From 2e6e2c4fde2e4fec0ecf17f19f7549315b2b4016 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 12:26:15 +0200
Subject: [PATCH 237/254] Do not output colors when redirecting output
---
lang/lang-check.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 3ddbdc67..c5bfbe9a 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -15,12 +15,18 @@
"""Check lang files."""
from argparse import ArgumentParser
from traceback import print_exc
-from sys import stderr
+from sys import stdout, stderr
import textwrap
-red = lambda text: '\033[0;31m' + text + '\033[0m'
-green = lambda text: '\033[0;32m' + text + '\033[0m'
-yellow = lambda text: '\033[0;33m' + text + '\033[0m'
+def color_maybe(color_attr, text):
+ if stdout.isatty():
+ return '\033[0;' + str(color_attr) + 'm' + text + '\033[0m'
+ else:
+ return text
+
+red = lambda text: color_maybe(31, text)
+green = lambda text: color_maybe(32, text)
+yellow = lambda text: color_maybe(33, text)
def parse_txt(lang, no_warning):
"""Parse txt file and check strings to display definition."""
From 90a9e350c021e2bf59d0065fea0acbff3129d64e Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 12:37:54 +0200
Subject: [PATCH 238/254] Remove warnings caused by '\x00'
Manually unescape '\x00' for the time being, removing spurious warnings.
---
lang/lang-check.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index c5bfbe9a..62ba0252 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -45,6 +45,9 @@ def parse_txt(lang, no_warning):
source = src.readline()[:-1].strip('"')
#print (source) #Debug
translation = src.readline()[:-1].strip('"')
+ if translation == '\\x00':
+ # crude hack to handle intentionally-empty translations
+ translation = ''
#print (translation) #Debug
#Wrap text to 20 chars and rows
wrapper = textwrap.TextWrapper(width=20)
From 346044063a9170f457b755d6fa61de3867a9c909 Mon Sep 17 00:00:00 2001
From: "D.R.racer"
Date: Fri, 23 Apr 2021 12:48:25 +0200
Subject: [PATCH 239/254] Fix length of some CZ messages
---
lang/lang_en_cz.txt | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a57ef4ba..c1140a74 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -140,7 +140,7 @@
#MSG_CALIBRATING_HOME c=20
"Calibrating home"
-"Kalibruji vychozi poz."
+"Kalibruji vychozi p."
#MSG_CALIBRATE_BED c=18
"Calibrate XYZ"
@@ -604,7 +604,7 @@
#MSG_MEASURED_SKEW c=13
"Measured skew"
-"Merene zkoseni"
+"Merene zkos."
#MSG_MMU_FAILS c=15
"MMU fails"
@@ -616,7 +616,7 @@
#MSG_MMU_LOAD_FAILS c=15
"MMU load fails"
-"MMU selhani zavadeni"
+"MMU selhani zav"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
@@ -644,7 +644,7 @@
#MSG_MMU_POWER_FAILS c=15
"MMU power fails"
-"MMU vypadky proudu"
+"MMU vyp. proudu"
#MSG_STEALTH c=7
"Stealth"
@@ -652,7 +652,7 @@
#MSG_AUTO_POWER c=10
"Auto power"
-"Automaticky"
+"Automat."
#MSG_HIGH_POWER c=10
"High power"
@@ -732,7 +732,7 @@
#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
-"Vent. trysky"
+"V. trysky"
#MSG_PAUSE_PRINT c=18
"Pause print"
@@ -868,7 +868,7 @@
#MSG_PRESS_KNOB c=20
"Press the knob"
-"Stisknete hl. tlacitko"
+"Stisknete tlacitko"
#MSG_PRINT_PAUSED c=20
"Print paused"
@@ -884,7 +884,7 @@
#MSG_PRINT_FAN c=10
"Print FAN"
-"Tiskovy vent."
+"Tiskovy v."
#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
@@ -1044,7 +1044,7 @@
#MSG_SEVERE_SKEW c=13
"Severe skew:"
-"Tezke zkoseni:"
+"Tezke zkos.:"
#MSG_SORT_ALPHA c=8
"Alphabet"
@@ -1060,7 +1060,7 @@
#MSG_SLIGHT_SKEW c=13
"Slight skew:"
-"Lehke zkoseni:"
+"Lehke zkos.:"
#MSG_SOUND c=7
"Sound"
From 032e8a59575e9c483906281627ad7823927be4b3 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:03:59 +0200
Subject: [PATCH 240/254] @leptun strip 1st char hack for duplicate `Cancel`
---
Firmware/messages.c | 2 +-
Firmware/ultralcd.cpp | 6 +++---
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 ----
10 files changed, 4 insertions(+), 35 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index d9f45c2a..b60d0ec9 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -17,7 +17,7 @@ const char MSG_BED_HEATING[] PROGMEM_I1 = ISTR("Bed Heating"); ////c=20
const char MSG_BED_LEVELING_FAILED_POINT_LOW[] PROGMEM_I1 = ISTR("Bed leveling failed. Sensor didn't trigger. Debris on nozzle? Waiting for reset."); ////c=20 r=6
const char MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED[] PROGMEM_I1 = ISTR("XYZ calibration failed. Please consult the manual."); ////c=20 r=8
const char MSG_BELT_STATUS[] PROGMEM_I1 = ISTR("Belt status");////c=18
-const char MSG_CANCEL[] PROGMEM_I1 = ISTR("Cancel");////c=9
+const char MSG_CANCEL[] PROGMEM_I1 = ISTR(">Cancel");////c=9
const char MSG_CALIBRATE_Z_AUTO[] PROGMEM_I1 = ISTR("Calibrating Z"); ////c=20 r=2
const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); ////c=18
const char MSG_CHECKING_X[] PROGMEM_I1 = ISTR("Checking X axis"); ////c=20
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 41f5b10c..3464c1e5 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_CANCEL2 c=10
+ lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
lcd_set_cursor(0, 1);
switch (eFilamentAction)
@@ -2237,7 +2237,7 @@ void mFilamentItem(uint16_t nTemp, uint16_t nTempBed)
// handled earlier
break;
}
- lcd_puts_at_P(0, 3, _T(MSG_CANCEL));
+ lcd_puts_at_P(0, 3, _T(MSG_CANCEL)); ////MSG_CANCEL
}
lcd_set_cursor(0, 0);
@@ -4626,7 +4626,7 @@ void lcd_v2_calibration()
{
const uint8_t filament = choose_menu_P(
_i("Select filament:"), ////MSG_SELECT_FILAMENT c=20
- _T(MSG_FILAMENT),_T(MSG_CANCEL));
+ _T(MSG_FILAMENT),(_T(MSG_CANCEL)+1)); //Hack to reuse MSG but strip 1st char off
if (filament < 5)
{
lay1cal_filament = filament;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 824de1e9..05e21458 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -133,9 +133,6 @@
#MSG_MENU_CALIBRATION c=18
"Calibration"
-#MSG_CANCEL c=9
-"Cancel"
-
#MSG_SD_REMOVED c=20
"Card removed"
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index a57ef4ba..88ab0bc1 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -178,10 +178,6 @@
"Calibration"
"Kalibrace"
-#MSG_CANCEL c=9
-"Cancel"
-"Zrusit"
-
#MSG_SD_REMOVED c=20
"Card removed"
"Karta vyjmuta"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index b74d9ecd..d7170f8b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -178,10 +178,6 @@
"Calibration"
"Kalibrierung"
-#MSG_CANCEL c=9
-"Cancel"
-"Abbruch"
-
#MSG_SD_REMOVED c=20
"Card removed"
"SD Karte entfernt"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 8a63d669..12d27b35 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -178,10 +178,6 @@
"Calibration"
"Calibracion"
-#MSG_CANCEL c=9
-"Cancel"
-"Cancelar"
-
#MSG_SD_REMOVED c=20
"Card removed"
"Tarjeta retirada"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index e96fc376..282cc4c7 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -178,10 +178,6 @@
"Calibration"
"\x00"
-#MSG_CANCEL c=9
-"Cancel"
-"Annuler"
-
#MSG_SD_REMOVED c=20
"Card removed"
"Carte retiree"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 51fc01f8..72272153 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -178,10 +178,6 @@
"Calibration"
"Calibrazione"
-#MSG_CANCEL c=9
-"Cancel"
-"Annulla"
-
#MSG_SD_REMOVED c=20
"Card removed"
"SD rimossa"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 2d878b87..69de4efe 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -178,10 +178,6 @@
"Calibration"
"Kalibratie"
-#MSG_CANCEL c=9
-"Cancel"
-"Annuleren"
-
#MSG_SD_REMOVED c=20
"Card removed"
"SD verwijderd"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index c96aa21b..850c81aa 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -178,10 +178,6 @@
"Calibration"
"Kalibracja"
-#MSG_CANCEL c=9
-"Cancel"
-"Anuluj"
-
#MSG_SD_REMOVED c=20
"Card removed"
"Karta wyjeta"
From 013708479faa81c83113ab6b0e37dbc285704ce5 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:12:57 +0200
Subject: [PATCH 241/254] Fix MSG_UNLOAD_FILAMENT length as in MMU a number is
added
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index b60d0ec9..0df06139 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -113,7 +113,7 @@ const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); ////c=18
const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); ////c=20
const char MSG_TEMP_CALIBRATION[] PROGMEM_I1 = ISTR("Temp. cal."); ////c=14
const char MSG_TEMP_CALIBRATION_DONE[] PROGMEM_I1 = ISTR("Temperature calibration is finished and active. Temp. calibration can be disabled in menu Settings->Temp. cal."); ////c=20 r=12
-const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////c=17
+const char MSG_UNLOAD_FILAMENT[] PROGMEM_I1 = ISTR("Unload filament"); ////Number 1 to 5 is added behind text e.g. "Unload filament" c=16
const char MSG_UNLOADING_FILAMENT[] PROGMEM_I1 = ISTR("Unloading filament"); ////c=20
const char MSG_WATCH[] PROGMEM_I1 = ISTR("Info screen"); ////c=18
const char MSG_WIZARD_CALIBRATION_FAILED[] PROGMEM_I1 = ISTR("Please check our handbook and fix the problem. Then resume the Wizard by rebooting the printer."); ////c=20 r=8
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index 05e21458..e877d628 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -877,7 +877,7 @@
#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
#MSG_UNLOADING_FILAMENT c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 2eb6f0aa..aeb0a036 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"k vyjmuti filamentu"
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Vyjmout filament"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d7170f8b..fd53ae7b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"Filament entladen"
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Filament entladen"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 12d27b35..3aa1bc1d 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"para descargar fil."
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Soltar filamento"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 282cc4c7..52ffd8c2 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"pour decharger fil."
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Decharger fil."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 72272153..3ffbaf63 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"per scaricare fil."
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Scarica filamento"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 69de4efe..ba0c7f84 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"om fil. uitwerpen"
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Filament uitwerpen"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 850c81aa..1692b72a 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1170,7 +1170,7 @@
"to unload filament"
"aby rozlad. filament"
-#MSG_UNLOAD_FILAMENT c=17
+#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
"Rozladowanie fil."
From 10a026e075e336c03a5d04760a0b525390a5bae9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:16:36 +0200
Subject: [PATCH 242/254] Fix Dutch + German MSG_UNLOAD_FILAMENT too long
translations
---
lang/lang_en_de.txt | 4 ++--
lang/lang_en_nl.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fd53ae7b..fa7f2b71 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1168,11 +1168,11 @@
#MSG_TO_UNLOAD_FIL c=20
"to unload filament"
-"Filament entladen"
+"um Filament entladen"
#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
-"Filament entladen"
+"Fil. entladen"
#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ba0c7f84..768b2332 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1172,7 +1172,7 @@
#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
-"Filament uitwerpen"
+"Fil. uitwerpen"
#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
From 7cd76432b939977262fdaeac623438d9ddbd10c9 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:19:47 +0200
Subject: [PATCH 243/254] Fix German MSG_LOAD_TO_NOZZLE
---
lang/lang_en_de.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index fa7f2b71..87e7585a 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -564,7 +564,7 @@
#MSG_LOAD_TO_NOZZLE c=18
"Load to nozzle"
-"In Druckduese laden"
+"In Nozzle laden"
#MSG_M117_V2_CALIBRATION c=25
"M117 First layer cal."
From 3f51627c02cba691817e1e3581b6b43d7148da19 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:23:11 +0200
Subject: [PATCH 244/254] Fix MSG_NO being too short, no need to be
---
Firmware/messages.c | 2 +-
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, 9 insertions(+), 9 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 0df06139..7840f35e 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -69,7 +69,7 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=18
const char MSG_MMU_FAILS[] PROGMEM_I1 = ISTR("MMU fails"); ////c=15
const char MSG_MMU_LOAD_FAILS[] PROGMEM_I1 = ISTR("MMU load fails"); ////c=15
-const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=3
+const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=4
const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=12
const char MSG_PAPER[] PROGMEM_I1 = ISTR("Place a sheet of paper under the nozzle during the calibration of first 4 points. If the nozzle catches the paper, power off the printer immediately."); ////c=20 r=10
const char MSG_PAUSE_PRINT[] PROGMEM_I1 = ISTR("Pause print");////c=18
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index e877d628..f2d1078d 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -517,7 +517,7 @@
#MSG_NA c=3
"N/A"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
#MSG_SELFTEST_NOTCONNECTED c=20
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index aeb0a036..ba8d9c85 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -690,7 +690,7 @@
"N/A"
"\x00"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"Ne"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 87e7585a..d474b282 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -690,7 +690,7 @@
"N/A"
"N/V"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"Nein"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 3aa1bc1d..59dd96f2 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -690,7 +690,7 @@
"N/A"
"N/A"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"\x00"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 52ffd8c2..331a49fe 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -690,7 +690,7 @@
"N/A"
"\x00"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"Non"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3ffbaf63..3031233b 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -690,7 +690,7 @@
"N/A"
"N/D"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"\x00"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 768b2332..45ddda8f 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -690,7 +690,7 @@
"N/A"
"N/V"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"Nee"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1692b72a..331fa9bf 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -690,7 +690,7 @@
"N/A"
"N/D"
-#MSG_NO c=3
+#MSG_NO c=4
"No"
"Nie"
From c2cde83d7e86fe78e431d3acdf896e35d43bdb01 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:29:45 +0200
Subject: [PATCH 245/254] Fix MSG_SELFTEST_WIRINGERROR to c=18
---
Firmware/messages.c | 2 +-
Firmware/ultralcd.cpp | 2 +-
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 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 7840f35e..76a17e10 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -97,7 +97,7 @@ const char MSG_SELFTEST_CHECK_BED[] PROGMEM_I1 = ISTR("Checking bed "); ////
const char MSG_SELFTEST_CHECK_FSENSOR[] PROGMEM_I1 = ISTR("Checking sensors "); ////c=20
const char MSG_SELFTEST_MOTOR[] PROGMEM_I1 = ISTR("Motor"); ////c=18
const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); ////c=17
-const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////c=17
+const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); ////c=18
const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); ////c=18
const char MSG_TOTAL[] PROGMEM_I1 = ISTR("Total"); ////c=6
const char MSG_TOTAL_FAILURES[] PROGMEM_I1 = ISTR("Total failures"); ////c=20
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 3464c1e5..8433603d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -8075,7 +8075,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
case TestError::Endstops:
lcd_puts_at_P(0, 2, _i("Endstops"));////MSG_SELFTEST_ENDSTOPS c=20
lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR));
- lcd_set_cursor(17, 3);
+ lcd_set_cursor(18, 3);
lcd_print(_error_1);
break;
case TestError::Motor:
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f2d1078d..442cb24b 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -916,7 +916,7 @@
#MSG_UNLOAD_SUCCESSFUL c=20 r=2
"Was filament unload successful?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
#MSG_WIZARD c=17
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index ba8d9c85..7c91fb4d 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Bylo vysunuti filamentu uspesne?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Chyba zapojeni"
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index d474b282..2d38ebe3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Konnten Sie das Filament entnehmen?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Verdrahtungsfehler"
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 59dd96f2..a3a03ca8 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"?Se cargocon exito el filamento?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Error de conexion"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index 331a49fe..2ca0624f 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Dechargement du filament reussi?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Erreur de cablage"
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 3031233b..73e13d40 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Filamento scaricato con successo?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Errore cablaggio"
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index 45ddda8f..ad070fa1 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Is filament succes- vol verwijderd?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Aansluitingsfout"
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 331fa9bf..229a26d6 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1222,7 +1222,7 @@
"Was filament unload successful?"
"Rozladowanie fil. ok?"
-#MSG_SELFTEST_WIRINGERROR c=17
+#MSG_SELFTEST_WIRINGERROR c=18
"Wiring error"
"Blad polaczenia"
From 540940b6a5c7e3f3486b3ba493f8db259ee2e130 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 13:36:12 +0200
Subject: [PATCH 246/254] Fix German too long translation MSG_MMU_MODE
---
lang/lang_en_de.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 2d38ebe3..9230c42b 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1360,7 +1360,7 @@
#MSG_MMU_MODE c=8
"MMU Mode"
-"MMU Modus"
+"/x00"
#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
From 71ab3a9d5303c0d1aa509a7a8a329b316e543203 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 14:20:28 +0200
Subject: [PATCH 247/254] Fix typo thanks to @wavexx
---
lang/lang_en_de.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 9230c42b..504626d3 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1360,7 +1360,7 @@
#MSG_MMU_MODE c=8
"MMU Mode"
-"/x00"
+"\x00"
#MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
"Mode change in progress ..."
From 340928acc3fcd7e700a51de5f6bada7b1303863d Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 15:03:44 +0200
Subject: [PATCH 248/254] lang-check: print a warning if cols!=20 on multiline
messages
---
lang/lang-check.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 62ba0252..5647e88c 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -84,6 +84,8 @@ def parse_txt(lang, no_warning):
cols = len(translation) # propably fullscreen
if rows is None:
rows = 1
+ elif rows > 1 and cols != 20:
+ print(yellow("[W]: Multiple rows with odd number of columns on line %d" % lines))
if (rows_count_translation > rows_count_source and rows_count_translation > rows) or \
(rows == 1 and len(translation) > cols):
From 695af99ada195deea0a2f7f0e87b2ae69f25b683 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 15:11:49 +0200
Subject: [PATCH 249/254] lang-check: simplify wrapping, wrap according to cols
---
lang/lang-check.py | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 5647e88c..b735d96f 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -42,26 +42,6 @@ def parse_txt(lang, no_warning):
while True:
comment = src.readline().split(' ')
#print (comment) #Debug
- source = src.readline()[:-1].strip('"')
- #print (source) #Debug
- translation = src.readline()[:-1].strip('"')
- if translation == '\\x00':
- # crude hack to handle intentionally-empty translations
- translation = ''
- #print (translation) #Debug
-#Wrap text to 20 chars and rows
- wrapper = textwrap.TextWrapper(width=20)
- #wrap original/source
- rows_count_source = 0
- for line in wrapper.wrap(source):
- rows_count_source += 1
- #print (line) #Debug
- #wrap translation
- rows_count_translation = 0
- for line in wrapper.wrap(translation):
- rows_count_translation += 1
- #print (line) #Debug
-#End wrap text
#Check if columns and rows are defined
cols = None
@@ -87,6 +67,19 @@ def parse_txt(lang, no_warning):
elif rows > 1 and cols != 20:
print(yellow("[W]: Multiple rows with odd number of columns on line %d" % lines))
+#Wrap text to 20 chars and rows
+ source = src.readline()[:-1].strip('"')
+ #print (source) #Debug
+ translation = src.readline()[:-1].strip('"')
+ if translation == '\\x00':
+ # crude hack to handle intentionally-empty translations
+ translation = ''
+ #print (translation) #Debug
+ wrapped_source = list(textwrap.TextWrapper(width=cols).wrap(source))
+ rows_count_source = len(wrapped_source)
+ wrapped_translation = list(textwrap.TextWrapper(width=cols).wrap(translation))
+ rows_count_translation = len(wrapped_translation)
+#End wrap text
if (rows_count_translation > rows_count_source and rows_count_translation > rows) or \
(rows == 1 and len(translation) > cols):
print(red('[E]: Text "%s" is longer then definition on line %d (rows diff=%d)\n'
From e4655e5afa216559adbf66430d71c3f66f7f9eec Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 15:30:35 +0200
Subject: [PATCH 250/254] lang-check: pretty-print errors to aid in translation
---
lang/lang-check.py | 49 ++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 45 insertions(+), 4 deletions(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index b735d96f..056e13fe 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -28,6 +28,26 @@ red = lambda text: color_maybe(31, text)
green = lambda text: color_maybe(32, text)
yellow = lambda text: color_maybe(33, text)
+
+def print_wrapped(wrapped_text, rows, cols):
+ if type(wrapped_text) == str:
+ wrapped_text = [wrapped_text]
+ for r, line in enumerate(wrapped_text):
+ r_ = str(r + 1).rjust(3)
+ if r >= rows:
+ r_ = color_maybe(31, r_)
+ print((' {} |{:' + str(cols) + 's}|').format(r_, line))
+
+def print_truncated(text, cols):
+ if len(text) <= cols:
+ prefix = text.ljust(cols)
+ suffix = ''
+ else:
+ prefix = text[0:cols]
+ suffix = text[cols:]
+ print(' |' + prefix + '|' + suffix)
+
+
def parse_txt(lang, no_warning):
"""Parse txt file and check strings to display definition."""
if lang == "en":
@@ -80,11 +100,32 @@ def parse_txt(lang, no_warning):
wrapped_translation = list(textwrap.TextWrapper(width=cols).wrap(translation))
rows_count_translation = len(wrapped_translation)
#End wrap text
- if (rows_count_translation > rows_count_source and rows_count_translation > rows) or \
- (rows == 1 and len(translation) > cols):
- print(red('[E]: Text "%s" is longer then definition on line %d (rows diff=%d)\n'
- '[EN]:Text "%s" cols=%d rows=%d\n' % (translation, lines, rows_count_translation-rows, source, cols, rows)))
+ # Check for potential errors in the definition
+ if rows == 1 and (len(source) > cols or rows_count_source > rows):
+ print(yellow('[W]: Source text longer than %d cols as defined on line %d:' % (cols, lines)))
+ print_truncated(source, cols)
+ print()
+ elif rows_count_source > rows:
+ print(yellow('[W]: Wrapped source text longer than %d rows as defined on line %d:' % (rows, lines)))
+ print_wrapped(wrapped_source, rows, cols)
+ print()
+
+ # Check for translation lenght
+ if (rows_count_translation > rows) or (rows == 1 and len(translation) > cols):
+ print(red('[E]: Text is longer then definition on line %d: rows diff=%d cols=%d rows=%d'
+ % (lines, rows_count_translation-rows, cols, rows)))
+ if rows == 1:
+ print(yellow(' source text:'))
+ print_truncated(source, cols)
+ print(yellow(' translated text:'))
+ print_truncated(translation, cols)
+ else:
+ print(yellow(' source text:'))
+ print_wrapped(wrapped_source, rows, cols)
+ print(yellow(' translated text:'))
+ print_wrapped(wrapped_translation, rows, cols)
+ print()
if len(src.readline()) != 1: # empty line
break
From 7f9910ad2897eb92fc23f501733d2ff66ef6ca9a Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 15:46:41 +0200
Subject: [PATCH 251/254] Update Italian translations
---
lang/lang_en_it.txt | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index 73e13d40..701588be 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -80,11 +80,11 @@
#MSG_AUTOLOADING_ONLY_IF_FSENS_ON c=20 r=4
"Autoloading filament available only when filament sensor is turned on..."
-"Caricamento auto. filam. disp. solo con il sensore attivo..."
+"Caricamento automatico filamento disponibile solo con il sensore attivo..."
#MSG_AUTOLOADING_ENABLED c=20 r=4
"Autoloading filament is active, just press the knob and insert filament..."
-"Caricamento automatico attivo, premi la manopola e inserisci il filamento."
+"Caricamento automatico attivo, premi la manopola e inserisci il filam."
#MSG_SELFTEST_AXIS_LENGTH c=20
"Axis length"
@@ -172,7 +172,7 @@
#MSG_HOMEYZ_DONE c=20
"Calibration done"
-"Calibrazione completa"
+"Calibr. completa"
#MSG_MENU_CALIBRATION c=18
"Calibration"
@@ -300,7 +300,7 @@
#MSG_SELFTEST_EXTRUDER_FAN_SPEED c=18
"Extruder fan:"
-"Ventola estr:"
+"Ventola estrusore:"
#MSG_INFO_EXTRUDER c=18
"Extruder info"
@@ -404,7 +404,7 @@
#MSG_SELFTEST_FANS c=20
"Front/left fans"
-"Ventola frontale/sinistra"
+"Ventola frontale/sin"
#MSG_SELFTEST_HEATERTHERMISTOR c=20
"Heater/Thermistor"
@@ -588,7 +588,7 @@
#MSG_MESH_BED_LEVELING c=18
"Mesh Bed Leveling"
-"Liv. grilia piano"
+"Liv. griglia piano"
#MSG_MMU_OK_RESUMING_POSITION c=20 r=4
"MMU OK. Resuming position..."
@@ -600,7 +600,7 @@
#MSG_MEASURED_SKEW c=13
"Measured skew"
-"Deviazione mis"
+"Dev. misurata"
#MSG_MMU_FAILS c=15
"MMU fails"
@@ -608,11 +608,11 @@
#MSG_MMU_LOAD_FAILED c=20
"MMU load failed "
-"Caricamento MMU fallito"
+"Caricam. MMU fallito"
#MSG_MMU_LOAD_FAILS c=15
"MMU load fails"
-"Caricamenti MMU falliti"
+"Car MMU falliti"
#MSG_MMU_OK_RESUMING c=20 r=4
"MMU OK. Resuming..."
@@ -632,7 +632,7 @@
#MSG_SILENT c=7
"Silent"
-"Silenzioso"
+"Silenz."
#MSG_MMU_USER_ATTENTION c=20 r=3
"MMU needs user attention."
@@ -644,7 +644,7 @@
#MSG_STEALTH c=7
"Stealth"
-"Silenziosa"
+"Silenz."
#MSG_AUTO_POWER c=10
"Auto power"
@@ -700,7 +700,7 @@
#MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2
"New firmware version available:"
-"Nuova versione firmware disponibile:"
+"Nuova vers. firmware disponibile:"
#MSG_SELFTEST_FAN_NO c=19
"Not spinning"
@@ -728,7 +728,7 @@
#MSG_NOZZLE_FAN c=10
"Nozzle FAN"
-"Ventola estrusore"
+"Vent. estr"
#MSG_PAUSE_PRINT c=18
"Pause print"
@@ -840,7 +840,7 @@
#MSG_POWER_FAILURES c=15
"Power failures"
-"Mancanza corrente"
+"Interr. corr."
#MSG_PRINT_ABORTED c=20
"Print aborted"
@@ -880,7 +880,7 @@
#MSG_PRINT_FAN c=10
"Print FAN"
-"Ventola di stampa"
+"Vent.stamp"
#MSG_WIZARD_LOAD_FILAMENT c=20 r=6
"Please insert filament into the extruder, then press the knob to load it."
@@ -924,7 +924,7 @@
#MSG_CALIBRATE_BED_RESET c=18
"Reset XYZ calibr."
-"Reset calibrazione XYZ."
+"Reset calibr. XYZ."
#MSG_RESET c=14
"Reset"
@@ -964,7 +964,7 @@
#MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=20 r=2
"Searching bed calibration point"
-"Ricerca dei punti di calibrazione del piano"
+"Ricerca punti calibrazione piano"
#MSG_LANGUAGE_SELECT c=18
"Select language"
@@ -1108,7 +1108,7 @@
#MSG_SELECT_FILAMENT c=20
"Select filament:"
-"Seleziona il filamento:"
+"Seleziona il filam.:"
#MSG_TEMP_CALIBRATION c=14
"Temp. cal."
@@ -1172,7 +1172,7 @@
#MSG_UNLOAD_FILAMENT c=16
"Unload filament"
-"Scarica filamento"
+"Scarica filam."
#MSG_UNLOADING_FILAMENT c=20
"Unloading filament"
@@ -1372,7 +1372,7 @@
#MSG_NOZZLE_DIAMETER c=10
"Nozzle d."
-"Diam.Ugello"
+"Dia.Ugello"
#MSG_GCODE_DIFF_CONTINUE c=20 r=4
"G-code sliced for a different level. Continue?"
From 27d7edae10ea4321c986ea1a84b57ae5d81843c0 Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 15:49:19 +0200
Subject: [PATCH 252/254] lang-check: highlight truncated strings
---
lang/lang-check.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 056e13fe..4d08ba58 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -44,7 +44,7 @@ def print_truncated(text, cols):
suffix = ''
else:
prefix = text[0:cols]
- suffix = text[cols:]
+ suffix = color_maybe(31, text[cols:])
print(' |' + prefix + '|' + suffix)
From 201d2a2434c18c191b247b8d36f800b3c1fe00da Mon Sep 17 00:00:00 2001
From: Yuri D'Elia
Date: Fri, 23 Apr 2021 16:15:24 +0200
Subject: [PATCH 253/254] lang-check: handle backslash sequences
---
lang/lang-check.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/lang/lang-check.py b/lang/lang-check.py
index 4d08ba58..bd073e2b 100755
--- a/lang/lang-check.py
+++ b/lang/lang-check.py
@@ -48,6 +48,12 @@ def print_truncated(text, cols):
print(' |' + prefix + '|' + suffix)
+def unescape(text):
+ if '\\' not in text:
+ return text
+ return text.encode('ascii').decode('unicode_escape')
+
+
def parse_txt(lang, no_warning):
"""Parse txt file and check strings to display definition."""
if lang == "en":
@@ -94,6 +100,11 @@ def parse_txt(lang, no_warning):
if translation == '\\x00':
# crude hack to handle intentionally-empty translations
translation = ''
+
+ # handle backslash sequences
+ source = unescape(source)
+ translation = unescape(translation)
+
#print (translation) #Debug
wrapped_source = list(textwrap.TextWrapper(width=cols).wrap(source))
rows_count_source = len(wrapped_source)
From fe32d42101744ad407a2f9b0fafc7c9dcefa17f7 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Fri, 23 Apr 2021 16:19:33 +0200
Subject: [PATCH 254/254] Fix Dutch FINDA translation
---
lang/lang_en_nl.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
index ad070fa1..302ee555 100644
--- a/lang/lang_en_nl.txt
+++ b/lang/lang_en_nl.txt
@@ -1327,7 +1327,7 @@
"Valse triggering"
#MSG_FINDA c=5
-"FINDA:"
+"FINDA"
"\x00"
#MSG_FIRMWARE c=8