浏览代码

messages translated, invalidate calibration status at the beginning of temp. calibration

PavelSindler 8 年之前
父节点
当前提交
32df4f68a1
共有 8 个文件被更改,包括 194 次插入115 次删除
  1. 4 4
      Firmware/Marlin_main.cpp
  2. 129 92
      Firmware/language_all.cpp
  3. 2 6
      Firmware/language_all.h
  4. 3 3
      Firmware/language_cz.h
  5. 0 2
      Firmware/language_en.h
  6. 20 3
      Firmware/language_es.h
  7. 17 2
      Firmware/language_it.h
  8. 19 3
      Firmware/language_pl.h

+ 4 - 4
Firmware/Marlin_main.cpp

@@ -2828,11 +2828,12 @@ void process_commands()
 		current_position[Z_AXIS] = PINDA_PREHEAT_Z;
 		plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder);
 		st_synchronize();
-
+		
 		while (abs(degBed() - PINDA_MIN_T) > 1 ) delay_keep_alive(1000);
 		
 		//enquecommand_P(PSTR("M190 S50"));
 		for (int i = 0; i < PINDA_HEAT_T; i++)	delay_keep_alive(1000);
+		calibration_status_store(CALIBRATION_STATUS_PINDA); //invalidate temp. calibration in case that in will be aborted during the calibration process 
 
 		current_position[Z_AXIS] = 5;
 		plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 3000 / 60, active_extruder);
@@ -6321,7 +6322,7 @@ void bed_analysis(float x_dimension, float y_dimension, int x_points_num, int y_
 #endif
 
 void temp_compensation_start() {
-	mesh_bed_leveling_flag = false;
+	
 	custom_message = true;
 	custom_message_type = 5;
 	custom_message_state = PINDA_HEAT_T + 1;
@@ -6341,8 +6342,7 @@ void temp_compensation_start() {
 		custom_message_state = PINDA_HEAT_T - i;
 		if (custom_message_state == 99 || custom_message_state == 9) lcd_update(2); //force whole display redraw if number of digits changed
 		else lcd_update(1);
-	}
-	mesh_bed_leveling_flag = true;
+	}	
 	custom_message_type = 0;
 	custom_message_state = 0;
 	custom_message = false;

+ 129 - 92
Firmware/language_all.cpp

@@ -496,24 +496,32 @@ const char * const MSG_CALIBRATE_E_LANG_TABLE[LANG_NUM] PROGMEM = {
 
 const char MSG_CALIBRATE_PINDA_EN[] PROGMEM = "Calibrate";
 const char MSG_CALIBRATE_PINDA_CZ[] PROGMEM = "Zkalibrovat";
+const char MSG_CALIBRATE_PINDA_IT[] PROGMEM = "Calibrare";
+const char MSG_CALIBRATE_PINDA_ES[] PROGMEM = "Calibrar";
+const char MSG_CALIBRATE_PINDA_PL[] PROGMEM = "Skalibrowac";
+const char MSG_CALIBRATE_PINDA_DE[] PROGMEM = "Kalibrieren";
 const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_CALIBRATE_PINDA_EN,
 	MSG_CALIBRATE_PINDA_CZ,
-	MSG_CALIBRATE_PINDA_EN,
-	MSG_CALIBRATE_PINDA_EN,
-	MSG_CALIBRATE_PINDA_EN,
-	MSG_CALIBRATE_PINDA_EN
+	MSG_CALIBRATE_PINDA_IT,
+	MSG_CALIBRATE_PINDA_ES,
+	MSG_CALIBRATE_PINDA_PL,
+	MSG_CALIBRATE_PINDA_DE
 };
 
 const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration";
-const char MSG_CALIBRATION_PINDA_MENU_CZ[] PROGMEM = "Teplotni kalibrace";
+const char MSG_CALIBRATION_PINDA_MENU_CZ[] PROGMEM = "Teplot. kalibrace";
+const char MSG_CALIBRATION_PINDA_MENU_IT[] PROGMEM = "Taratura temp.";
+const char MSG_CALIBRATION_PINDA_MENU_ES[] PROGMEM = "Calibracion temp.";
+const char MSG_CALIBRATION_PINDA_MENU_PL[] PROGMEM = "Cieplna kalibr.";
+const char MSG_CALIBRATION_PINDA_MENU_DE[] PROGMEM = "Temp. kalibrieren";
 const char * const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_CALIBRATION_PINDA_MENU_EN,
 	MSG_CALIBRATION_PINDA_MENU_CZ,
-	MSG_CALIBRATION_PINDA_MENU_EN,
-	MSG_CALIBRATION_PINDA_MENU_EN,
-	MSG_CALIBRATION_PINDA_MENU_EN,
-	MSG_CALIBRATION_PINDA_MENU_EN
+	MSG_CALIBRATION_PINDA_MENU_IT,
+	MSG_CALIBRATION_PINDA_MENU_ES,
+	MSG_CALIBRATION_PINDA_MENU_PL,
+	MSG_CALIBRATION_PINDA_MENU_DE
 };
 
 const char MSG_CARD_MENU_EN[] PROGMEM = "Print from SD";
