diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index ada3a3adc..3496a971c 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -627,7 +627,7 @@ void crashdet_cancel()
 		lcd_print_stop();
 	}else if(saved_printing_type == PRINTING_TYPE_USB){
 		SERIAL_ECHOLNPGM("// action:cancel"); //for Octoprint: works the same as clicking "Abort" button in Octoprint GUI
-		SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+		SERIAL_PROTOCOLLNRPGM(MSG_OK);
 	}
 }
 
@@ -1150,12 +1150,12 @@ void setup()
 
 	// Check startup - does nothing if bootloader sets MCUSR to 0
 	byte mcu = MCUSR;
-/*	if (mcu & 1) SERIAL_ECHOLNRPGM(_T(MSG_POWERUP));
+/*	if (mcu & 1) SERIAL_ECHOLNRPGM(MSG_POWERUP);
 	if (mcu & 2) SERIAL_ECHOLNRPGM(MSG_EXTERNAL_RESET);
 	if (mcu & 4) SERIAL_ECHOLNRPGM(MSG_BROWNOUT_RESET);
 	if (mcu & 8) SERIAL_ECHOLNRPGM(MSG_WATCHDOG_RESET);
 	if (mcu & 32) SERIAL_ECHOLNRPGM(MSG_SOFTWARE_RESET);*/
-	if (mcu & 1) puts_P(_T(MSG_POWERUP));
+	if (mcu & 1) puts_P(MSG_POWERUP);
 	if (mcu & 2) puts_P(MSG_EXTERNAL_RESET);
 	if (mcu & 4) puts_P(MSG_BROWNOUT_RESET);
 	if (mcu & 8) puts_P(MSG_WATCHDOG_RESET);
@@ -1168,7 +1168,7 @@ void setup()
 #ifdef STRING_VERSION_CONFIG_H
 #ifdef STRING_CONFIG_H_AUTHOR
 	SERIAL_ECHO_START;
-	SERIAL_ECHORPGM(_i(" Last Updated: "));////MSG_CONFIGURATION_VER c=0 r=0
+	SERIAL_ECHORPGM(_n(" Last Updated: "));////MSG_CONFIGURATION_VER c=0 r=0
 	SERIAL_ECHOPGM(STRING_VERSION_CONFIG_H);
 	SERIAL_ECHORPGM(_n(" | Author: "));////MSG_AUTHOR c=0 r=0
 	SERIAL_ECHOLNPGM(STRING_CONFIG_H_AUTHOR);
@@ -1178,9 +1178,9 @@ void setup()
 #endif
 
 	SERIAL_ECHO_START;
