New ML support - fixed duplicate strings

Firmware/Marlin_main.cpp

@@ -4384,7 +4384,7 @@ void process_commands()
 		KEEPALIVE_STATE(IN_HANDLER);
       }
       if (IS_SD_PRINTING)
-        LCD_MESSAGERPGM(_i("Resuming print"));////MSG_RESUMING c=0 r=0
+        LCD_MESSAGERPGM(_T(MSG_RESUMING_PRINT));
       else
         LCD_MESSAGERPGM(_T(WELCOME_MSG));
     }

Firmware/mesh_bed_calibration.cpp

@@ -2479,7 +2479,7 @@ BedSkewOffsetDetectionResultType improve_bed_offset_and_skew(int8_t method, int8
         // Print the decrasing ID of the measurement point.
 #ifdef MESH_BED_CALIBRATION_SHOW_LCD
         lcd_implementation_print_at(0, next_line, mesh_point+1);
-        lcd_printPGM(_i(" of 4"));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
+        lcd_printPGM(_T(MSG_FIND_BED_OFFSET_AND_SKEW_LINE2));////MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 #endif /* MESH_BED_CALIBRATION_SHOW_LCD */
 
         // Move up.

Firmware/messages.c

@@ -71,6 +71,7 @@ const char MSG_PRINT_ABORTED[] PROGMEM_I1 = ISTR("Print aborted"); ////c=20 r=0
 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("\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

Firmware/messages.h

@@ -69,6 +69,7 @@ extern const char MSG_PULL_OUT_FILAMENT[];
 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[];

Firmware/ultralcd.cpp

@@ -703,7 +703,7 @@ void lcd_commands()
 			strcat(cmd1, ftostr32(pause_lastpos[Y_AXIS]));
 			enquecommand(cmd1);
 			
-			lcd_setstatuspgm(_i("Resuming print"));////MSG_RESUMING_PRINT c=20 r=1
+			lcd_setstatuspgm(_T(MSG_RESUMING_PRINT));
 			lcd_commands_step = 3;
 		}
 	}

Firmware/ultralcd_implementation_hitachi_HD44780.h

@@ -968,7 +968,7 @@ if (print_sd_status)
 					lcd.setCursor(0, 3);
 					lcd_printPGM(PSTR("                    "));
 					lcd.setCursor(0, 3);
-					lcd_printPGM(_i("Calibrating Z"));////MSG_HOMEYZ_PROGRESS c=0 r=0
+					lcd_printPGM(_T(MSG_CALIBRATE_Z_AUTO));
 					lcd_printPGM(PSTR(" : "));
 					lcd.print(custom_message_state-10);
 				}

lang/lang_en.txt

@@ -22,9 +22,6 @@
 #MSG_CONFIGURATION_VER c=0 r=0
 " Last Updated: "
 
-#MSG_FIND_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-
 #MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
 " of 4"
 
@@ -139,9 +136,6 @@
 #MSG_CALIBRATE_Z_AUTO c=20 r=2
 "Calibrating Z"
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-
 #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."
 
@@ -253,9 +247,6 @@
 #MSG_INFO_EXTRUDER c=15 r=1
 "Extruder info"
 
-#MSG_EXTRUDER c=17 r=1
-"Extruder"
-
 #MSG_MOVE_E c=0 r=0
 "Extruder"
 
@@ -751,9 +742,6 @@
 #MSG_RESUME_PRINT c=0 r=0
 "Resume print"
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-
 #MSG_RESUMING_PRINT c=20 r=1
 "Resuming print"
 

lang/lang_en_cz.txt

@@ -34,10 +34,6 @@
 " of 4"
 " z 4"
 
-#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-" z 4"
-
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0
 " of 9"
 " z 9"
@@ -182,11 +178,7 @@
 "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."
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-"Kalibruji Z"
-
-#MSG_HOMEYZ_PROGRESS c=0 r=0
+#MSG_CALIBRATE_Z_AUTO c=0 r=0
 "Calibrating Z"
 "Kalibruji Z"
 
@@ -342,10 +334,6 @@
 "Extruder"
 "Extruder"
 
-#MSG_MOVE_E c=0 r=0
-"Extruder"
-"Extruder"
-
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "F. autozav. [zap]"
@@ -1002,11 +990,7 @@
 "Resume print"
 "Pokracovat"
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-"Obnoveni tisku"
-
-#MSG_RESUMING c=0 r=0
+#MSG_RESUMING_PRINT c=0 r=0
 "Resuming print"
 "Obnoveni tisku"
 

lang/lang_en_de.txt

@@ -34,10 +34,6 @@
 " of 4"
 " von 4"
 