@@ -958,38 +966,15 @@ const char * const MSG_FIL_ADJUSTING_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FIL_ADJUSTING_DE
 };
 
-const char MSG_FIL_LOADED_CHECK_EN[] PROGMEM = "Is filament loaded?";
-const char MSG_FIL_LOADED_CHECK_CZ[] PROGMEM = "Je filament zaveden?";
-const char MSG_FIL_LOADED_CHECK_IT[] PROGMEM = "Filamento caricato?";
-const char MSG_FIL_LOADED_CHECK_ES[] PROGMEM = "Esta cargado el filamento?";
-const char MSG_FIL_LOADED_CHECK_PL[] PROGMEM = "Czy filament jest wprowadzony?";
-const char MSG_FIL_LOADED_CHECK_DE[] PROGMEM = "Filament eingelegt?";
-const char * const MSG_FIL_LOADED_CHECK_LANG_TABLE[LANG_NUM] PROGMEM = {
-	MSG_FIL_LOADED_CHECK_EN,
-	MSG_FIL_LOADED_CHECK_CZ,
-	MSG_FIL_LOADED_CHECK_IT,
-	MSG_FIL_LOADED_CHECK_ES,
-	MSG_FIL_LOADED_CHECK_PL,
-	MSG_FIL_LOADED_CHECK_DE
-};
-
-const char MSG_FIL_TUNING_EN[] PROGMEM = "Rotate the knob to adjust filament.";
-const char MSG_FIL_TUNING_CZ[] PROGMEM = "Otacenim tlacitka doladte pozici filamentu.";
-const char MSG_FIL_TUNING_IT[] PROGMEM = "Girare la manopola per regolare il filamento";
-const char MSG_FIL_TUNING_ES[] PROGMEM = "Rotar el mando para ajustar el filamento.";
-const char MSG_FIL_TUNING_PL[] PROGMEM = "Obrotem przycisku dostroj pozycje filamentu.";
-const char MSG_FIL_TUNING_DE[] PROGMEM = "Knopf drehen um Filam. einzustellen.";
-const char * const MSG_FIL_TUNING_LANG_TABLE[LANG_NUM] PROGMEM = {
-	MSG_FIL_TUNING_EN,
-	MSG_FIL_TUNING_CZ,
-	MSG_FIL_TUNING_IT,
-	MSG_FIL_TUNING_ES,
-	MSG_FIL_TUNING_PL,
-	MSG_FIL_TUNING_DE
-};
-
 const char MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN[] PROGMEM = "Iteration ";
-const char * const MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE[1] PROGMEM = {
+const char MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_CZ[] PROGMEM = "Iterace ";
+const char MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_ES[] PROGMEM = "Iteracion ";
+const char * const MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN,
+	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_CZ,
+	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN,
+	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_ES,
+	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN,
 	MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_EN
 };
 
@@ -1025,13 +1010,17 @@ const char * const MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM] PROGM
 
 const char MSG_FINISHING_MOVEMENTS_EN[] PROGMEM = "Finishing movements";
 const char MSG_FINISHING_MOVEMENTS_CZ[] PROGMEM = "Dokoncovani pohybu";
+const char MSG_FINISHING_MOVEMENTS_IT[] PROGMEM = "Arresto in corso";
+const char MSG_FINISHING_MOVEMENTS_ES[] PROGMEM = "Term. movimientos";
+const char MSG_FINISHING_MOVEMENTS_PL[] PROGMEM = "Konczenie druku";
+const char MSG_FINISHING_MOVEMENTS_DE[] PROGMEM = "Bewegung beenden";
 const char * const MSG_FINISHING_MOVEMENTS_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FINISHING_MOVEMENTS_EN,
 	MSG_FINISHING_MOVEMENTS_CZ,
-	MSG_FINISHING_MOVEMENTS_EN,
-	MSG_FINISHING_MOVEMENTS_EN,
-	MSG_FINISHING_MOVEMENTS_EN,
-	MSG_FINISHING_MOVEMENTS_EN
+	MSG_FINISHING_MOVEMENTS_IT,
+	MSG_FINISHING_MOVEMENTS_ES,
+	MSG_FINISHING_MOVEMENTS_PL,
+	MSG_FINISHING_MOVEMENTS_DE
 };
 
 const char MSG_FLOW_EN[] PROGMEM = "Flow";
