Merge branch 'PFW-1189' of github.com:3d-gussner/Prusa-Firmware into …

…PFW-1189
GHF · Apr 29, 2021 · a2326ff · a2326ff
2 parents 0e3d493 + a9ae8ea
commit a2326ff
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 33 deletions.
diff --git a/Firmware/messages.c b/Firmware/messages.c
@@ -125,7 +125,6 @@ const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=18
 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"); ////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
@@ -167,6 +166,7 @@ const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////c=18
 #endif
 
 //not internationalized messages
+const char MSG_AUTO_DEPLETE[] PROGMEM_N1 = ISTR("SpoolJoin"); ////c=13
 const char MSG_FIRMWARE[] PROGMEM_N1 = ISTR("Firmware"); ////c=8
 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY[] PROGMEM_N1 = ISTR("FlashAir"); ////c=8
 const char MSG_PINDA[] PROGMEM_N1 = ISTR("PINDA");////c=5

diff --git a/lang/lang_en.txt b/lang/lang_en.txt
@@ -43,9 +43,6 @@
 #MSG_CONFIRM_CARRIAGE_AT_THE_TOP c=20 r=2
 "Are left and right Z~carriages all up?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 

diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Dojely oba Z voziky k~hornimu dorazu?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "\x00"

diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Sind linke+rechte Z- Schlitten ganz oben?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "Startposition"

diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Carros Z izq./der. estan arriba maximo?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "Llevar al origen"

diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Z~carriages gauche + droite tout en haut?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #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
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "I carrelli Z sin/des sono altezza max?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "Trova origine"

diff --git a/lang/lang_en_nl.txt b/lang/lang_en_nl.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Zijn beide Z wagen heelemaal boven?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "Startpositie"
@@ -232,7 +228,7 @@
 
 #MSG_FS_CONTINUE c=5
 "Cont."
-"\x00"
+"Door."
 
 #MSG_WIZARD_REPEAT_V2_CAL c=20 r=7
 "Do you want to repeat last step to readjust distance between nozzle and heatbed?"

diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
@@ -58,10 +58,6 @@
 "Are left and right Z~carriages all up?"
 "Obydwa konce osi sa na szczycie?"
 
-#MSG_AUTO_DEPLETE c=13
-"SpoolJoin"
-"\x00"
-
 #MSG_AUTO_HOME c=18
 "Auto home"
 "Auto zerowanie"