-#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-" von 4"
-
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0
 " of 9"
 " von 9"
@@ -182,11 +178,7 @@
 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
 "Kalibrieren von XYZ. Drehen Sie den Knopf bis der obere Anschlag erreicht wird. Klicken Sie den Knopf wenn es ganz oben wird."
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-"Kalibriere Z"
-
-#MSG_HOMEYZ_PROGRESS c=0 r=0
+#MSG_CALIBRATE_Z_AUTO c=0 r=0
 "Calibrating Z"
 "Kalibriere Z"
 
@@ -342,10 +334,6 @@
 "Extruder"
 "Extruder"
 
-#MSG_MOVE_E c=0 r=0
-"Extruder"
-"Extruder"
-
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "\x00"
@@ -1002,11 +990,7 @@
 "Resume print"
 "Fortsetzen"
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-"Druck fortgesetzt"
-
-#MSG_RESUMING c=0 r=0
+#MSG_RESUMING_PRINT c=0 r=0
 "Resuming print"
 "Druck fortgesetzt"
 

lang/lang_en_es.txt

@@ -34,10 +34,6 @@
 " of 4"
 " de 4"
 
-#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-" de 4"
-
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0
 " of 9"
 " de 9"
@@ -182,11 +178,7 @@
 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
 "Calibrando XYZ. Gira el boton para subir el extrusor hasta tocar los topes superiores. Despues haz clic."
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-"Calibrando Z"
-
-#MSG_HOMEYZ_PROGRESS c=0 r=0
+#MSG_CALIBRATE_Z_AUTO c=0 r=0
 "Calibrating Z"
 "Calibrando Z"
 
@@ -342,10 +334,6 @@
 "Extruder"
 "Extruir"
 
-#MSG_MOVE_E c=0 r=0
-"Extruder"
-"Extruir"
-
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "\x00"
@@ -1002,11 +990,7 @@
 "Resume print"
 "Reanudar impres."
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-"Resumiendo impresion"
-
-#MSG_RESUMING c=0 r=0
+#MSG_RESUMING_PRINT c=0 r=0
 "Resuming print"
 "Resumiendo impresion"
 

lang/lang_en_it.txt

@@ -34,10 +34,6 @@
 " of 4"
 " su 4"
 
-#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-" su 4"
-
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0
 " of 9"
 " su 9"
@@ -182,11 +178,7 @@
 "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."
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-"Calibrando Z"
-
-#MSG_HOMEYZ_PROGRESS c=0 r=0
+#MSG_CALIBRATE_Z_AUTO c=0 r=0
 "Calibrating Z"
 "Calibrando Z"
 
@@ -342,10 +334,6 @@
 "Extruder"
 "Muovi Estrusore"
 
-#MSG_MOVE_E c=0 r=0
-"Extruder"
-"Muovi Estrusore"
-
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "\x00"
@@ -1002,11 +990,7 @@
 "Resume print"
 "Riprendi stampa"
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-"Riprendi stampa"
-
-#MSG_RESUMING c=0 r=0
+#MSG_RESUMING_PRINT c=0 r=0
 "Resuming print"
 "Riprendi stampa"
 

lang/lang_en_pl.txt

@@ -34,10 +34,6 @@
 " of 4"
 " z 4"
 
-#MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2 c=14 r=0
-" of 4"
-" z 4"
-
 #MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 c=14 r=0
 " of 9"
 " z 9"
@@ -182,11 +178,7 @@
 "Calibrating XYZ. Rotate the knob to move the Z carriage up to the end stoppers. Click when done."
 "Kalibracja XYZ. Przekrec galke, aby przesunac os Z do gornych krancowek. Nacisnij, by potwierdzic."
 
-#MSG_HOMEYZ_PROGRESS c=0 r=0
-"Calibrating Z"
-"Kalibruje Z"
-
-#MSG_HOMEYZ_PROGRESS c=0 r=0
+#MSG_CALIBRATE_Z_AUTO c=0 r=0
 "Calibrating Z"
 "Kalibruje Z"
 
@@ -342,10 +334,6 @@
 "Extruder"
 "Extruder"
 
-#MSG_MOVE_E c=0 r=0
-"Extruder"
-"Extruder"
-
 #MSG_FSENS_AUTOLOAD_ON c=17 r=1
 "F. autoload  [on]"
 "\x00"
@@ -1002,11 +990,7 @@
 "Resume print"
 "Kontynuowac"
 
-#MSG_RESUMING c=0 r=0
-"Resuming print"
-"Wznowienie druku"
-
-#MSG_RESUMING c=0 r=0
+#MSG_RESUMING_PRINT c=0 r=0
 "Resuming print"
 "Wznowienie druku"