@@ -1771,57 +1760,77 @@ const char * const MSG_PICK_Z_LANG_TABLE[LANG_NUM] PROGMEM = {
 
 const char MSG_PID_EXTRUDER_EN[] PROGMEM = "PID calibration";
 const char MSG_PID_EXTRUDER_CZ[] PROGMEM = "PID kalibrace";
+const char MSG_PID_EXTRUDER_IT[] PROGMEM = "Calibrazione PID";
+const char MSG_PID_EXTRUDER_ES[] PROGMEM = "Calibracion PID";
+const char MSG_PID_EXTRUDER_PL[] PROGMEM = "Kalibracja PID";
+const char MSG_PID_EXTRUDER_DE[] PROGMEM = "PID Kalibrierung";
 const char * const MSG_PID_EXTRUDER_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PID_EXTRUDER_EN,
 	MSG_PID_EXTRUDER_CZ,
-	MSG_PID_EXTRUDER_EN,
-	MSG_PID_EXTRUDER_EN,
-	MSG_PID_EXTRUDER_EN,
-	MSG_PID_EXTRUDER_EN
+	MSG_PID_EXTRUDER_IT,
+	MSG_PID_EXTRUDER_ES,
+	MSG_PID_EXTRUDER_PL,
+	MSG_PID_EXTRUDER_DE
 };
 
 const char MSG_PID_FINISHED_EN[] PROGMEM = "PID cal. finished";
 const char MSG_PID_FINISHED_CZ[] PROGMEM = "PID kal. ukoncena";
+const char MSG_PID_FINISHED_IT[] PROGMEM = "Cal. PID completa";
+const char MSG_PID_FINISHED_ES[] PROGMEM = "Cal. PID terminada";
+const char MSG_PID_FINISHED_PL[] PROGMEM = "Kal. PID zakonczona";
+const char MSG_PID_FINISHED_DE[] PROGMEM = "PID Kalib. fertig";
 const char * const MSG_PID_FINISHED_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PID_FINISHED_EN,
 	MSG_PID_FINISHED_CZ,
-	MSG_PID_FINISHED_EN,
-	MSG_PID_FINISHED_EN,
-	MSG_PID_FINISHED_EN,
-	MSG_PID_FINISHED_EN
+	MSG_PID_FINISHED_IT,
+	MSG_PID_FINISHED_ES,
+	MSG_PID_FINISHED_PL,
+	MSG_PID_FINISHED_DE
 };
 
 const char MSG_PID_RUNNING_EN[] PROGMEM = "PID cal.           ";
 const char MSG_PID_RUNNING_CZ[] PROGMEM = "PID kal.           ";
+const char MSG_PID_RUNNING_IT[] PROGMEM = "Cal. PID";
+const char MSG_PID_RUNNING_ES[] PROGMEM = "Cal. PID           ";
+const char MSG_PID_RUNNING_PL[] PROGMEM = "Kal. PID";
+const char MSG_PID_RUNNING_DE[] PROGMEM = "PID Kalib.";
 const char * const MSG_PID_RUNNING_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PID_RUNNING_EN,
 	MSG_PID_RUNNING_CZ,
-	MSG_PID_RUNNING_EN,
-	MSG_PID_RUNNING_EN,
-	MSG_PID_RUNNING_EN,
-	MSG_PID_RUNNING_EN
+	MSG_PID_RUNNING_IT,
+	MSG_PID_RUNNING_ES,
+	MSG_PID_RUNNING_PL,
+	MSG_PID_RUNNING_DE
 };
 
 const char MSG_PINDA_NOT_CALIBRATED_EN[] PROGMEM = "Temperature calibration has not been run yet";
 const char MSG_PINDA_NOT_CALIBRATED_CZ[] PROGMEM = "Tiskarna nebyla teplotne zkalibrovana";
+const char MSG_PINDA_NOT_CALIBRATED_IT[] PROGMEM = "Taratura della temperatura non ancora eseguita";
+const char MSG_PINDA_NOT_CALIBRATED_ES[] PROGMEM = "La temperatura de calibracion no ha sido ajustada";
+const char MSG_PINDA_NOT_CALIBRATED_PL[] PROGMEM = "Cieplna kalibracja nie byla przeprowadzona";
+const char MSG_PINDA_NOT_CALIBRATED_DE[] PROGMEM = "Temperatur wurde nicht kalibriert";
 const char * const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PINDA_NOT_CALIBRATED_EN,
 	MSG_PINDA_NOT_CALIBRATED_CZ,
-	MSG_PINDA_NOT_CALIBRATED_EN,
-	MSG_PINDA_NOT_CALIBRATED_EN,
-	MSG_PINDA_NOT_CALIBRATED_EN,
-	MSG_PINDA_NOT_CALIBRATED_EN
+	MSG_PINDA_NOT_CALIBRATED_IT,
+	MSG_PINDA_NOT_CALIBRATED_ES,
+	MSG_PINDA_NOT_CALIBRATED_PL,
+	MSG_PINDA_NOT_CALIBRATED_DE
 };
 
 const char MSG_PINDA_PREHEAT_EN[] PROGMEM = "PINDA Heating";
 const char MSG_PINDA_PREHEAT_CZ[] PROGMEM = "Nahrivani PINDA";