-	SERIAL_ECHORPGM(_i(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0
+	SERIAL_ECHORPGM(_n(" Free Memory: "));////MSG_FREE_MEMORY c=0 r=0
 	SERIAL_ECHO(freeMemory());
-	SERIAL_ECHORPGM(_i("  PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0
+	SERIAL_ECHORPGM(_n("  PlannerBufferBytes: "));////MSG_PLANNER_BUFFER_BYTES c=0 r=0
 	SERIAL_ECHOLN((int)sizeof(block_t)*BLOCK_BUFFER_SIZE);
 	//lcd_update_enable(false); // why do we need this?? - andre
 	// loads data from EEPROM if available else uses defaults (and resets step acceleration rate)
@@ -1744,7 +1744,7 @@ void loop()
           if(card.logging)
             process_commands();
           else
-           SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+           SERIAL_PROTOCOLLNRPGM(MSG_OK);
         } else {
           card.closefile();
           SERIAL_PROTOCOLLNRPGM(MSG_FILE_SAVED);
@@ -3748,7 +3748,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
       codenum = 0;
       if(code_seen('P')) codenum = code_value(); // milliseconds to wait
       if(code_seen('S')) codenum = code_value() * 1000; // seconds to wait
-	  if(codenum != 0) LCD_MESSAGERPGM(_i("Sleep..."));////MSG_DWELL c=0 r=0
+	  if(codenum != 0) LCD_MESSAGERPGM(_n("Sleep..."));////MSG_DWELL c=0 r=0
       st_synchronize();
       codenum += millis();  // keep track of when we started waiting
       previous_millis_cmd = millis();
@@ -4515,7 +4515,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
                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-levelling enforced ..."));
+                    lcd_display_message_fullscreen_P(_i("Some problem encountered, Z-leveling enforced ..."));
 #ifdef TMC2130
                     lcd_wait_for_click_delay(MSG_BED_LEVELING_FAILED_TIMEOUT);
                     calibrate_z_auto();           // Z-leveling (X-assembly stay up!!!)
@@ -5778,54 +5778,54 @@ Sigma_Exit:
       #if defined(X_MIN_PIN) && X_MIN_PIN > -1
         SERIAL_PROTOCOLRPGM(_n("x_min: "));////MSG_X_MIN c=0 r=0
         if(READ(X_MIN_PIN)^X_MIN_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
       #if defined(X_MAX_PIN) && X_MAX_PIN > -1
         SERIAL_PROTOCOLRPGM(_n("x_max: "));////MSG_X_MAX c=0 r=0
         if(READ(X_MAX_PIN)^X_MAX_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
       #if defined(Y_MIN_PIN) && Y_MIN_PIN > -1
         SERIAL_PROTOCOLRPGM(_n("y_min: "));////MSG_Y_MIN c=0 r=0
         if(READ(Y_MIN_PIN)^Y_MIN_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
       #if defined(Y_MAX_PIN) && Y_MAX_PIN > -1
         SERIAL_PROTOCOLRPGM(_n("y_max: "));////MSG_Y_MAX c=0 r=0
         if(READ(Y_MAX_PIN)^Y_MAX_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
       #if defined(Z_MIN_PIN) && Z_MIN_PIN > -1
         SERIAL_PROTOCOLRPGM(MSG_Z_MIN);
         if(READ(Z_MIN_PIN)^Z_MIN_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
       #if defined(Z_MAX_PIN) && Z_MAX_PIN > -1
         SERIAL_PROTOCOLRPGM(MSG_Z_MAX);
         if(READ(Z_MAX_PIN)^Z_MAX_ENDSTOP_INVERTING){
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_HIT));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_HIT);
         }else{
-          SERIAL_PROTOCOLRPGM(_T(MSG_ENDSTOP_OPEN));
+          SERIAL_PROTOCOLRPGM(MSG_ENDSTOP_OPEN);
         }
         SERIAL_PROTOCOLLN("");
       #endif
@@ -5854,7 +5854,7 @@ Sigma_Exit:
           extruder = code_value();
 		  if(extruder >= EXTRUDERS) {
             SERIAL_ECHO_START;
-            SERIAL_ECHO(_i("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0
+            SERIAL_ECHO(_n("M200 Invalid extruder "));////MSG_M200_INVALID_EXTRUDER c=0 r=0
             break;
           }
         }
@@ -6187,7 +6187,7 @@ Sigma_Exit:
           }
         }
         else if (servo_index >= 0) {
-          SERIAL_PROTOCOL(_T(MSG_OK));
+          SERIAL_PROTOCOL(MSG_OK);
           SERIAL_PROTOCOL(" Servo ");
           SERIAL_PROTOCOL(servo_index);
           SERIAL_PROTOCOL(": ");
@@ -6232,7 +6232,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         #endif
 
         updatePID();
-        SERIAL_PROTOCOLRPGM(_T(MSG_OK));
+        SERIAL_PROTOCOLRPGM(MSG_OK);
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(cs.Kp);
         SERIAL_PROTOCOL(" i:");
@@ -6256,7 +6256,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         if(code_seen('D')) cs.bedKd = scalePID_d(code_value());
 
         updatePID();
-       	SERIAL_PROTOCOLRPGM(_T(MSG_OK));
+       	SERIAL_PROTOCOLRPGM(MSG_OK);
         SERIAL_PROTOCOL(" p:");
         SERIAL_PROTOCOL(cs.bedKp);
         SERIAL_PROTOCOL(" i:");
@@ -6388,7 +6388,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
         {
           cs.zprobe_zoffset = -value; // compare w/ line 278 of ConfigurationStore.cpp
           SERIAL_ECHO_START;
-          SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", _T(MSG_OK),PSTR("")));
+          SERIAL_ECHOLNRPGM(CAT4(MSG_ZPROBE_ZOFFSET, " ", MSG_OK,PSTR("")));
           SERIAL_PROTOCOLLN("");
         }
         else
@@ -6542,7 +6542,7 @@ if((eSoundMode==e_SOUND_MODE_LOUD)||(eSoundMode==e_SOUND_MODE_ONCE))
 			manage_inactivity();
 			lcd_update(0);
 		}
-		LCD_MESSAGERPGM(_T(MSG_OK));
+		LCD_MESSAGERPGM(MSG_OK);
 
 		break;
 	}
@@ -7078,7 +7078,7 @@ void FlushSerialRequestResend()
 {
   //char cmdbuffer[bufindr][100]="Resend:";
   MYSERIAL.flush();
-  printf_P(_N("%S: %ld\n%S\n"), _i("Resend"), gcode_LastN + 1, _T(MSG_OK));
+  printf_P(_N("%S: %ld\n%S\n"), _n("Resend"), gcode_LastN + 1, MSG_OK);
 }
 
 // Confirm the execution of a command, if sent from a serial line.
@@ -7087,7 +7087,7 @@ void ClearToSend()
 {
     previous_millis_cmd = millis();
 	if ((CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) || (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB_WITH_LINENR)) 
-		SERIAL_PROTOCOLLNRPGM(_T(MSG_OK));
+		SERIAL_PROTOCOLLNRPGM(MSG_OK);
 }
 
 #if MOTHERBOARD == BOARD_RAMBO_MINI_1_0 || MOTHERBOARD == BOARD_RAMBO_MINI_1_3
@@ -7548,12 +7548,12 @@ void kill(const char *full_screen_message, unsigned char id)
   pinMode(PS_ON_PIN,INPUT);
 #endif
   SERIAL_ERROR_START;
-  SERIAL_ERRORLNRPGM(_i("Printer halted. kill() called!"));////MSG_ERR_KILLED c=0 r=0
+  SERIAL_ERRORLNRPGM(_n("Printer halted. kill() called!"));////MSG_ERR_KILLED c=0 r=0
   if (full_screen_message != NULL) {
       SERIAL_ERRORLNRPGM(full_screen_message);
       lcd_display_message_fullscreen_P(full_screen_message);
   } else {
-      LCD_ALERTMESSAGERPGM(_i("KILLED. "));////MSG_KILLED c=0 r=0
+      LCD_ALERTMESSAGERPGM(_n("KILLED. "));////MSG_KILLED c=0 r=0
   }
 
   // FMC small patch to update the LCD before ending
@@ -7581,7 +7581,7 @@ void Stop()
     Stopped = true;
     Stopped_gcode_LastN = gcode_LastN; // Save last g_code for restart
     SERIAL_ERROR_START;
-    SERIAL_ERRORLNRPGM(_T(MSG_ERR_STOPPED));
+    SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED);
     LCD_MESSAGERPGM(_T(MSG_STOPPED));
   }
 }
@@ -7676,19 +7676,19 @@ bool setTargetedHotend(int code, uint8_t &extruder)
       SERIAL_ECHO_START;
       switch(code){
         case 104:
-          SERIAL_ECHORPGM(_i("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0
+          SERIAL_ECHORPGM(_n("M104 Invalid extruder "));////MSG_M104_INVALID_EXTRUDER c=0 r=0
           break;
         case 105:
-          SERIAL_ECHO(_i("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0
+          SERIAL_ECHO(_n("M105 Invalid extruder "));////MSG_M105_INVALID_EXTRUDER c=0 r=0
           break;
         case 109:
-          SERIAL_ECHO(_i("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0
+          SERIAL_ECHO(_n("M109 Invalid extruder "));////MSG_M109_INVALID_EXTRUDER c=0 r=0
           break;
         case 218:
-          SERIAL_ECHO(_i("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0
+          SERIAL_ECHO(_n("M218 Invalid extruder "));////MSG_M218_INVALID_EXTRUDER c=0 r=0
           break;
         case 221:
-          SERIAL_ECHO(_i("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0
+          SERIAL_ECHO(_n("M221 Invalid extruder "));////MSG_M221_INVALID_EXTRUDER c=0 r=0
           break;
       }
       SERIAL_PROTOCOLLN((int)extruder);
diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp
index eac738c85..9cac64887 100644
--- a/Firmware/cardreader.cpp
+++ b/Firmware/cardreader.cpp
@@ -183,23 +183,23 @@ void CardReader::initsd()
   {
     //if (!card.init(SPI_HALF_SPEED,SDSS))
     SERIAL_ECHO_START;
-    SERIAL_ECHOLNRPGM(_i("SD init fail"));////MSG_SD_INIT_FAIL c=0 r=0
+    SERIAL_ECHOLNRPGM(_n("SD init fail"));////MSG_SD_INIT_FAIL c=0 r=0
   }
   else if (!volume.init(&card))
   {
     SERIAL_ERROR_START;
-    SERIAL_ERRORLNRPGM(_i("volume.init failed"));////MSG_SD_VOL_INIT_FAIL c=0 r=0
+    SERIAL_ERRORLNRPGM(_n("volume.init failed"));////MSG_SD_VOL_INIT_FAIL c=0 r=0
   }
   else if (!root.openRoot(&volume)) 
   {
     SERIAL_ERROR_START;
-    SERIAL_ERRORLNRPGM(_i("openRoot failed"));////MSG_SD_OPENROOT_FAIL c=0 r=0
+    SERIAL_ERRORLNRPGM(_n("openRoot failed"));////MSG_SD_OPENROOT_FAIL c=0 r=0
   }
   else 
   {
     cardOK = true;
     SERIAL_ECHO_START;
-    SERIAL_ECHOLNRPGM(_i("SD card ok"));////MSG_SD_CARD_OK c=0 r=0
+    SERIAL_ECHOLNRPGM(_n("SD card ok"));////MSG_SD_CARD_OK c=0 r=0
   }
   workDir=root;
   curDir=&root;
@@ -330,7 +330,7 @@ void CardReader::diveSubfolder (const char *fileName, SdFile& dir)
                 SERIAL_ECHOLN(subdirname);
                 if (!dir.open(curDir, subdirname, O_READ))
                 {
-                    SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL));
+                    SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
                     SERIAL_PROTOCOL(subdirname);
                     SERIAL_PROTOCOLLNPGM(".");
                     return;
@@ -431,7 +431,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
     }
     else
     {
-      SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL));
+      SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
       SERIAL_PROTOCOL(fname);
       SERIAL_PROTOCOLLNPGM(".");
     }
@@ -440,7 +440,7 @@ void CardReader::openFile(const char* name,bool read, bool replace_current/*=tru
   { //write
     if (!file.open(curDir, fname, O_CREAT | O_APPEND | O_WRITE | O_TRUNC))
     {
-      SERIAL_PROTOCOLRPGM(_T(MSG_SD_OPEN_FILE_FAIL));
+      SERIAL_PROTOCOLRPGM(MSG_SD_OPEN_FILE_FAIL);
       SERIAL_PROTOCOL(fname);
       SERIAL_PROTOCOLLNPGM(".");
     }
@@ -532,7 +532,7 @@ void CardReader::write_command(char *buf)
   if (file.writeError)
   {
     SERIAL_ERROR_START;
-    SERIAL_ERRORLNRPGM(_T(MSG_SD_ERR_WRITE_TO_FILE));
+    SERIAL_ERRORLNRPGM(MSG_SD_ERR_WRITE_TO_FILE);
   }
 }
 
@@ -544,7 +544,7 @@ void CardReader::write_command_no_newline(char *buf)
   if (file.writeError)
   {
     SERIAL_ERROR_START;
-    SERIAL_ERRORLNRPGM(_T(MSG_SD_ERR_WRITE_TO_FILE));
+    SERIAL_ERRORLNRPGM(MSG_SD_ERR_WRITE_TO_FILE);
     MYSERIAL.println("An error while writing to the SD Card.");
   }
 }
@@ -659,7 +659,7 @@ void CardReader::chdir(const char * relpath)
   if(!newfile.open(*parent,relpath, O_READ))
   {
    SERIAL_ECHO_START;
-   SERIAL_ECHORPGM(_i("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
+   SERIAL_ECHORPGM(_n("Cannot enter subdir: "));////MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
    SERIAL_ECHOLN(relpath);
   }
   else
diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp
index 6bb7e42f6..a78d9f12f 100644
--- a/Firmware/cmdqueue.cpp
+++ b/Firmware/cmdqueue.cpp
@@ -286,7 +286,7 @@ void enquecommand(const char *cmd, bool from_progmem)
         else
             strcpy(cmdbuffer + bufindw + CMDHDRSIZE, cmd);
         SERIAL_ECHO_START;
-        SERIAL_ECHORPGM(_T(MSG_Enqueing));
+        SERIAL_ECHORPGM(MSG_Enqueing);
         SERIAL_ECHO(cmdbuffer + bufindw + CMDHDRSIZE);
         SERIAL_ECHOLNPGM("\"");
         bufindw += len + (CMDHDRSIZE + 1);
@@ -298,7 +298,7 @@ void enquecommand(const char *cmd, bool from_progmem)
 #endif /* CMDBUFFER_DEBUG */
     } else {
         SERIAL_ERROR_START;
-        SERIAL_ECHORPGM(_T(MSG_Enqueing));
+        SERIAL_ECHORPGM(MSG_Enqueing);
         if (from_progmem)
             SERIAL_PROTOCOLRPGM(cmd);
         else
@@ -441,7 +441,7 @@ void get_command()
 					  checksum = checksum^(*p++);
 				  if (int(strtol(strchr_pointer+1, NULL, 10)) != int(checksum)) {
 					  SERIAL_ERROR_START;
-					  SERIAL_ERRORRPGM(_i("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
+					  SERIAL_ERRORRPGM(_n("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
 					  SERIAL_ERRORLN(gcode_LastN);
 					  FlushSerialRequestResend();
 					  serial_count = 0;
@@ -453,7 +453,7 @@ void get_command()
 			  else
 			  {
 				  SERIAL_ERROR_START;
-				  SERIAL_ERRORRPGM(_i("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM c=0 r=0
+				  SERIAL_ERRORRPGM(_n("No Checksum with line number, Last Line: "));////MSG_ERR_NO_CHECKSUM c=0 r=0
 				  SERIAL_ERRORLN(gcode_LastN);
 				  FlushSerialRequestResend();
 				  serial_count = 0;
@@ -484,7 +484,7 @@ void get_command()
             if (Stopped == true) {
                 int gcode = strtol(strchr_pointer+1, NULL, 10);
                 if (gcode >= 0 && gcode <= 3) {
-                    SERIAL_ERRORLNRPGM(_T(MSG_ERR_STOPPED));
+                    SERIAL_ERRORLNRPGM(MSG_ERR_STOPPED);
                     LCD_MESSAGERPGM(_T(MSG_STOPPED));
                 }
             }
diff --git a/Firmware/messages.c b/Firmware/messages.c
index 1be1dc491..4cac4f2d0 100644
--- a/Firmware/messages.c
+++ b/Firmware/messages.c
@@ -25,11 +25,6 @@ const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r
 const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det.  [N/A]"); ////c=0 r=0
 const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det.  [off]"); ////c=0 r=0
 const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det.   [on]"); ////c=0 r=0
-const char MSG_ENDSTOP_HIT[] PROGMEM_I1 = ISTR("TRIGGERED"); ////c=0 r=0
-const char MSG_ENDSTOP_OPEN[] PROGMEM_I1 = ISTR("open"); ////c=0 r=0
-const char MSG_ENDSTOPS_HIT[] PROGMEM_I1 = ISTR("endstops hit: "); ////c=0 r=0
-const char MSG_Enqueing[] PROGMEM_I1 = ISTR("enqueing \""); ////c=0 r=0
-const char MSG_ERR_STOPPED[] PROGMEM_I1 = ISTR("Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"); ////c=0 r=0
 const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////c=0 r=0
 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1
@@ -62,11 +57,9 @@ const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[] PROGMEM_I1 = ISTR(" of 9");
 const char MSG_MENU_CALIBRATION[] PROGMEM_I1 = ISTR("Calibration"); ////c=0 r=0
 const char MSG_NO[] PROGMEM_I1 = ISTR("No"); ////c=0 r=0
 const char MSG_NOZZLE[] PROGMEM_I1 = ISTR("Nozzle"); ////c=0 r=0
-const char MSG_OK[] PROGMEM_I1 = ISTR("ok"); ////c=0 r=0
 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=8
 const char MSG_PLACE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please place steel sheet on heatbed."); ////c=20 r=4
 const char MSG_PLEASE_WAIT[] PROGMEM_I1 = ISTR("Please wait"); ////c=20 r=0
-const char MSG_POWERUP[] PROGMEM_I1 = ISTR("PowerUp"); ////c=0 r=0
 const char MSG_PREHEAT_NOZZLE[] PROGMEM_I1 = ISTR("Preheat the nozzle!"); ////c=20 r=0
 const char MSG_PRESS_TO_UNLOAD[] PROGMEM_I1 = ISTR("Please press the knob to unload filament"); ////c=20 r=4
 const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 r=0
@@ -75,8 +68,6 @@ const char MSG_RECOVER_PRINT[] PROGMEM_I1 = ISTR("Blackout occurred. Recover pri
 const char MSG_REFRESH[] PROGMEM_I1 = ISTR("\xF8" "Refresh"); ////c=0 r=0
 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////c=0 r=0
 const char MSG_REMOVE_STEEL_SHEET[] PROGMEM_I1 = ISTR("Please remove steel sheet from heatbed."); ////c=20 r=4
-const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_I1 = ISTR("error writing to file"); ////c=0 r=0
-const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_I1 = ISTR("open failed, File: "); ////c=0 r=0
 const char MSG_SELFTEST_COOLING_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////c=20 r=0
 const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////c=20 r=0
 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed  "); ////c=20 r=0
@@ -122,3 +113,12 @@ const char MSG_Z_MIN[] PROGMEM_N1 = "z_min: "; ////c=0 r=0
 const char MSG_ZPROBE_OUT[] PROGMEM_N1 = "Z probe out. bed"; ////c=0 r=0
 const char MSG_ZPROBE_ZOFFSET[] PROGMEM_N1 = "Z Offset"; ////c=0 r=0
 const char MSG_TMC_OVERTEMP[] PROGMEM_N1 = "TMC DRIVER OVERTEMP"; ////c=0 r=0
+const char MSG_Enqueing[] PROGMEM_N1 = "enqueing \""; ////c=0 r=0
+const char MSG_ENDSTOPS_HIT[] PROGMEM_N1 = "endstops hit: "; ////c=0 r=0
+const char MSG_SD_ERR_WRITE_TO_FILE[] PROGMEM_N1 = "error writing to file"; ////c=0 r=0
+const char MSG_OK[] PROGMEM_N1 = "ok"; ////c=0 r=0
+const char MSG_SD_OPEN_FILE_FAIL[] PROGMEM_N1 = "open failed, File: "; ////c=0 r=0
+const char MSG_ENDSTOP_OPEN[] PROGMEM_N1 = "open"; ////c=0 r=0
+const char MSG_POWERUP[] PROGMEM_N1 = "PowerUp"; ////c=0 r=0
+const char MSG_ERR_STOPPED[] PROGMEM_N1 = "Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"; ////c=0 r=0
+const char MSG_ENDSTOP_HIT[] PROGMEM_N1 = "TRIGGERED"; ////c=0 r=0
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 3b8ca18bf..ce6ecdd74 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -26,11 +26,6 @@ extern const char MSG_CRASH_DETECTED[];
 extern const char MSG_CRASHDETECT_NA[];
 extern const char MSG_CRASHDETECT_OFF[];
 extern const char MSG_CRASHDETECT_ON[];
-extern const char MSG_ENDSTOP_HIT[];
-extern const char MSG_ENDSTOP_OPEN[];
-extern const char MSG_ENDSTOPS_HIT[];
-extern const char MSG_Enqueing[];
-extern const char MSG_ERR_STOPPED[];
 extern const char MSG_ERROR[];
 extern const char MSG_EXTRUDER[];
 extern const char MSG_FILAMENT[];
@@ -63,11 +58,9 @@ extern const char MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2[];
 extern const char MSG_MENU_CALIBRATION[];
 extern const char MSG_NO[];
 extern const char MSG_NOZZLE[];
-extern const char MSG_OK[];
 extern const char MSG_PAPER[];
 extern const char MSG_PLACE_STEEL_SHEET[];
 extern const char MSG_PLEASE_WAIT[];
-extern const char MSG_POWERUP[];
 extern const char MSG_PREHEAT_NOZZLE[];
 extern const char MSG_PRESS_TO_UNLOAD[];
 extern const char MSG_PRINT_ABORTED[];
@@ -76,8 +69,6 @@ extern const char MSG_RECOVER_PRINT[];
 extern const char MSG_REFRESH[];
 extern const char MSG_REMOVE_STEEL_SHEET[];
 extern const char MSG_RESUMING_PRINT[];
-extern const char MSG_SD_ERR_WRITE_TO_FILE[];
-extern const char MSG_SD_OPEN_FILE_FAIL[];
 extern const char MSG_SD_WORKDIR_FAIL[];
 extern const char MSG_SELFTEST_COOLING_FAN[];
 extern const char MSG_SELFTEST_EXTRUDER_FAN[];
@@ -123,6 +114,15 @@ extern const char MSG_Z_MIN[];
 extern const char MSG_ZPROBE_OUT[];
 extern const char MSG_ZPROBE_ZOFFSET[];
 extern const char MSG_TMC_OVERTEMP[];
+extern const char MSG_Enqueing[];
+extern const char MSG_ENDSTOPS_HIT[];
+extern const char MSG_SD_ERR_WRITE_TO_FILE[];
+extern const char MSG_OK[];
+extern const char MSG_SD_OPEN_FILE_FAIL[];
+extern const char MSG_ENDSTOP_OPEN[];
+extern const char MSG_POWERUP[];
+extern const char MSG_ERR_STOPPED[];
+extern const char MSG_ENDSTOP_HIT[];
 
 #if defined(__cplusplus)
 }
diff --git a/Firmware/planner.cpp b/Firmware/planner.cpp
index c465c938a..fead3ffc9 100644
--- a/Firmware/planner.cpp
+++ b/Firmware/planner.cpp
@@ -758,7 +758,7 @@ void plan_buffer_line(float x, float y, float z, const float &e, float feed_rate
       de_float = 0;
 #endif
       SERIAL_ECHO_START;
-      SERIAL_ECHOLNRPGM(_i(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
+      SERIAL_ECHOLNRPGM(_n(" cold extrusion prevented"));////MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
     }
     
     #ifdef PREVENT_LENGTHY_EXTRUDE
diff --git a/Firmware/stepper.cpp b/Firmware/stepper.cpp
index cba50f77f..589a7b079 100644
--- a/Firmware/stepper.cpp
+++ b/Firmware/stepper.cpp
@@ -228,18 +228,18 @@ void checkHitEndstops()
 {
  if( endstop_x_hit || endstop_y_hit || endstop_z_hit) {
    SERIAL_ECHO_START;
-   SERIAL_ECHORPGM(_T(MSG_ENDSTOPS_HIT));
+   SERIAL_ECHORPGM(MSG_ENDSTOPS_HIT);
    if(endstop_x_hit) {
      SERIAL_ECHOPAIR(" X:",(float)endstops_trigsteps[X_AXIS]/cs.axis_steps_per_unit[X_AXIS]);
-//     LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("X")));
+//     LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("X")));
    }
    if(endstop_y_hit) {
      SERIAL_ECHOPAIR(" Y:",(float)endstops_trigsteps[Y_AXIS]/cs.axis_steps_per_unit[Y_AXIS]);
-//     LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT), PSTR("Y")));
+//     LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT), PSTR("Y")));
    }
    if(endstop_z_hit) {
      SERIAL_ECHOPAIR(" Z:",(float)endstops_trigsteps[Z_AXIS]/cs.axis_steps_per_unit[Z_AXIS]);
-//     LCD_MESSAGERPGM(CAT2(_T(MSG_ENDSTOPS_HIT),PSTR("Z")));
+//     LCD_MESSAGERPGM(CAT2((MSG_ENDSTOPS_HIT),PSTR("Z")));
    }
    SERIAL_ECHOLN("");
    endstop_x_hit=false;
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 90ab90b80..8e50ead59 100644
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4106,7 +4106,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 from XFLASH?"), false, true))
+		if (lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Copy selected language?"), false, true))
 			lang_boot_update_start(lang);
 		lcd_update_enable(true);
 		lcd_clear();
@@ -4700,15 +4700,15 @@ static bool settingsAutoDeplete()
     {
         if (!fsensor_enabled)
         {
-            if (menu_item_text_P(_i("Auto deplete[N/A]"))) return true;
+            if (menu_item_text_P(_i("SpoolJoin   [N/A]"))) return true;
         }
         else if (lcd_autoDeplete)
         {
-            if (menu_item_function_P(_i("Auto deplete [on]"), auto_deplete_switch)) return true;
+            if (menu_item_function_P(_i("SpoolJoin    [on]"), auto_deplete_switch)) return true;
         }
         else
         {
-            if (menu_item_function_P(_i("Auto deplete[off]"), auto_deplete_switch)) return true;
+            if (menu_item_function_P(_i("SpoolJoin   [off]"), auto_deplete_switch)) return true;
         }
     }
     return false;
diff --git a/lang/lang_en.txt b/lang/lang_en.txt
index f2abe378a..a46ee8365 100644
--- a/lang/lang_en.txt
+++ b/lang/lang_en.txt
@@ -1,15 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 
@@ -44,13 +32,13 @@
 "Are left and right Z~carriages all up?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
+"SpoolJoin    [on]"
 
 #
-"Auto deplete[N/A]"
+"SpoolJoin   [N/A]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
+"SpoolJoin   [off]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -127,9 +115,6 @@
 #
 "Cancel"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 
@@ -143,7 +128,7 @@
 "Cooldown"
 
 #
-"Copy selected language from XFLASH?"
+"Copy selected language?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -211,21 +196,12 @@
 #MSG_SELFTEST_ENDSTOP c=0 r=0
 "Endstop"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 
@@ -394,9 +370,6 @@
 #MSG_SELFTEST_CHECK_Z c=20 r=0
 "Checking Z axis  "
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 
@@ -460,9 +433,6 @@
 #
 "Last print"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 
@@ -490,30 +460,12 @@
 #MSG_LOOSE_PULLEY c=20 r=1
 "Loose pulley"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-
 #
 "Load to nozzle"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-
 #MSG_MAIN c=0 r=0
 "Main"
 
@@ -571,9 +523,6 @@
 #MSG_MOVE_Z c=0 r=0
 "Move Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 
@@ -604,27 +553,15 @@
 #MSG_NOZZLE c=0 r=0
 "Nozzle"
 
-#MSG_OK c=0 r=0
-"ok"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-
 #
 "Now remove the test print from steel sheet."
 
 #
 "Nozzle FAN"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 
@@ -691,9 +628,6 @@
 #MSG_PLEASE_WAIT c=20 r=0
 "Please wait"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-
 #
 "Please remove shipping helpers first."
 
@@ -727,9 +661,6 @@
 #MSG_PRINT_PAUSED c=20 r=1
 "Print paused"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-
 #
 "Press the knob to resume nozzle temperature."
 
@@ -739,9 +670,6 @@
 #
 "Print FAN"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 
@@ -781,9 +709,6 @@
 #MSG_SECOND_SERIAL_ON c=17 r=1
 "RPi port     [on]"
 
-#
-"Resend"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 
@@ -796,15 +721,9 @@
 #MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1
 "SD card [flshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-
 #
 "Right"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 
@@ -847,9 +766,6 @@
 #
 "Show pinda state"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-
 #MSG_FILE_CNT c=20 r=4
 "Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
 
@@ -880,9 +796,6 @@
 #
 "Some problem encountered, Z-leveling enforced ..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 
@@ -946,9 +859,6 @@
 #
 "Total print time"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 
@@ -979,9 +889,6 @@
 #
 "unknown"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 
diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt
index 43b95bfc2..911169060 100644
--- a/lang/lang_en_cz.txt
+++ b/lang/lang_en_cz.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-" PlannerBufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-"zabraneno extruzi za studena"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-"Volna pamet: "
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-"Naposledy aktualizovano:"
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 " z 4"
@@ -59,16 +43,16 @@
 "Dojely oba Z voziky k~hornimu dorazu?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Spoj Civky  [zap]"
+"SpoolJoin    [on]"
+"SpoolJoin   [zap]"
 
 #
-"Auto deplete[N/A]"
-"Spoj Civky  [N/A]"
+"SpoolJoin   [N/A]"
+"SpoolJoin   [N/A]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Spoj Civky  [vyp]"
+"SpoolJoin   [off]"
+"SpoolJoin   [vyp]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Zrusit"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Nelze otevrit slozku:"
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "Karta vlozena"
@@ -191,8 +171,8 @@
 "Zchladit"
 
 #
-"Copy selected language from XFLASH?"
-"Kopirovat vybrany jazyk do XFLASH?"
+"Copy selected language?"
+"Kopirovat vybrany jazyk?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -282,26 +262,14 @@
 "Endstop"
 "Koncovy spinac"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"konc. spinace aktivovany: "
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "Konc. spinace"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Chyba - Doslo k prepisu staticke pameti!"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"chyba zapisu do souboru"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Kontrola osy Z"
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"neplatny kontrolni soucet, posl. radek:"
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Vyberte extruder:"
@@ -614,10 +578,6 @@
 "Last print"
 "\x00"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"ZRUSENO."
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Levy vent na trysce?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Uvolnena remenicka"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 Neplatny extruder "
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 Neplatny extruder "
-
 #
 "Load to nozzle"
 "Zavest do trysky"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 Neplatny extruder "
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Kal. prvni vrstvy"
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 Neplatny extruder "
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 Neplatny extruder "
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 Neplatny extruder "
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Hlavni nabidka"
@@ -762,10 +698,6 @@
 "Move Z"
 "Posunout Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Zadny kontrolni soucet s cislem radku, Posl. radek:"
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Bez pohybu."
@@ -806,22 +738,10 @@
 "Nozzle"
 "Tryska"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Neplatne hodnoty nastaveni. Bude pouzito vychozi PID, Esteps atd."
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"nelze otevrit, Soubor: "
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"otevrit"
-
 #
 "Now remove the test print from steel sheet."
 "Nyni odstrante testovaci vytisk z tiskoveho platu."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "\x00"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"openRoot selhal"
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Pozastavit tisk"
@@ -922,10 +838,6 @@
 "Please wait"
 "Prosim cekejte"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Zapnuti"
-
 #
 "Please remove shipping helpers first."
 "Nejprve prosim sundejte transportni soucastky."
@@ -970,10 +882,6 @@
 "Print paused"
 "Tisk pozastaven"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Tiskarna zastavena. Volano kill()!"
-
 #
 "Press the knob to resume nozzle temperature."
 "Pro pokracovani nahrivani trysky stisknete tlacitko."
@@ -986,10 +894,6 @@
 "Print FAN"
 "\x00"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"Tisk zastaven kvuli chybam. Opravte chybu a pouzijte M999 pro restart. (Teplota resetovana, nastavte ji po restartu)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "Prusa i3 MK2.5 ok."
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "RPi port    [zap]"
 
-#
-"Resend"
-"Poslat znovu"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "RPi port    [vyp]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "SD card [FlshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"SD karta ok"
-
 #
 "Right"
 "Vpravo"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"Selhala inicializace SD"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Hledam kalibracni bod podlozky"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Zobrazit stav PINDA"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"Spankovy rezim..."
-
 #MSG_FILE_CNT c=20 r=4
 "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."
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Vyskytl se problem, srovnavam osu Z ..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Zvuk     [jednou]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Celkovy cas tisku"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"AKTIVNI"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Ladit"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"volume.init selhalo"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Ceka se na uzivatele..."
diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt
index 5c5de386e..b72760631 100644
--- a/lang/lang_en_de.txt
+++ b/lang/lang_en_de.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-" PlannerPufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-" stopp, Extruder kalt!"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-" Freier Speicher: "
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-" Letztes Update: "
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 " von 4"
@@ -59,16 +43,16 @@
 "Sind linke+rechte Z- Schlitten ganz oben?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Restemodus   [an]"
+"SpoolJoin    [on]"
+"SpoolJoin    [an]"
 
 #
-"Auto deplete[N/A]"
-"Restemodus  [N/V]"
+"SpoolJoin   [N/A]"
+"SpoolJoin   [N/V]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Restemodus  [aus]"
+"SpoolJoin   [off]"
+"SpoolJoin   [aus]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Abbruch"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Kann Unterverzeichnis nicht oeffnen: "
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "SD Karte eingesetzt"
@@ -191,8 +171,8 @@
 "Abkuehlen"
 
 #
-"Copy selected language from XFLASH?"
-"Gewaehlte Sprache vom Xflash kopieren?"
+"Copy selected language?"
+"Gewaehlte Sprache kopieren?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -282,26 +262,14 @@
 "Endstop"
 "Endanschlag"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"Endanschlag erreicht: "
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "Endschalter"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Fehler - statischer Speicher wurde ueberschrieben"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"Fehler beim Schreiben in Datei"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "FEHLER: Filament- sensor reagiert nicht, bitte Verbindung pruefen."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Pruefe Z Achse "
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"Pruefsummenfehler, Letzte Zeile: "
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Extruder waehlen:"
@@ -614,10 +578,6 @@
 "Last print"
 "\x00"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"ABGEBROCHEN. "
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Linker Luefter?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Lose Riemenscheibe"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 Falscher Extruder "
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 Falscher Extruder "
-
 #
 "Load to nozzle"
 "In Druckduese laden"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 Falscher Extruder "
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Erste-Schicht Kal."
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 Falscher Extruder "
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 Falscher Extruder "
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 Falscher Extruder "
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Hauptmenue"
@@ -762,10 +698,6 @@
 "Move Z"
 "Bewege Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Keine Pruefsumme mit Zeilennummer, Letzte Zeile: "
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Keine Bewegung."
@@ -806,22 +738,10 @@
 "Nozzle"
 "Duese"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Alte Einstellungen gefunden. Standard PID, E-Steps u.s.w. werden gesetzt."
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"Fehler beim Oeffnen der Datei: "
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"offen"
-
 #
 "Now remove the test print from steel sheet."
 "Testdruck jetzt von Stahlblech entfernen."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "\x00"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"Zugriff auf Hauptverzeichnis misslungen"
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Druck pausieren"
@@ -922,10 +838,6 @@
 "Please wait"
 "Bitte warten"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Einschalten"
-
 #
 "Please remove shipping helpers first."
 "Bitte zuerst Transportsicherungen entfernen."
@@ -970,10 +882,6 @@
 "Print paused"
 "Druck pausiert"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Printer gestoppt. kill() aufgerufen!"
-
 #
 "Press the knob to resume nozzle temperature."
 "Druecken Sie den Knopf um die Duesentemperatur wiederherzustellen"
@@ -986,10 +894,6 @@
 "Print FAN"
 "\x00"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"Drucker aufgrund von Fehlern gestoppt. Fehler beheben und mit M999 neu starten. (Temperatur wird zurueckgesetzt. Nach dem Neustart neu einstellen!)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "Prusa i3 MK2.5 bereit."
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "RPi Port     [an]"
 
-#
-"Resend"
-"Wiederholen"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "RPi Port    [aus]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "SD Karte[flshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"SD Karte ok"
-
 #
 "Right"
 "Rechts"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"SD Init fehlerhaft"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Suche Bett Kalibrierpunkt"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Pinda-Status anzeigen"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"Schlafzustand..."
-
 #MSG_FILE_CNT c=20 r=4
 "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."
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Fehler aufgetreten, Z-Kalibrierung erforderlich..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Sound    [einmal]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Gesamte Druckzeit"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"AUSGELOEST"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Feineinstellung"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"Dateisystem Init fehlerhaft"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Warte auf Benutzer.."
diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt
index 26e7a388b..9f7b12d32 100644
--- a/lang/lang_en_es.txt
+++ b/lang/lang_en_es.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-" PlannerBufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-"extrusion en frio prevenida"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-"Memoria Libre: "
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-"Ultima actualizacion: "
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 " de 4"
@@ -59,16 +43,16 @@
 "Carros Z izq./der. estan arriba maximo?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Auto despleg.[on]"
+"SpoolJoin    [on]"
+"SpoolJoin    [on]"
 
 #
-"Auto deplete[N/A]"
-"Auto despleg[N/A]"
+"SpoolJoin   [N/A]"
+"SpoolJoin   [N/A]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Auto despleg[off]"
+"SpoolJoin   [off]"
+"SpoolJoin   [off]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Cancelar"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Sin acceso subdir: "
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "Tarjeta insertada"
@@ -191,8 +171,8 @@
 "Enfriar"
 
 #
-"Copy selected language from XFLASH?"
-"Copiar idioma seleccionado desde XFLASH?"
+"Copy selected language?"
+"Copiar idioma seleccionado?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -282,26 +262,14 @@
 "Endstop"
 "\x00"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"endstops golpean: "
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "\x00"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Error - se ha sobre-escrito la memoria estatica"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"error al escribir arch."
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "ERROR: El sensor de filamento no responde, por favor comprueba la conexion."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Control sensor Z"
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"inconcluencia checksum, Ult. Linea: "
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Elegir extrusor:"
@@ -614,10 +578,6 @@
 "Last print"
 "\x00"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"PARADA DE EMERGENCIA"
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Vent. izquierdo?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Polea suelta"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 Extrusor invalido"
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 Extrusor invalido"
-
 #
 "Load to nozzle"
 "Cargar a la boquilla"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 Extrusor invalido"
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Cal. primera cap."
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 Extrusor invalido"
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 Extrusor invalido"
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 Extrusor invalido"
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Menu principal"
@@ -762,10 +698,6 @@
 "Move Z"
 "Mover Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Sin Checksum con linea numero, Ult. Linea: "
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Sin movimiento"
@@ -806,22 +738,10 @@
 "Nozzle"
 "Boquilla"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Se han encontrado ajustes anteriores. Se ajustara el PID, los pasos del extrusor, etc"
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"error apertura, Arch.: "
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"abrir"
-
 #
 "Now remove the test print from steel sheet."
 "Ahora retira la prueba de la lamina de acero."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "\x00"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"fallo openRoot "
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Pausar impresion"
@@ -922,10 +838,6 @@
 "Please wait"
 "Por Favor Espere"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Encendido"
-
 #
 "Please remove shipping helpers first."
 "Por favor retira los soportes de envio primero."
@@ -970,10 +882,6 @@
 "Print paused"
 "Impresion en pausa"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Impresora detenida. kill() activado!"
-
 #
 "Press the knob to resume nozzle temperature."
 "Presiona el dial para continuar con la temperatura de la boquilla."
@@ -986,10 +894,6 @@
 "Print FAN"
 "\x00"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"Impresora parada debido a errores. Arregle el error y use M999 para reinicio. (Temperatura se resetea. Ajustar despues de reinicio)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "Preparado para Prusa i3 MK2.5."
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "Puerto RPi  [act]"
 
-#
-"Resend"
-"Reenviar: "
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "Puerto RPi  [ina]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "Tarj. SD[FlshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"Tarj. SD ok"
-
 #
 "Right"
 "Derecha"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"Error init SD"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Buscando punto de calibracion base"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Mostrar estado pinda"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"En reposo..."
-
 #MSG_FILE_CNT c=20 r=4
 "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. "
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Problema encontrado, nivelacion Z forzosa ..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Sonido  [una vez]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Tiempo total :"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"ACTIVADO"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Ajustar"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"fallo volume.init"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Esperando ordenes"
diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt
index bc58ea2ae..5a4eef388 100644
--- a/lang/lang_en_fr.txt
+++ b/lang/lang_en_fr.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-"  PlannerBufferBytes : "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-"extrusion a froid evitee"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-"Memoire libre :"
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-"Derniere MAJ :"
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 "de 4"
@@ -59,16 +43,16 @@
 "Chariots Z gauche et droite tout en haut?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Purge auto   [on]"
+"SpoolJoin    [on]"
+"SpoolJoin    [on]"
 
 #
-"Auto deplete[N/A]"
-"Vidage auto [N/A]"
+"SpoolJoin   [N/A]"
+"SpoolJoin   [N/A]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Purge auto  [off]"
+"SpoolJoin   [off]"
+"SpoolJoin   [off]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Annuler"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Impossible d'entrer dans le repertoire :"
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "Carte  inseree"
@@ -191,8 +171,8 @@
 "Refroidissement"
 
 #
-"Copy selected language from XFLASH?"
-"Copier la langue selectionne depuis la XFLASH ?"
+"Copy selected language?"
+"Copier la langue selectionne?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -244,7 +224,7 @@
 
 #MSG_EJECT_FILAMENT c=17 r=1
 "Eject filament"
-"Ejecter filament"
+"Ejecter le fil"
 
 #MSG_EJECT_FILAMENT1 c=17 r=1
 "Eject filament 1"
@@ -282,26 +262,14 @@
 "Endstop"
 "Butee"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"butees atteintes :"
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "Butees"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Erreur - la memoire statique a ete ecrasee"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"erreur d'ecriture du fichier"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "ERREUR : Le capteur de filament ne repond pas, verifiez la connexion."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Verification axe Z"
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"dissemblance du checksum, Derniere Ligne :"
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Choisir extrudeur :"
@@ -614,10 +578,6 @@
 "Last print"
 "Derniere impress."
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"TUE."
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Ventilo tete gauche?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Poulie lache"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 extrudeur invalide"
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 extrudeur invalide"
-
 #
 "Load to nozzle"
-"Charger dans buse"
-
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 extrudeur invalide"
+"Charger le fil"
 
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Cal. 1ere couche"
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 extrudeur invalide"
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 extrudeur invalide"
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 extrudeur invalide"
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Principal"
@@ -762,10 +698,6 @@
 "Move Z"
 "Deplacer Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Pas de checksum avec numero de ligne, Derniere ligne :"
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Pas de mouvement."
@@ -806,22 +738,10 @@
 "Nozzle"
 "Buse"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Anciens reglages trouves. Le PID, les Esteps etc. par defaut seront pris."
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"Echec ouverture, Fichier :"
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"ouvrir"
-
 #
 "Now remove the test print from steel sheet."
 "Retirez maintenant l'impression de test de la feuille d'acier."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "Vent buse"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"Echec openRoot"
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Pause de l'impres"
@@ -922,10 +838,6 @@
 "Please wait"
 "Merci de patienter"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Demarrage"
-
 #
 "Please remove shipping helpers first."
 "Veuillez retirer d'abord les protections d'envoi."
@@ -970,10 +882,6 @@
 "Print paused"
 "Impression en pause"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Imprimante stoppee. kill() appelee !"
-
 #
 "Press the knob to resume nozzle temperature."
 "Appuyez sur le bouton pour poursuivre la mise en temperature de la buse."
@@ -986,10 +894,6 @@
 "Print FAN"
 "Vent extru"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"Imprimante arretee a cause d'erreurs. Corrigez l'erreur et utilisez M999 pour redemarrer. (La temperature est reinitilisee. Parametrez la apres le redemarrage)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "Prusa i3 MK2.5 prete."
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "Port RPi     [on]"
 
-#
-"Resend"
-"Renvoyer"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "Port RPi    [off]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "Carte SD[flshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"Carte SD ok"
-
 #
 "Right"
 "Droite"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"Echec init SD"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Recherche du point de calibration du lit"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Etat de la PINDA"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"Repos..."
-
 #MSG_FILE_CNT c=20 r=4
 "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."
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Problemes rencontres, nivellement de l'axe Z applique..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Son    [une fois]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Temps total"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"ACTIVE"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Regler"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"Echec volume.init"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Attente utilisateur..."
diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt
index a2b9e7a22..fa84b3724 100644
--- a/lang/lang_en_it.txt
+++ b/lang/lang_en_it.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-" PlannerBufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-"evitata estrusione fredda"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-"Memoria Libera: "
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-"Ultimo aggiornamento: "
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 " su 4"
@@ -59,16 +43,16 @@
 "I carrelli Z sin/des sono altezza max?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Auto svuotam [on]"
+"SpoolJoin    [on]"
+"SpoolJoin    [on]"
 
 #
-"Auto deplete[N/A]"
-"Auto svuotam[N/A]"
+"SpoolJoin   [N/A]"
+"SpoolJoin   [N/A]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Auto svuotam[off]"
+"SpoolJoin   [off]"
+"SpoolJoin   [off]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Annulla"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Impossibile accedere alla sottocartella: "
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "SD inserita"
@@ -191,8 +171,8 @@
 "Raffredda"
 
 #
-"Copy selected language from XFLASH?"
-"Copiare la lingua selezionata da XFLASH?"
+"Copy selected language?"
+"Copiare la lingua selezionata?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -282,26 +262,14 @@
 "Endstop"
 "Finecorsa"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"finecorsa colpito: "
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "Finecorsa"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Errore - la memoria statica e stata sovrascritta"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"errore scrittura sul file"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "ERRORE: il sensore filam. non risponde,Controllare conness."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Verifica asse Z"
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"mancata corrispondenza di checksum, ultima riga:"
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Seleziona estrusore:"
@@ -614,10 +578,6 @@
 "Last print"
 "\x00"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"IN TILT."
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Vent SX hotend?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Puleggia lenta"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 Estrusore non valido"
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 Estrusore non valido"
-
 #
 "Load to nozzle"
 "Carica ugello"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 Estrusore non valido"
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Calibrazione primo layer."
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 Estrusore non valido"
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 Estrusore non valido"
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 Estrusore non valido"
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Menu principale"
@@ -762,10 +698,6 @@
 "Move Z"
 "Muovi Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Nessun checksum con numero di riga, ultima riga:"
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Nessun movimento."
@@ -806,22 +738,10 @@
 "Nozzle"
 "Ugello"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Sono state trovate impostazioni vecchie. I valori di default di PID, Esteps etc. saranno impostati"
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"apertura fallita, File: "
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"apri"
-
 #
 "Now remove the test print from steel sheet."
 "Ora rimuovete la stampa di prova dalla piastra in acciaio."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "\x00"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"openRoot fallito"
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Metti in pausa"
@@ -922,10 +838,6 @@
 "Please wait"
 "Attendere"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Accendi"
-
 #
 "Please remove shipping helpers first."
 "Per favore rimuovete i materiali da spedizione"
@@ -970,10 +882,6 @@
 "Print paused"
 "Stampa in pausa"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Stampante ferma. kill () chiamato!"
-
 #
 "Press the knob to resume nozzle temperature."
 "Premete la manopola per recuperare la temperatura dell'ugello."
@@ -986,10 +894,6 @@
 "Print FAN"
 "\x00"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"La stampante si e fermata a causa di errori. Correggete l'errore e usate M999 per riavviare. (La temperatura viene resettate. Impostatela dopo il riavvio)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "\x00"
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "Porta RPi    [on]"
 
-#
-"Resend"
-"Ripeti"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "Porta RPi   [off]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "Mem. SD [flshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"Memoria SD ok"
-
 #
 "Right"
 "Destra"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"Inizializzazione Memoria SD Fallita"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Ricerca dei punti di calibrazione del piano"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Mostra stato pinda"
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"Sospensione..."
-
 #MSG_FILE_CNT c=20 r=4
 "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."
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Sono stati rilevati problemi, avviato livellamento Z ..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Suono   [singolo]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Tempo di stampa totale"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"ATTIVATO"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Regola"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"volume.init fallito"
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Attendendo utente..."
diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt
index 1bf241411..ce7bfed74 100644
--- a/lang/lang_en_pl.txt
+++ b/lang/lang_en_pl.txt
@@ -1,19 +1,3 @@
-#MSG_PLANNER_BUFFER_BYTES c=0 r=0
-"  PlannerBufferBytes: "
-" PlannerBufferBytes: "
-
-#MSG_ERR_COLD_EXTRUDE_STOP c=0 r=0
-" cold extrusion prevented"
-" nie dopuszczono do zimnej ekstruzji"
-
-#MSG_FREE_MEMORY c=0 r=0
-" Free Memory: "
-" Wolna pamiec:"
-
-#MSG_CONFIGURATION_VER c=0 r=0
-" Last Updated: "
-" Ostatnia aktualizacja: "
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 " z 4"
@@ -59,16 +43,16 @@
 "Obydwa konce osi dojechaly do gornych ogranicznikow?"
 
 #MSG_AUTO_DEPLETE_ON c=17 r=1
-"Auto deplete [on]"
-"Dok. resztek [wl]"
+"SpoolJoin    [on]"
+"SpoolJoin    [wl]"
 
 #
-"Auto deplete[N/A]"
-"Dok. resztek [nd]"
+"SpoolJoin   [N/A]"
+"SpoolJoin    [nd]"
 
 # MSG_AUTO_DEPLETE_OFF c=17 r=1
-"Auto deplete[off]"
-"Dok. resztek[wyl]"
+"SpoolJoin   [off]"
+"SpoolJoin   [wyl]"
 
 #MSG_AUTO_HOME c=0 r=0
 "Auto home"
@@ -170,10 +154,6 @@
 "Cancel"
 "Anuluj"
 
-#MSG_SD_CANT_ENTER_SUBDIR c=0 r=0
-"Cannot enter subdir: "
-"Brak dostepu do subdir: "
-
 #MSG_SD_INSERTED c=0 r=0
 "Card inserted"
 "Karta wlozona"
@@ -191,8 +171,8 @@
 "Chlodzenie"
 
 #
-"Copy selected language from XFLASH?"
-"Skopiowac wybrany jezyk z XFLASH?"
+"Copy selected language?"
+"Skopiowac wybrany jezyk?"
 
 #MSG_CRASHDETECT_ON c=0 r=0
 "Crash det.   [on]"
@@ -282,26 +262,14 @@
 "Endstop"
 "Krancowka"
 
-#MSG_ENDSTOPS_HIT c=0 r=0
-"endstops hit: "
-"krancowki aktywowane:"
-
 #MSG_SELFTEST_ENDSTOPS c=0 r=0
 "Endstops"
 "Krancowki"
 
-#MSG_Enqueing c=0 r=0
-"enqueing \x22"
-"\x00"
-
 #MSG_STACK_ERROR c=20 r=4
 "Error - static memory has been overwritten"
 "Blad - pamiec statyczna zostala nadpisana"
 
-#MSG_SD_ERR_WRITE_TO_FILE c=0 r=0
-"error writing to file"
-"blad zapisywania pliku"
-
 #MSG_FSENS_NOT_RESPONDING c=20 r=4
 "ERROR: Filament sensor is not responding, please check connection."
 "BLAD: Czujnik filamentu nie odpowiada, sprawdz polaczenie."
@@ -526,10 +494,6 @@
 "Checking Z axis  "
 "Kontrola osi Z"
 
-#MSG_ERR_CHECKSUM_MISMATCH c=0 r=0
-"checksum mismatch, Last Line: "
-"suma kontrolna niezgodna, ostatnia linia:"
-
 #MSG_CHOOSE_EXTRUDER c=20 r=1
 "Choose extruder:"
 "Wybierz ekstruder:"
@@ -614,10 +578,6 @@
 "Last print"
 "\x00"
 
-#MSG_KILLED c=0 r=0
-"KILLED. "
-"PRZERWANE."
-
 #MSG_SELFTEST_EXTRUDER_FAN c=20 r=0
 "Left hotend fan?"
 "Lewy went hotendu?"
@@ -654,38 +614,14 @@
 "Loose pulley"
 "Luzne kolo pasowe"
 
-#MSG_M104_INVALID_EXTRUDER c=0 r=0
-"M104 Invalid extruder "
-"M104 Nieprawidlowy ekstruder"
-
-#MSG_M105_INVALID_EXTRUDER c=0 r=0
-"M105 Invalid extruder "
-"M105 Nieprawidlowy ekstruder"
-
 #
 "Load to nozzle"
 "Zaladuj do dyszy"
 
-#MSG_M109_INVALID_EXTRUDER c=0 r=0
-"M109 Invalid extruder "
-"M109 Nieprawidlowy ekstruder"
-
 #MSG_M117_V2_CALIBRATION c=25 r=1
 "M117 First layer cal."
 "M117 Kal. 1. warstwy"
 
-#MSG_M200_INVALID_EXTRUDER c=0 r=0
-"M200 Invalid extruder "
-"M200 Nieprawidlowy ekstruder"
-
-#MSG_M218_INVALID_EXTRUDER c=0 r=0
-"M218 Invalid extruder "
-"M218 Nieprawidlowy ekstruder"
-
-#MSG_M221_INVALID_EXTRUDER c=0 r=0
-"M221 Invalid extruder "
-"M221 Nieprawidlowy ekstruder"
-
 #MSG_MAIN c=0 r=0
 "Main"
 "Menu glowne"
@@ -762,10 +698,6 @@
 "Move Z"
 "Ruch osi Z"
 
-#MSG_ERR_NO_CHECKSUM c=0 r=0
-"No Checksum with line number, Last Line: "
-"Brak sumy kontrolnej z numerem linii, ostatnia linia:"
-
 #MSG_NO_MOVE c=0 r=0
 "No move."
 "Brak ruchu."
@@ -806,22 +738,10 @@
 "Nozzle"
 "Dysza"
 
-#MSG_OK c=0 r=0
-"ok"
-"\x00"
-
 #MSG_DEFAULT_SETTINGS_LOADED c=20 r=4
 "Old settings found. Default PID, Esteps etc. will be set."
 "Znaleziono stare ustawienia. Zostana przywrocone domyslne ust. PID, Esteps, itp."
 
-#MSG_SD_OPEN_FILE_FAIL c=0 r=0
-"open failed, File: "
-"niepowodzenie otwarcia, Plik:"
-
-#MSG_ENDSTOP_OPEN c=0 r=0
-"open"
-"otworz"
-
 #
 "Now remove the test print from steel sheet."
 "Teraz zdejmij wydruk testowy ze stolu."
@@ -830,10 +750,6 @@
 "Nozzle FAN"
 "\x00"
 
-#MSG_SD_OPENROOT_FAIL c=0 r=0
-"openRoot failed"
-"niepowodzenie openRoot "
-
 #MSG_PAUSE_PRINT c=0 r=0
 "Pause print"
 "Wstrzymanie wydruku"
@@ -922,10 +838,6 @@
 "Please wait"
 "Prosze czekac"
 
-#MSG_POWERUP c=0 r=0
-"PowerUp"
-"Uruchamianie"
-
 #
 "Please remove shipping helpers first."
 "Najpierw usun zabezpieczenia transportowe"
@@ -970,10 +882,6 @@
 "Print paused"
 "Druk wstrzymany"
 
-#MSG_ERR_KILLED c=0 r=0
-"Printer halted. kill() called!"
-"Drukarka zatrzymana. Wywolano komende kill()!"
-
 #
 "Press the knob to resume nozzle temperature."
 "Wcisnij pokretlo aby wznowic podgrzewanie dyszy."
@@ -986,10 +894,6 @@
 "Print FAN"
 "\x00"
 
-#MSG_ERR_STOPPED c=0 r=0
-"Printer stopped due to errors. Fix the error and use M999 to restart. (Temperature is reset. Set it after restarting)"
-"Drukarka zatrzymana z powodu bledow. Usun problem i uzyj M999 aby zrestartowac. (Temperatura jest zresetowana, ustaw ja po restarcie)"
-
 #WELCOME_MSG c=20 r=0
 "Prusa i3 MK2.5 ready."
 "Prusa i3 MK2.5 gotowa"
@@ -1042,10 +946,6 @@
 "RPi port     [on]"
 "Port RPi     [wl]"
 
-#
-"Resend"
-"Wyslij ponownie"
-
 #MSG_SECOND_SERIAL_OFF c=17 r=1
 "RPi port    [off]"
 "Port RPi    [wyl]"
@@ -1062,18 +962,10 @@
 "SD card [flshAir]"
 "Karta SD[FlshAir]"
 
-#MSG_SD_CARD_OK c=0 r=0
-"SD card ok"
-"Karta SD OK"
-
 #
 "Right"
 "Prawa"
 
-#MSG_SD_INIT_FAIL c=0 r=0
-"SD init fail"
-"Inicjalizacja karty SD nieudana"
-
 #MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 c=60 r=0
 "Searching bed calibration point"
 "Szukam punktu kalibracyjnego na stole"
@@ -1130,10 +1022,6 @@
 "Show pinda state"
 "Stan sondy P.I.N.D.A."
 
-#MSG_DWELL c=0 r=0
-"Sleep..."
-"Czuwanie..."
-
 #MSG_FILE_CNT c=20 r=4
 "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."
@@ -1174,10 +1062,6 @@
 "Some problem encountered, Z-leveling enforced ..."
 "Wykryto problem, wymuszono poziomowanie osi Z ..."
 
-#
-"Some problem encountered, Z-levelling enforced ..."
-"\x00"
-
 #MSG_SOUND_ONCE c=17 r=1
 "Sound      [once]"
 "Dzwiek    [1-raz]"
@@ -1262,10 +1146,6 @@
 "Total print time"
 "Calkowity czas druku"
 
-#MSG_ENDSTOP_HIT c=0 r=0
-"TRIGGERED"
-"AKTYWOWANO"
-
 #MSG_TUNE c=0 r=0
 "Tune"
 "Strojenie"
@@ -1306,10 +1186,6 @@
 "unknown"
 "\x00"
 
-#MSG_SD_VOL_INIT_FAIL c=0 r=0
-"volume.init failed"
-"niepowodzenie volume.init "
-
 #MSG_USERWAIT c=0 r=0
 "Wait for user..."
 "Czekam na uzytkownika..."