+const char MSG_PINDA_PREHEAT_IT[] PROGMEM = "Riscald. PINDA";
+const char MSG_PINDA_PREHEAT_ES[] PROGMEM = "Calentando PINDA";
+const char MSG_PINDA_PREHEAT_PL[] PROGMEM = "Grzanie PINDA";
+const char MSG_PINDA_PREHEAT_DE[] PROGMEM = "PINDA erwaermen";
 const char * const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PINDA_PREHEAT_EN,
 	MSG_PINDA_PREHEAT_CZ,
-	MSG_PINDA_PREHEAT_EN,
-	MSG_PINDA_PREHEAT_EN,
-	MSG_PINDA_PREHEAT_EN,
-	MSG_PINDA_PREHEAT_EN
+	MSG_PINDA_PREHEAT_IT,
+	MSG_PINDA_PREHEAT_ES,
+	MSG_PINDA_PREHEAT_PL,
+	MSG_PINDA_PREHEAT_DE
 };
 
 const char MSG_PLANNER_BUFFER_BYTES_EN[] PROGMEM = "  PlannerBufferBytes: ";
@@ -1921,13 +1930,17 @@ const char * const MSG_PRINT_ABORTED_LANG_TABLE[LANG_NUM] PROGMEM = {
 
 const char MSG_PRINT_PAUSED_EN[] PROGMEM = "Print paused";
 const char MSG_PRINT_PAUSED_CZ[] PROGMEM = "Tisk pozastaven";
+const char MSG_PRINT_PAUSED_IT[] PROGMEM = "Stampa in pausa";
+const char MSG_PRINT_PAUSED_ES[] PROGMEM = "Impresion en pausa";
+const char MSG_PRINT_PAUSED_PL[] PROGMEM = "Druk zatrzymany";
+const char MSG_PRINT_PAUSED_DE[] PROGMEM = "Druck pausiert";
 const char * const MSG_PRINT_PAUSED_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_PRINT_PAUSED_EN,
 	MSG_PRINT_PAUSED_CZ,
-	MSG_PRINT_PAUSED_EN,
-	MSG_PRINT_PAUSED_EN,
-	MSG_PRINT_PAUSED_EN,
-	MSG_PRINT_PAUSED_EN
+	MSG_PRINT_PAUSED_IT,
+	MSG_PRINT_PAUSED_ES,
+	MSG_PRINT_PAUSED_PL,
+	MSG_PRINT_PAUSED_DE
 };
 
 const char MSG_PRUSA3D_EN[] PROGMEM = "prusa3d.com";
@@ -2038,13 +2051,17 @@ const char * const MSG_RESUMING_LANG_TABLE[LANG_NUM] PROGMEM = {
 
 const char MSG_RESUMING_PRINT_EN[] PROGMEM = "Resuming print";
 const char MSG_RESUMING_PRINT_CZ[] PROGMEM = "Obnovovani tisku";
+const char MSG_RESUMING_PRINT_IT[] PROGMEM = "Stampa in ripresa";
+const char MSG_RESUMING_PRINT_ES[] PROGMEM = "Reanudar impresion";
+const char MSG_RESUMING_PRINT_PL[] PROGMEM = "Wznawianie druku";
+const char MSG_RESUMING_PRINT_DE[] PROGMEM = "Druck weitergehen";
 const char * const MSG_RESUMING_PRINT_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_RESUMING_PRINT_EN,
 	MSG_RESUMING_PRINT_CZ,
-	MSG_RESUMING_PRINT_EN,
-	MSG_RESUMING_PRINT_EN,
-	MSG_RESUMING_PRINT_EN,
-	MSG_RESUMING_PRINT_EN
+	MSG_RESUMING_PRINT_IT,
+	MSG_RESUMING_PRINT_ES,
+	MSG_RESUMING_PRINT_PL,
+	MSG_RESUMING_PRINT_DE
 };
 
 const char MSG_SD_CANT_ENTER_SUBDIR_EN[] PROGMEM = "Cannot enter subdir: ";
@@ -2548,13 +2565,17 @@ const char * const MSG_SET_ORIGIN_LANG_TABLE[1] PROGMEM = {
 
 const char MSG_SET_TEMPERATURE_EN[] PROGMEM = "Set temperature:";
 const char MSG_SET_TEMPERATURE_CZ[] PROGMEM = "Nastavte teplotu:";
+const char MSG_SET_TEMPERATURE_IT[] PROGMEM = "Imposta temperatura";
+const char MSG_SET_TEMPERATURE_ES[] PROGMEM = "Establecer temp.:";
+const char MSG_SET_TEMPERATURE_PL[] PROGMEM = "Ustawic temperature";
+const char MSG_SET_TEMPERATURE_DE[] PROGMEM = "Temp. einsetzen";
 const char * const MSG_SET_TEMPERATURE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_SET_TEMPERATURE_EN,
 	MSG_SET_TEMPERATURE_CZ,
-	MSG_SET_TEMPERATURE_EN,
-	MSG_SET_TEMPERATURE_EN,
-	MSG_SET_TEMPERATURE_EN,
-	MSG_SET_TEMPERATURE_EN
+	MSG_SET_TEMPERATURE_IT,
+	MSG_SET_TEMPERATURE_ES,
+	MSG_SET_TEMPERATURE_PL,
+	MSG_SET_TEMPERATURE_DE
 };
 
 const char MSG_SHOW_END_STOPS_EN[] PROGMEM = "Show end stops";
@@ -2811,46 +2832,62 @@ const char * const MSG_TEMPERATURE_LANG_TABLE[LANG_NUM] PROGMEM = {
 
 const char MSG_TEMP_CALIBRATION_EN[] PROGMEM = "Temp. cal.          ";
 const char MSG_TEMP_CALIBRATION_CZ[] PROGMEM = "Tepl. kal.          ";
+const char MSG_TEMP_CALIBRATION_IT[] PROGMEM = "Cal. temp.          ";
+const char MSG_TEMP_CALIBRATION_ES[] PROGMEM = "Cal. temp.          ";
+const char MSG_TEMP_CALIBRATION_PL[] PROGMEM = "Ciepl. kal.         ";
+const char MSG_TEMP_CALIBRATION_DE[] PROGMEM = "Temp Kalib.         ";
 const char * const MSG_TEMP_CALIBRATION_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_EN,
 	MSG_TEMP_CALIBRATION_CZ,
-	MSG_TEMP_CALIBRATION_EN,
-	MSG_TEMP_CALIBRATION_EN,
-	MSG_TEMP_CALIBRATION_EN,
-	MSG_TEMP_CALIBRATION_EN
+	MSG_TEMP_CALIBRATION_IT,
+	MSG_TEMP_CALIBRATION_ES,
+	MSG_TEMP_CALIBRATION_PL,
+	MSG_TEMP_CALIBRATION_DE
 };
 
 const char MSG_TEMP_CALIBRATION_DONE_EN[] PROGMEM = "Temperature calibration is finished. Click to continue.";
 const char MSG_TEMP_CALIBRATION_DONE_CZ[] PROGMEM = "Teplotni kalibrace dokoncena. Pokracujte stiskem tlacitka.";
+const char MSG_TEMP_CALIBRATION_DONE_IT[] PROGMEM = "Taratura temperatura terminata. Fare click per continuare.";
+const char MSG_TEMP_CALIBRATION_DONE_ES[] PROGMEM = "Calibracon temperatura terminada. Presionar para continuar.";
+const char MSG_TEMP_CALIBRATION_DONE_PL[] PROGMEM = "Cieplna kalibracja zakonczona. Kontynuuj przyciskiem";
+const char MSG_TEMP_CALIBRATION_DONE_DE[] PROGMEM = "Temp. Kalibrierung fertig. Klicken um weiter zu gehen.";
 const char * const MSG_TEMP_CALIBRATION_DONE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_DONE_EN,
 	MSG_TEMP_CALIBRATION_DONE_CZ,
-	MSG_TEMP_CALIBRATION_DONE_EN,
-	MSG_TEMP_CALIBRATION_DONE_EN,
-	MSG_TEMP_CALIBRATION_DONE_EN,
-	MSG_TEMP_CALIBRATION_DONE_EN
+	MSG_TEMP_CALIBRATION_DONE_IT,
+	MSG_TEMP_CALIBRATION_DONE_ES,
+	MSG_TEMP_CALIBRATION_DONE_PL,
+	MSG_TEMP_CALIBRATION_DONE_DE
 };
 
 const char MSG_TEMP_CALIBRATION_OFF_EN[] PROGMEM = "Temp. cal. [OFF]";
 const char MSG_TEMP_CALIBRATION_OFF_CZ[] PROGMEM = "Tepl. kal. [OFF]";
+const char MSG_TEMP_CALIBRATION_OFF_IT[] PROGMEM = "Cal. temp. [OFF]";
+const char MSG_TEMP_CALIBRATION_OFF_ES[] PROGMEM = "Cal. temp. [OFF]";
+const char MSG_TEMP_CALIBRATION_OFF_PL[] PROGMEM = "Ciepl. kal. [OFF]";
+const char MSG_TEMP_CALIBRATION_OFF_DE[] PROGMEM = "Temp. Kal. [OFF]";
 const char * const MSG_TEMP_CALIBRATION_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_OFF_EN,
 	MSG_TEMP_CALIBRATION_OFF_CZ,
-	MSG_TEMP_CALIBRATION_OFF_EN,
-	MSG_TEMP_CALIBRATION_OFF_EN,
-	MSG_TEMP_CALIBRATION_OFF_EN,
-	MSG_TEMP_CALIBRATION_OFF_EN
+	MSG_TEMP_CALIBRATION_OFF_IT,
+	MSG_TEMP_CALIBRATION_OFF_ES,
+	MSG_TEMP_CALIBRATION_OFF_PL,
+	MSG_TEMP_CALIBRATION_OFF_DE
 };
 
 const char MSG_TEMP_CALIBRATION_ON_EN[] PROGMEM = "Temp. cal. [ON]";
 const char MSG_TEMP_CALIBRATION_ON_CZ[] PROGMEM = "Tepl. kal. [ON]";
+const char MSG_TEMP_CALIBRATION_ON_IT[] PROGMEM = "Cal. temp. [ON]";
+const char MSG_TEMP_CALIBRATION_ON_ES[] PROGMEM = "Cal. temp. [ON]";
+const char MSG_TEMP_CALIBRATION_ON_PL[] PROGMEM = "Ciepl. kal. [ON]";
+const char MSG_TEMP_CALIBRATION_ON_DE[] PROGMEM = "Temp. Kal. [ON]";
 const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_ON_EN,
 	MSG_TEMP_CALIBRATION_ON_CZ,
-	MSG_TEMP_CALIBRATION_ON_EN,
-	MSG_TEMP_CALIBRATION_ON_EN,
-	MSG_TEMP_CALIBRATION_ON_EN,
-	MSG_TEMP_CALIBRATION_ON_EN
+	MSG_TEMP_CALIBRATION_ON_IT,
+	MSG_TEMP_CALIBRATION_ON_ES,
+	MSG_TEMP_CALIBRATION_ON_PL,
+	MSG_TEMP_CALIBRATION_ON_DE
 };
 
 const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_EN[] PROGMEM = "SD card [normal]";

+ 2 - 6
Firmware/language_all.h

@@ -201,12 +201,8 @@ extern const char* const MSG_FILE_SAVED_LANG_TABLE[1];
 #define MSG_FILE_SAVED LANG_TABLE_SELECT_EXPLICIT(MSG_FILE_SAVED_LANG_TABLE, 0)
 extern const char* const MSG_FIL_ADJUSTING_LANG_TABLE[LANG_NUM];
 #define MSG_FIL_ADJUSTING LANG_TABLE_SELECT(MSG_FIL_ADJUSTING_LANG_TABLE)
-extern const char* const MSG_FIL_LOADED_CHECK_LANG_TABLE[LANG_NUM];
-#define MSG_FIL_LOADED_CHECK LANG_TABLE_SELECT(MSG_FIL_LOADED_CHECK_LANG_TABLE)
-extern const char* const MSG_FIL_TUNING_LANG_TABLE[LANG_NUM];
-#define MSG_FIL_TUNING LANG_TABLE_SELECT(MSG_FIL_TUNING_LANG_TABLE)
-extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE[1];
-#define MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION LANG_TABLE_SELECT_EXPLICIT(MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE, 0)
+extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE[LANG_NUM];
+#define MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION LANG_TABLE_SELECT(MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION_LANG_TABLE)
 extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE[LANG_NUM];
 #define MSG_FIND_BED_OFFSET_AND_SKEW_LINE1 LANG_TABLE_SELECT(MSG_FIND_BED_OFFSET_AND_SKEW_LINE1_LANG_TABLE)
 extern const char* const MSG_FIND_BED_OFFSET_AND_SKEW_LINE2_LANG_TABLE[LANG_NUM];

+ 3 - 3
Firmware/language_cz.h

@@ -212,6 +212,7 @@
 #define MSG_IMPROVE_BED_OFFSET_AND_SKEW_LINE2	" z 9"
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1	"Merim referencni vysku kalibracniho bodu"
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2	" z 9"
+#define MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION	"Iterace "
 
 #define MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND			"Kalibrace XYZ selhala. Kalibracni bod podlozky nenalezen."
 #define MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED			"Kalibrace XYZ selhala. Nahlednete do manualu."
@@ -252,8 +253,7 @@
 #define MSG_FILAMENT_LOADING_T2							"Vložte filament do extruderu 3. Potvrdte tlacitkem."
 #define MSG_FILAMENT_LOADING_T3							"Vložte filament do extruderu 4. Potvrdte tlacitkem."
 #define MSG_CHANGE_EXTR									"Zmenit extruder"
-#define MSG_FIL_LOADED_CHECK							"Je filament zaveden?"
-#define MSG_FIL_TUNING									"Otacenim tlacitka doladte pozici filamentu."
+
 #define MSG_FIL_ADJUSTING								"Probiha srovnani filamentu. Prosim cekejte."
 #define MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ				"Filamenty jsou srovnany. Pro uspesnou kalibraci prosim ocistete trysku. Po te potvrdte tlacitkem."
 #define MSG_CALIBRATE_E									"Kalibrovat E"
@@ -275,7 +275,7 @@
 #define MSG_PID_RUNNING									"PID kal.           "
 
 #define MSG_CALIBRATE_PINDA								"Zkalibrovat"
-#define MSG_CALIBRATION_PINDA_MENU						"Teplotni kalibrace"
+#define MSG_CALIBRATION_PINDA_MENU						"Teplot. kalibrace"
 #define MSG_PINDA_NOT_CALIBRATED						"Tiskarna nebyla teplotne zkalibrovana"
 #define MSG_PINDA_PREHEAT								"Nahrivani PINDA"
 #define MSG_TEMP_CALIBRATION							"Tepl. kal.          "

+ 0 - 2
Firmware/language_en.h

@@ -238,8 +238,6 @@
 #define(length=20, lines=4) MSG_FILAMENT_LOADING_T3							"Insert filament into extruder 4. Click when done."
 #define(length=20, lines=1) MSG_CHANGE_EXTR									"Change extruder"
 
-#define(length=20, lines=1) MSG_FIL_LOADED_CHECK								"Is filament loaded?"
-#define(length=20, lines=2) MSG_FIL_TUNING										"Rotate the knob to adjust filament."
 #define(length=20, lines=4) MSG_FIL_ADJUSTING								"Adjusting filaments. Please wait."
 #define(length=20,lines=8) MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ			"Filaments are now adjusted. Please clean the nozzle for calibration. Click when done."
 #define(length=20, lines=4) MSG_STACK_ERROR						"Error - static memory has been overwritten"

+ 20 - 3
Firmware/language_es.h

@@ -206,6 +206,7 @@
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1	"Medir la altura del punto de la calibracion"
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2	" de 9"
 
+#define MSG_FIND_BED_OFFSET_AND_SKEW_ITERATION	"Iteracion "
 #define MSG_BED_SKEW_OFFSET_DETECTION_POINT_NOT_FOUND           "Calibracion XYZ fallada. Puntos de calibracion en la cama no encontrados."
 #define MSG_BED_SKEW_OFFSET_DETECTION_FITTING_FAILED            "Calibracion XYZ fallada. Consultar el manual por favor."
 #define MSG_BED_SKEW_OFFSET_DETECTION_PERFECT               "Calibracion XYZ ok. Ejes X/Y perpendiculares. Felicitaciones!"
@@ -242,8 +243,7 @@
 #define MSG_FILAMENT_LOADING_T2							"Insertar filamento en el extrusor 3. Haga clic una vez terminado."
 #define MSG_FILAMENT_LOADING_T3							"Insertar filamento en el extrusor 4. Haga clic una vez terminado."
 #define MSG_CHANGE_EXTR									"Cambiar extrusor."
-#define MSG_FIL_LOADED_CHECK							"Esta cargado el filamento?"
-#define MSG_FIL_TUNING									"Rotar el mando para ajustar el filamento."
+
 #define MSG_FIL_ADJUSTING								"Ajustando filamentos. Esperar por favor."
 #define MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ				"Filamentos ajustados. Limpie la boquilla para calibracion. Haga clic una vez terminado."
 #define MSG_CALIBRATE_E									"Calibrar E"
@@ -253,4 +253,21 @@
 #define MSG_WAITING_TEMP								"Esperando enfriamiento de la cama y del extrusor."
 #define MSG_FILAMENT_CLEAN								"Es el nuevo color nitido?"
 #define MSG_UNLOADING_FILAMENT							"Soltando filamento"
-#define MSG_PAPER										"Colocar una hoja de papel sobre la superficie de impresion durante la calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar impresora inmediatamente."
+#define MSG_PAPER										"Colocar una hoja de papel sobre la superficie de impresion durante la calibracion de los primeros 4 puntos. Si la boquilla mueve el papel, apagar impresora inmediatamente."
+
+#define MSG_FINISHING_MOVEMENTS							"Term. movimientos"
+#define MSG_PRINT_PAUSED								"Impresion en pausa"
+#define MSG_RESUMING_PRINT								"Reanudar impresion"
+#define MSG_PID_EXTRUDER								"Calibracion PID"
+#define MSG_SET_TEMPERATURE								"Establecer temp.:"
+#define MSG_PID_FINISHED								"Cal. PID terminada"
+#define MSG_PID_RUNNING									"Cal. PID           "
+
+#define MSG_CALIBRATE_PINDA								"Calibrar"
+#define MSG_CALIBRATION_PINDA_MENU						"Calibracion temp."
+#define MSG_PINDA_NOT_CALIBRATED						"La temperatura de calibracion no ha sido ajustada"
+#define MSG_PINDA_PREHEAT								"Calentando PINDA"
+#define MSG_TEMP_CALIBRATION							"Cal. temp.          "
+#define MSG_TEMP_CALIBRATION_DONE						"Calibracon temperatura terminada. Presionar para continuar."
+#define MSG_TEMP_CALIBRATION_ON							"Cal. temp. [ON]"
+#define MSG_TEMP_CALIBRATION_OFF						"Cal. temp. [OFF]"

+ 17 - 2
Firmware/language_it.h

@@ -237,8 +237,7 @@
 #define MSG_FILAMENT_LOADING_T2							"Inserire filamento nell'estrusore 3. Click per continuare."
 #define MSG_FILAMENT_LOADING_T3							"Inserire filamento nell'estrusore 4. Click per continuare."
 #define MSG_CHANGE_EXTR									"Cambio estrusore."
-#define MSG_FIL_LOADED_CHECK							"Filamento caricato?"
-#define MSG_FIL_TUNING									"Girare la manopola per regolare il filamento"
+
 #define MSG_FIL_ADJUSTING								"Filamento in fase di regolazione. Attendere prego."
 #define MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ				"I filamenti sono regolati. Si prega di pulire l'ugello per la calibrazione. Click per continuare."
 #define MSG_CALIBRATE_E									"Calibra E"
@@ -250,3 +249,19 @@
 #define MSG_UNLOADING_FILAMENT							"Rilasc. filamento"
 #define MSG_PAPER										"Porre un foglio sotto l'ugello durante la calibrazione dei primi 4 punti. In caso l'ugello muova il foglio spegnere prontamente la stampante."
 
+#define MSG_FINISHING_MOVEMENTS							"Arresto in corso"
+#define MSG_PRINT_PAUSED								"Stampa in pausa"
+#define MSG_RESUMING_PRINT								"Stampa in ripresa"
+#define MSG_PID_EXTRUDER								"Calibrazione PID"
+#define MSG_SET_TEMPERATURE								"Imposta temperatura"
+#define MSG_PID_FINISHED								"Cal. PID completa"
+#define MSG_PID_RUNNING									"Cal. PID"
+
+#define MSG_CALIBRATE_PINDA								"Calibrare"
+#define MSG_CALIBRATION_PINDA_MENU						"Taratura temp."
+#define MSG_PINDA_NOT_CALIBRATED						"Taratura della temperatura non ancora eseguita"
+#define MSG_PINDA_PREHEAT								"Riscald. PINDA"
+#define MSG_TEMP_CALIBRATION							"Cal. temp.          "
+#define MSG_TEMP_CALIBRATION_DONE						"Taratura temperatura terminata. Fare click per continuare."
+#define MSG_TEMP_CALIBRATION_ON							"Cal. temp. [ON]"
+#define MSG_TEMP_CALIBRATION_OFF						"Cal. temp. [OFF]"

+ 19 - 3
Firmware/language_pl.h

@@ -248,8 +248,7 @@
 #define MSG_FILAMENT_LOADING_T2									"Wloz filament do ekstrudera 3. Potwierdz przyciskiem."
 #define MSG_FILAMENT_LOADING_T3									"Wloz filament do ekstrudera 4. Potwierdz przyciskiem."
 #define MSG_CHANGE_EXTR											"Zmienic ekstruder"
-#define MSG_FIL_LOADED_CHECK									"Czy filament jest wprowadzony?"
-#define MSG_FIL_TUNING											"Obrotem przycisku dostroj pozycje filamentu."
+
 #define MSG_FIL_ADJUSTING										"Przebiega wyrownanie filamentow. Prosze czekac."
 #define MSG_CONFIRM_NOZZLE_CLEAN_FIL_ADJ						"Dla prawidlowej kalibracji prosze oczyscic dysze. Potem potwierdzic przyciskiem."
 #define MSG_CALIBRATE_E											"Kalibruj E"
@@ -259,4 +258,21 @@
 #define MSG_WAITING_TEMP										"Oczekiwanie na wychlodzenie dyszy i podkladki."
 #define MSG_FILAMENT_CLEAN										"Czy kolor jest czysty?"
 #define MSG_UNLOADING_FILAMENT									"Wysuwam filament"
-#define MSG_PAPER												"Umiesc kartke papieru na podkladce i trzymaj pod dysza podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, wylacz drukarke."
+#define MSG_PAPER												"Umiesc kartke papieru na podkladce i trzymaj pod dysza podczas pomiaru pierwszych 4 punktow. Jesli dysza zahaczy o papier, wylacz drukarke."
+
+#define MSG_FINISHING_MOVEMENTS									"Konczenie druku"
+#define MSG_PRINT_PAUSED										"Druk zatrzymany"
+#define MSG_RESUMING_PRINT										"Wznawianie druku"
+#define MSG_PID_EXTRUDER										"Kalibracja PID"
+#define MSG_SET_TEMPERATURE										"Ustawic temperature"
+#define MSG_PID_FINISHED										"Kal. PID zakonczona"
+#define MSG_PID_RUNNING											"Kal. PID"
+
+#define MSG_CALIBRATE_PINDA										"Skalibrowac"
+#define MSG_CALIBRATION_PINDA_MENU								"Cieplna kalibr."
+#define MSG_PINDA_NOT_CALIBRATED								"Cieplna kalibracja nie byla przeprowadzona"
+#define MSG_PINDA_PREHEAT										"Grzanie PINDA"
+#define MSG_TEMP_CALIBRATION									"Ciepl. kal.         "
+#define MSG_TEMP_CALIBRATION_DONE								"Cieplna kalibracja zakonczona. Kontynuuj przyciskiem"
+#define MSG_TEMP_CALIBRATION_ON									"Ciepl. kal. [ON]"
+#define MSG_TEMP_CALIBRATION_OFF								"Ciepl. kal. [OFF]"