From 7fe1a5089960852627ef55b39fc089dc4e6c8278 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 17 Nov 2022 15:19:35 +0100
Subject: [PATCH 01/10] Inital Temp Model cal wizard

---
 Firmware/Configuration.h |  7 ++++++-
 Firmware/Marlin_main.cpp | 11 +++++++++++
 Firmware/ultralcd.cpp    | 31 +++++++++++++++++++++++++++----
 Firmware/ultralcd.h      |  3 +++
 4 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index fbae1ecd..1a221038 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -545,7 +545,12 @@ enum CalibrationStatus
 	// For the wizard: factory assembled, needs to run Z calibration.
 	CALIBRATION_STATUS_Z_CALIBRATION = 240,
 
-	// The XYZ calibration has been performed, now it remains to run the V2Calibration.gcode.
+#ifdef TEMP_MODEL
+	// The XYZ calibration has been performed, needs to run Temp model calibration.
+	CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION = 235,
+#endif //TEMP_MODEL
+
+// The XYZ calibration AND OR Temp model calibartion has been performed, now it remains to run the V2Calibration.gcode.
 	CALIBRATION_STATUS_LIVE_ADJUST = 230,
 
     // Calibrated, ready to print.
diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 23d8d10c..3500fef1 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1547,6 +1547,12 @@ void setup()
 		  // Show the message.
 		  lcd_show_fullscreen_message_and_wait_P(_T(MSG_FOLLOW_CALIBRATION_FLOW));
 	  }
+#ifdef TEMP_MODEL
+	  else if (calibration_status() == CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION) {
+		  lcd_show_fullscreen_message_and_wait_P(_i("Temp model calibration not calibrated yet."));////MSG_TEMP_MODEL_NOT_CAL c=20 c=4
+		  lcd_update_enable(true);
+	  }
+#endif //TEMP_MODEL
 	  else if (calibration_status() == CALIBRATION_STATUS_LIVE_ADJUST) {
 		  // Show the message.
 		  lcd_show_fullscreen_message_and_wait_P(_T(MSG_BABYSTEP_Z_NOT_SET));
@@ -3406,9 +3412,14 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 				lcd_bed_calibration_show_result(result, point_too_far_mask);
 				if (result >= 0)
 				{
+#ifdef TEMP_MODEL
+					calibration_status_store(CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION);
+					if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) != 1) lcd_show_fullscreen_message_and_wait_P(_i("Temp model calibration not calibrated yet."));
+#else
 					// Calibration valid, the machine should be able to print. Advise the user to run the V2Calibration.gcode.
 					calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
 					if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) != 1) lcd_show_fullscreen_message_and_wait_P(_T(MSG_BABYSTEP_Z_NOT_SET));
+#endif //TEMP_MODEL
 					final_result = true;
 				}
 			}
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 1fa915d9..4210c664 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1056,8 +1056,12 @@ void lcd_commands()
         //if (lcd_commands_step == 1 && calibrated()) {
         if (lcd_commands_step == 1 && temp_model_valid()) {
             enquecommand_P(PSTR("M500"));
-            lcd_commands_step = 0;
-            lcd_commands_type = LcdCommands::Idle;
+            if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
+                lcd_wizard(WizState::IsFil);
+            } else {
+                lcd_commands_step = 0;
+                lcd_commands_type = LcdCommands::Idle;
+            }
         }
     }
 #endif //TEMP_MODEL
@@ -4077,6 +4081,9 @@ void lcd_wizard(WizState state)
 			case CALIBRATION_STATUS_ASSEMBLED: state = S::Selftest; break; //run selftest
 			case CALIBRATION_STATUS_XYZ_CALIBRATION: state = S::Xyz; break; //run xyz cal.
 			case CALIBRATION_STATUS_Z_CALIBRATION: state = S::Z; break; //run z cal.
+#ifdef TEMP_MODEL
+			case CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION: state = S::TempModel; break; //run temp model cal.
+#endif //TEMP_MODEL
 			case CALIBRATION_STATUS_LIVE_ADJUST: state = S::IsFil; break; //run live adjust
 			case CALIBRATION_STATUS_CALIBRATED: end = true; eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 0); break;
 			default: state = S::Selftest; break; //if calibration status is unknown, run wizard from the beginning
@@ -4094,8 +4101,13 @@ void lcd_wizard(WizState state)
 		case S::Xyz:
 			lcd_show_fullscreen_message_and_wait_P(_i("I will run xyz calibration now. It will take approx. 12 mins."));////MSG_WIZARD_XYZ_CAL c=20 r=8
 			wizard_event = gcode_M45(false, 0);
-			if (wizard_event) state = S::IsFil;
-			else end = true;
+			if (wizard_event) {
+#ifdef TEMP_MODEL
+			state = S::TempModel;
+#else
+			state = S::IsFil;
+#endif //TEMP_MODEL
+			} else end = true;
 			break;
 		case S::Z:
 			lcd_show_fullscreen_message_and_wait_P(_i("Please remove shipping helpers first."));////MSG_REMOVE_SHIPPING_HELPERS c=20 r=3
@@ -4119,6 +4131,13 @@ void lcd_wizard(WizState state)
 			}
 			else end = true;
 			break;
+#ifdef TEMP_MODEL
+		case S::TempModel:
+			lcd_show_fullscreen_message_and_wait_P(_i("Temp model cal. takes apporx. 12 mins."));////MSG_TM_CAL c=20 r=4
+			lcd_commands_type = LcdCommands::TempModel;
+			end = true; // Leave wizard temporarily for Temp model cal.
+			break;
+#endif //TEMP_MODEL
 		case S::IsFil:
 		    //start to preheat nozzle and bed to save some time later
 			setTargetHotend(PLA_PREHEAT_HOTEND_TEMP, 0);
@@ -4195,6 +4214,10 @@ void lcd_wizard(WizState state)
 	case S::Z: //z cal.
 		msg = _T(MSG_WIZARD_CALIBRATION_FAILED);
 		break;
+#ifdef TEMP_MODEL
+	case S::TempModel: //Temp model calibration
+//		break;
+#endif //TEMP_MODEL
 	case S::Finish: //we are finished
 
 		msg = _T(MSG_WIZARD_DONE);
diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h
index ef89dcca..af9b6f8c 100755
--- a/Firmware/ultralcd.h
+++ b/Firmware/ultralcd.h
@@ -224,6 +224,9 @@ enum class WizState : uint8_t
     Selftest,       //!< self test
     Xyz,            //!< xyz calibration
     Z,              //!< z calibration
+#ifdef TEMP_MODEL
+    TempModel,      //!< Temp model calibration
+#endif //TEMP_MODEL
     IsFil,          //!< Is filament loaded? First step of 1st layer calibration
     PreheatPla,     //!< waiting for preheat nozzle for PLA
     Preheat,        //!< Preheat for any material

From 7e9d9ade5cc797c01c9178aea87fef7fc565207e Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Thu, 17 Nov 2022 23:03:03 +0100
Subject: [PATCH 02/10] Fix wizard serial messages

---
 Firmware/ultralcd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 4210c664..33ec5f8e 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4047,7 +4047,7 @@ void lcd_wizard(WizState state)
     FORCE_BL_ON_START;
 	
     while (!end) {
-		printf_P(PSTR("Wizard state: %d\n"), state);
+		printf_P(PSTR("Wizard state: %d\n"), (uint8_t)state);
 		switch (state) {
 		case S::Run: //Run wizard?
 			
@@ -4204,7 +4204,7 @@ void lcd_wizard(WizState state)
     
     FORCE_BL_ON_END;
     
-	printf_P(_N("Wizard end state: %d\n"), state);
+	printf_P(_N("Wizard end state: %d\n"), (uint8_t)state);
 	switch (state) { //final message
 	case S::Restore: //printer was already calibrated
 		msg = _T(MSG_WIZARD_DONE);

From 0f70665e4466674c7233f005980298908518f57c Mon Sep 17 00:00:00 2001
From: Alex Voinea <voinea.dragos.alexandru@gmail.com>
Date: Fri, 18 Nov 2022 00:18:42 +0100
Subject: [PATCH 03/10] XYZ calibration fixes

---
 Firmware/ultralcd.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 33ec5f8e..f05ab419 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1055,12 +1055,11 @@ void lcd_commands()
         }
         //if (lcd_commands_step == 1 && calibrated()) {
         if (lcd_commands_step == 1 && temp_model_valid()) {
+            lcd_commands_step = 0;
+            lcd_commands_type = LcdCommands::Idle;
             enquecommand_P(PSTR("M500"));
             if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) == 1) {
                 lcd_wizard(WizState::IsFil);
-            } else {
-                lcd_commands_step = 0;
-                lcd_commands_type = LcdCommands::Idle;
             }
         }
     }
@@ -4038,8 +4037,12 @@ void lcd_wizard(WizState state)
 {
     using S = WizState;
 	bool end = false;
+<<<<<<< HEAD
 	int8_t wizard_event;
 	const char *msg = NULL;
+=======
+	uint8_t wizard_event;
+>>>>>>> b147fcee (XYZ calibration fixes)
 	// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
 	// other than WizState::Run - it is useful for debugging wizard.
 	if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);
@@ -4204,6 +4207,7 @@ void lcd_wizard(WizState state)
     
     FORCE_BL_ON_END;
     
+    const char *msg = NULL;
 	printf_P(_N("Wizard end state: %d\n"), (uint8_t)state);
 	switch (state) { //final message
 	case S::Restore: //printer was already calibrated
@@ -4216,23 +4220,23 @@ void lcd_wizard(WizState state)
 		break;
 #ifdef TEMP_MODEL
 	case S::TempModel: //Temp model calibration
-//		break;
+		break;
 #endif //TEMP_MODEL
 	case S::Finish: //we are finished
-
 		msg = _T(MSG_WIZARD_DONE);
 		lcd_reset_alert_level();
 		lcd_setstatuspgm(MSG_WELCOME);
 		lcd_return_to_status(); 
 		break;
-
+    case S::Preheat:
+    case S::Lay1CalCold:
+    case S::Lay1CalHot:
+        break;
 	default:
 		msg = _T(MSG_WIZARD_QUIT);
 		break;
-
 	}
-	if (!((S::Lay1CalCold == state) || (S::Lay1CalHot == state) || (S::Preheat == state)))
-	{
+	if (msg) {
 		lcd_show_fullscreen_message_and_wait_P(msg);
 	}
 	lcd_update_enable(true);

From f8edad2fba3f0873b7df63d823a5adeb08a177de Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sun, 20 Nov 2022 10:48:49 +0100
Subject: [PATCH 04/10] Unhack selftest hack during wizard

---
 Firmware/ultralcd.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f05ab419..f61cc58c 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4106,6 +4106,7 @@ void lcd_wizard(WizState state)
 			wizard_event = gcode_M45(false, 0);
 			if (wizard_event) {
 #ifdef TEMP_MODEL
+			lcd_reset_alert_level();
 			state = S::TempModel;
 #else
 			state = S::IsFil;

From 6e330c11a7d5660d7f98a24a5d4ce1ff9e93902a Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sun, 20 Nov 2022 10:49:46 +0100
Subject: [PATCH 05/10] Update Temp Model messages Deepl translate
 cs,de,es,fr,it,nl,pl

---
 Firmware/Marlin_main.cpp |  4 ++--
 Firmware/messages.cpp    |  1 +
 Firmware/messages.h      |  1 +
 lang/po/Firmware.pot     | 11 +++++++++++
 lang/po/Firmware_cs.po   | 11 +++++++++++
 lang/po/Firmware_da.po   | 11 +++++++++++
 lang/po/Firmware_de.po   | 11 +++++++++++
 lang/po/Firmware_es.po   | 11 +++++++++++
 lang/po/Firmware_fr.po   | 11 +++++++++++
 lang/po/Firmware_hr.po   | 11 +++++++++++
 lang/po/Firmware_hu.po   | 11 +++++++++++
 lang/po/Firmware_it.po   | 11 +++++++++++
 lang/po/Firmware_lb.po   | 11 +++++++++++
 lang/po/Firmware_lt.po   | 11 +++++++++++
 lang/po/Firmware_nl.po   | 11 +++++++++++
 lang/po/Firmware_no.po   | 11 +++++++++++
 lang/po/Firmware_pl.po   | 11 +++++++++++
 lang/po/Firmware_ro.po   | 11 +++++++++++
 lang/po/Firmware_sk.po   | 11 +++++++++++
 lang/po/Firmware_sl.po   | 11 +++++++++++
 lang/po/Firmware_sv.po   | 11 +++++++++++
 21 files changed, 202 insertions(+), 2 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 3500fef1..835cb89b 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1549,7 +1549,7 @@ void setup()
 	  }
 #ifdef TEMP_MODEL
 	  else if (calibration_status() == CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION) {
-		  lcd_show_fullscreen_message_and_wait_P(_i("Temp model calibration not calibrated yet."));////MSG_TEMP_MODEL_NOT_CAL c=20 c=4
+		  lcd_show_fullscreen_message_and_wait_P(_T(MSG_TM_NOT_CAL));
 		  lcd_update_enable(true);
 	  }
 #endif //TEMP_MODEL
@@ -3414,7 +3414,7 @@ bool gcode_M45(bool onlyZ, int8_t verbosity_level)
 				{
 #ifdef TEMP_MODEL
 					calibration_status_store(CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION);
-					if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) != 1) lcd_show_fullscreen_message_and_wait_P(_i("Temp model calibration not calibrated yet."));
+					if (eeprom_read_byte((uint8_t*)EEPROM_WIZARD_ACTIVE) != 1) lcd_show_fullscreen_message_and_wait_P(_T(MSG_TM_NOT_CAL));
 #else
 					// Calibration valid, the machine should be able to print. Advise the user to run the V2Calibration.gcode.
 					calibration_status_store(CALIBRATION_STATUS_LIVE_ADJUST);
diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
index 30898881..54bf4adc 100644
--- a/Firmware/messages.cpp
+++ b/Firmware/messages.cpp
@@ -164,6 +164,7 @@ const char MSG_IR_UNKNOWN[] PROGMEM_I1 = ISTR("unknown state");////MSG_IR_UNKNOW
 extern const char MSG_PAUSED_THERMAL_ERROR[] PROGMEM_I1 = ISTR("PAUSED THERMAL ERROR");////MSG_PAUSED_THERMAL_ERROR c=20
 #ifdef TEMP_MODEL
 extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");////MSG_THERMAL_ANOMALY c=20
+extern const char MSG_TM_NOT_CAL[] PROGMEM_I1 = ISTR("Temp model not calibrated yet.");////MSG_TM_NOT_CAL c=20 r=4
 #endif
 
 //not internationalized messages
diff --git a/Firmware/messages.h b/Firmware/messages.h
index 2c701534..a0cfd2e1 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -168,6 +168,7 @@ extern const char MSG_IR_UNKNOWN[];
 extern const char MSG_PAUSED_THERMAL_ERROR[];
 #ifdef TEMP_MODEL
 extern const char MSG_THERMAL_ANOMALY[];
+extern const char MSG_TM_NOT_CAL[];
 #endif
 
 //not internationalized messages
diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
index 5578f336..e8cc1362 100644
--- a/lang/po/Firmware.pot
+++ b/lang/po/Firmware.pot
@@ -1720,6 +1720,17 @@ msgstr ""
 msgid "THERMAL ANOMALY"
 msgstr ""
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
index aaa8d171..79d7533a 100644
--- a/lang/po/Firmware_cs.po
+++ b/lang/po/Firmware_cs.po
@@ -1780,6 +1780,17 @@ msgstr "Prohozene"
 msgid "THERMAL ANOMALY"
 msgstr "TEPLOTNI VYJIMKA"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "Kalkulace teplotního modelu trvá přibližně. 12 minut."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Teplotní model zatím nebyl kalibrován."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po
index 0620c7ce..6181b597 100644
--- a/lang/po/Firmware_da.po
+++ b/lang/po/Firmware_da.po
@@ -1731,6 +1731,17 @@ msgstr ""
 msgid "THERMAL ANOMALY"
 msgstr ""
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
index 5cd08f2f..36813f8c 100644
--- a/lang/po/Firmware_de.po
+++ b/lang/po/Firmware_de.po
@@ -1794,6 +1794,17 @@ msgstr "Ausgetauscht"
 msgid "THERMAL ANOMALY"
 msgstr "THERMISCHE ANOMALIE"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "Die Kalibrierung des Temperaturmodells dauert etwa 12 Minuten."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Das Temperaturmodell ist noch nicht kalibriert."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
index ffa9bb74..e4e17fd4 100644
--- a/lang/po/Firmware_es.po
+++ b/lang/po/Firmware_es.po
@@ -1797,6 +1797,17 @@ msgstr "Intercambiado"
 msgid "THERMAL ANOMALY"
 msgstr "ANOMALIA TERMICA"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "La calibración del modelo de temperatura tarda aprox. 12 minutos."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "El modelo de temperatura aún no está calibrado."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
index b4cd2b05..f9f85898 100644
--- a/lang/po/Firmware_fr.po
+++ b/lang/po/Firmware_fr.po
@@ -1800,6 +1800,17 @@ msgstr "Echange"
 msgid "THERMAL ANOMALY"
 msgstr "ANOMALIE THERMIQUE"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "L'étalonnage du modèle de température prend environ 12 minutes."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Le modèle de température n'est pas encore calibré."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
index a180a23a..cecd48ac 100644
--- a/lang/po/Firmware_hr.po
+++ b/lang/po/Firmware_hr.po
@@ -1787,6 +1787,17 @@ msgstr "Zamjenjeno"
 msgid "THERMAL ANOMALY"
 msgstr "TERMALNA ANOMALIJA"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
index 784b9489..b9aa55c0 100644
--- a/lang/po/Firmware_hu.po
+++ b/lang/po/Firmware_hu.po
@@ -1789,6 +1789,17 @@ msgstr "Felcserelve"
 msgid "THERMAL ANOMALY"
 msgstr "Homersekl. anomalia"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
index efdefcb0..6c3ed58b 100644
--- a/lang/po/Firmware_it.po
+++ b/lang/po/Firmware_it.po
@@ -1790,6 +1790,17 @@ msgstr "Scambiato"
 msgid "THERMAL ANOMALY"
 msgstr "ANOMALIA TERMICA"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "La calibrazione del modello di temperatura richiede circa 12 minuti."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Modello di temperatura non ancora calibrato."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po
index 571d9607..58e575a2 100644
--- a/lang/po/Firmware_lb.po
+++ b/lang/po/Firmware_lb.po
@@ -1731,6 +1731,17 @@ msgstr ""
 msgid "THERMAL ANOMALY"
 msgstr ""
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po
index 0b863189..eb72e791 100644
--- a/lang/po/Firmware_lt.po
+++ b/lang/po/Firmware_lt.po
@@ -1731,6 +1731,17 @@ msgstr ""
 msgid "THERMAL ANOMALY"
 msgstr ""
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
index 7801321b..9c15b4db 100644
--- a/lang/po/Firmware_nl.po
+++ b/lang/po/Firmware_nl.po
@@ -1796,6 +1796,17 @@ msgstr "Gewisseld"
 msgid "THERMAL ANOMALY"
 msgstr "THERMISCHE ANOMALIE"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "Kalibratie van het tempmodel duurt ongeveer. 12 minuten."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Temp model nog niet gekalibreerd."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
index 9cbd9a7a..e513a2d5 100644
--- a/lang/po/Firmware_no.po
+++ b/lang/po/Firmware_no.po
@@ -1771,6 +1771,17 @@ msgstr "Byttet"
 msgid "THERMAL ANOMALY"
 msgstr "THERMISK ANOMALI"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
index 69a57a73..fd7cfb7d 100644
--- a/lang/po/Firmware_pl.po
+++ b/lang/po/Firmware_pl.po
@@ -1785,6 +1785,17 @@ msgstr "Zamieniono"
 msgid "THERMAL ANOMALY"
 msgstr "THERMAL ANOMALY"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr "Kalibracja modelu temperatury trwa ok. 12 minut."
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr "Model temperatury jeszcze nie skalibrowany."
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
index cabc78fa..0b712f49 100644
--- a/lang/po/Firmware_ro.po
+++ b/lang/po/Firmware_ro.po
@@ -1787,6 +1787,17 @@ msgstr "inversate"
 msgid "THERMAL ANOMALY"
 msgstr "ANOMALIE TERMICA"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
index 96effa88..1deec7ba 100644
--- a/lang/po/Firmware_sk.po
+++ b/lang/po/Firmware_sk.po
@@ -1779,6 +1779,17 @@ msgstr "Prehodene"
 msgid "THERMAL ANOMALY"
 msgstr "THERMAL ANOMALY"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po
index 3e3c5cc4..1ed29fd0 100644
--- a/lang/po/Firmware_sl.po
+++ b/lang/po/Firmware_sl.po
@@ -1731,6 +1731,17 @@ msgstr ""
 msgid "THERMAL ANOMALY"
 msgstr ""
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"
diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
index 03639995..c0775a16 100644
--- a/lang/po/Firmware_sv.po
+++ b/lang/po/Firmware_sv.po
@@ -1788,6 +1788,17 @@ msgstr "Utbytt"
 msgid "THERMAL ANOMALY"
 msgstr "TERMISK ANOMALI"
 
+#. MSG_TM_CAL c=20 r=4
+#: ../../Firmware/ultralcd.cpp:4054
+msgid "Temp model cal. takes apporx. 12 mins."
+msgstr ""
+
+#. MSG_TM_NOT_CAL c=20 r=4
+#: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
+#: ../../Firmware/messages.cpp:170
+msgid "Temp model not calibrated yet."
+msgstr ""
+
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
 msgid "Temperature"

From 696117e73bda03b97431440b310cc04006e74b24 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Sun, 20 Nov 2022 11:14:06 +0100
Subject: [PATCH 06/10] Fix cherry-pick

---
 Firmware/ultralcd.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index f61cc58c..49a14913 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4037,12 +4037,7 @@ void lcd_wizard(WizState state)
 {
     using S = WizState;
 	bool end = false;
-<<<<<<< HEAD
-	int8_t wizard_event;
-	const char *msg = NULL;
-=======
 	uint8_t wizard_event;
->>>>>>> b147fcee (XYZ calibration fixes)
 	// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
 	// other than WizState::Run - it is useful for debugging wizard.
 	if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);

From 6d7d5d4ef3c262e7a033c3f90348b65d950d6b2c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Tue, 22 Nov 2022 08:26:20 +0100
Subject: [PATCH 07/10] Fix typo Add Norwegian translations thanks to @OS-kar

---
 Firmware/ultralcd.cpp  | 2 +-
 lang/po/Firmware.pot   | 2 +-
 lang/po/Firmware_cs.po | 2 +-
 lang/po/Firmware_da.po | 2 +-
 lang/po/Firmware_de.po | 2 +-
 lang/po/Firmware_es.po | 2 +-
 lang/po/Firmware_fr.po | 2 +-
 lang/po/Firmware_hr.po | 2 +-
 lang/po/Firmware_hu.po | 2 +-
 lang/po/Firmware_it.po | 2 +-
 lang/po/Firmware_lb.po | 2 +-
 lang/po/Firmware_lt.po | 2 +-
 lang/po/Firmware_nl.po | 2 +-
 lang/po/Firmware_no.po | 6 +++---
 lang/po/Firmware_pl.po | 2 +-
 lang/po/Firmware_ro.po | 2 +-
 lang/po/Firmware_sk.po | 2 +-
 lang/po/Firmware_sl.po | 2 +-
 lang/po/Firmware_sv.po | 2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 49a14913..3aa9b58d 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -4132,7 +4132,7 @@ void lcd_wizard(WizState state)
 			break;
 #ifdef TEMP_MODEL
 		case S::TempModel:
-			lcd_show_fullscreen_message_and_wait_P(_i("Temp model cal. takes apporx. 12 mins."));////MSG_TM_CAL c=20 r=4
+			lcd_show_fullscreen_message_and_wait_P(_i("Temp model cal. takes approx. 12 mins."));////MSG_TM_CAL c=20 r=4
 			lcd_commands_type = LcdCommands::TempModel;
 			end = true; // Leave wizard temporarily for Temp model cal.
 			break;
diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
index e8cc1362..7463824a 100644
--- a/lang/po/Firmware.pot
+++ b/lang/po/Firmware.pot
@@ -1722,7 +1722,7 @@ msgstr ""
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
index 79d7533a..008b6ead 100644
--- a/lang/po/Firmware_cs.po
+++ b/lang/po/Firmware_cs.po
@@ -1782,7 +1782,7 @@ msgstr "TEPLOTNI VYJIMKA"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "Kalkulace teplotního modelu trvá přibližně. 12 minut."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po
index 6181b597..73ceec5d 100644
--- a/lang/po/Firmware_da.po
+++ b/lang/po/Firmware_da.po
@@ -1733,7 +1733,7 @@ msgstr ""
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
index 36813f8c..531d2df5 100644
--- a/lang/po/Firmware_de.po
+++ b/lang/po/Firmware_de.po
@@ -1796,7 +1796,7 @@ msgstr "THERMISCHE ANOMALIE"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "Die Kalibrierung des Temperaturmodells dauert etwa 12 Minuten."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
index e4e17fd4..76665dae 100644
--- a/lang/po/Firmware_es.po
+++ b/lang/po/Firmware_es.po
@@ -1799,7 +1799,7 @@ msgstr "ANOMALIA TERMICA"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "La calibración del modelo de temperatura tarda aprox. 12 minutos."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
index f9f85898..f4c3dea9 100644
--- a/lang/po/Firmware_fr.po
+++ b/lang/po/Firmware_fr.po
@@ -1802,7 +1802,7 @@ msgstr "ANOMALIE THERMIQUE"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "L'étalonnage du modèle de température prend environ 12 minutes."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
index cecd48ac..d2e1b60b 100644
--- a/lang/po/Firmware_hr.po
+++ b/lang/po/Firmware_hr.po
@@ -1789,7 +1789,7 @@ msgstr "TERMALNA ANOMALIJA"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
index b9aa55c0..3a776319 100644
--- a/lang/po/Firmware_hu.po
+++ b/lang/po/Firmware_hu.po
@@ -1791,7 +1791,7 @@ msgstr "Homersekl. anomalia"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
index 6c3ed58b..7cbddad2 100644
--- a/lang/po/Firmware_it.po
+++ b/lang/po/Firmware_it.po
@@ -1792,7 +1792,7 @@ msgstr "ANOMALIA TERMICA"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "La calibrazione del modello di temperatura richiede circa 12 minuti."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po
index 58e575a2..c101b520 100644
--- a/lang/po/Firmware_lb.po
+++ b/lang/po/Firmware_lb.po
@@ -1733,7 +1733,7 @@ msgstr ""
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po
index eb72e791..552276fe 100644
--- a/lang/po/Firmware_lt.po
+++ b/lang/po/Firmware_lt.po
@@ -1733,7 +1733,7 @@ msgstr ""
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
index 9c15b4db..0fec6fbe 100644
--- a/lang/po/Firmware_nl.po
+++ b/lang/po/Firmware_nl.po
@@ -1798,7 +1798,7 @@ msgstr "THERMISCHE ANOMALIE"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "Kalibratie van het tempmodel duurt ongeveer. 12 minuten."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
index e513a2d5..07ccb30c 100644
--- a/lang/po/Firmware_no.po
+++ b/lang/po/Firmware_no.po
@@ -1773,14 +1773,14 @@ msgstr "THERMISK ANOMALI"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
-msgstr ""
+msgid "Temp model cal. takes approx. 12 mins."
+msgstr "Temp modell kal. tar omtrent 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "Temp modell ikke kalibrert enda."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
index fd7cfb7d..ff7b7524 100644
--- a/lang/po/Firmware_pl.po
+++ b/lang/po/Firmware_pl.po
@@ -1787,7 +1787,7 @@ msgstr "THERMAL ANOMALY"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr "Kalibracja modelu temperatury trwa ok. 12 minut."
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
index 0b712f49..633503a7 100644
--- a/lang/po/Firmware_ro.po
+++ b/lang/po/Firmware_ro.po
@@ -1789,7 +1789,7 @@ msgstr "ANOMALIE TERMICA"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
index 1deec7ba..67ce287a 100644
--- a/lang/po/Firmware_sk.po
+++ b/lang/po/Firmware_sk.po
@@ -1781,7 +1781,7 @@ msgstr "THERMAL ANOMALY"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po
index 1ed29fd0..fa95d8d3 100644
--- a/lang/po/Firmware_sl.po
+++ b/lang/po/Firmware_sl.po
@@ -1733,7 +1733,7 @@ msgstr ""
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4
diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
index c0775a16..4a758201 100644
--- a/lang/po/Firmware_sv.po
+++ b/lang/po/Firmware_sv.po
@@ -1790,7 +1790,7 @@ msgstr "TERMISK ANOMALI"
 
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
-msgid "Temp model cal. takes apporx. 12 mins."
+msgid "Temp model cal. takes approx. 12 mins."
 msgstr ""
 
 #. MSG_TM_NOT_CAL c=20 r=4

From 2a7f75c2c35e7e78125df5ffa99906d8c6677b95 Mon Sep 17 00:00:00 2001
From: "D.R.racer" <drracer@drracer.eu>
Date: Tue, 22 Nov 2022 08:35:27 +0100
Subject: [PATCH 08/10] Update CS translation

---
 lang/po/Firmware_cs.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
index 008b6ead..77ecb9a1 100644
--- a/lang/po/Firmware_cs.po
+++ b/lang/po/Firmware_cs.po
@@ -1783,7 +1783,7 @@ msgstr "TEPLOTNI VYJIMKA"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "Kalkulace teplotního modelu trvá přibližně. 12 minut."
+msgstr "Kalibrace teplotního modelu trvá asi 12 minut."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404

From ac55c103a46728f9f52eb84a93624a199b6a67ff Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Thu, 24 Nov 2022 10:53:04 +0100
Subject: [PATCH 09/10] Update internal translations Fix typo

---
 Firmware/Configuration.h | 2 +-
 lang/po/Firmware_de.po   | 4 ++--
 lang/po/Firmware_es.po   | 4 ++--
 lang/po/Firmware_fr.po   | 4 ++--
 lang/po/Firmware_it.po   | 4 ++--
 lang/po/Firmware_nl.po   | 4 ++--
 lang/po/Firmware_pl.po   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h
index 1a221038..4d286a23 100644
--- a/Firmware/Configuration.h
+++ b/Firmware/Configuration.h
@@ -550,7 +550,7 @@ enum CalibrationStatus
 	CALIBRATION_STATUS_TEMP_MODEL_CALIBRATION = 235,
 #endif //TEMP_MODEL
 
-// The XYZ calibration AND OR Temp model calibartion has been performed, now it remains to run the V2Calibration.gcode.
+// The XYZ calibration AND OR Temp model calibration has been performed, now it remains to run the V2Calibration.gcode.
 	CALIBRATION_STATUS_LIVE_ADJUST = 230,
 
     // Calibrated, ready to print.
diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
index 531d2df5..e864fe27 100644
--- a/lang/po/Firmware_de.po
+++ b/lang/po/Firmware_de.po
@@ -1797,13 +1797,13 @@ msgstr "THERMISCHE ANOMALIE"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "Die Kalibrierung des Temperaturmodells dauert etwa 12 Minuten."
+msgstr "Tempmodell Kal. benötigt ca. 12 Min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "Das Temperaturmodell ist noch nicht kalibriert."
+msgstr "Tempmodell noch unkalibriert."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
index 76665dae..a0275d5b 100644
--- a/lang/po/Firmware_es.po
+++ b/lang/po/Firmware_es.po
@@ -1800,13 +1800,13 @@ msgstr "ANOMALIA TERMICA"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "La calibración del modelo de temperatura tarda aprox. 12 minutos."
+msgstr "Cal. modelo temp. tarda 12 mins. aprox."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "El modelo de temperatura aún no está calibrado."
+msgstr "Modelo temp. todavia sin cal."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
index f4c3dea9..2cc66596 100644
--- a/lang/po/Firmware_fr.po
+++ b/lang/po/Firmware_fr.po
@@ -1803,13 +1803,13 @@ msgstr "ANOMALIE THERMIQUE"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "L'étalonnage du modèle de température prend environ 12 minutes."
+msgstr "Cal. du modele temp. dure env. 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "Le modèle de température n'est pas encore calibré."
+msgstr "Modele de temp. non calibre."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
index 7cbddad2..db24fba7 100644
--- a/lang/po/Firmware_it.po
+++ b/lang/po/Firmware_it.po
@@ -1793,13 +1793,13 @@ msgstr "ANOMALIA TERMICA"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "La calibrazione del modello di temperatura richiede circa 12 minuti."
+msgstr "Calib mod temp richiede circa 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "Modello di temperatura non ancora calibrato."
+msgstr "Modello temp non calibrato."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
index 0fec6fbe..4319efda 100644
--- a/lang/po/Firmware_nl.po
+++ b/lang/po/Firmware_nl.po
@@ -1799,13 +1799,13 @@ msgstr "THERMISCHE ANOMALIE"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "Kalibratie van het tempmodel duurt ongeveer. 12 minuten."
+msgstr "Temp model kal. duurt ongeveer 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "Temp model nog niet gekalibreerd."
+msgstr "Temp model nog ongekalibreerd."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
index ff7b7524..e7bbfcf3 100644
--- a/lang/po/Firmware_pl.po
+++ b/lang/po/Firmware_pl.po
@@ -1788,13 +1788,13 @@ msgstr "THERMAL ANOMALY"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr "Kalibracja modelu temperatury trwa ok. 12 minut."
+msgstr "Kal. modelu temp. moze zajac ok. 12min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr "Model temperatury jeszcze nie skalibrowany."
+msgstr "Model temp. nie zostal skalib."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816

From 7ca4d73d4a82381af761872fa3229f417365177c Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Wed, 30 Nov 2022 07:59:27 +0100
Subject: [PATCH 10/10] Updated community languages Thanks to @ingbrzy
 @shatter136 @Hauzman

---
 lang/po/Firmware_hr.po | 4 ++--
 lang/po/Firmware_hu.po | 4 ++--
 lang/po/Firmware_ro.po | 4 ++--
 lang/po/Firmware_sk.po | 4 ++--
 lang/po/Firmware_sv.po | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
index d2e1b60b..caa7f596 100644
--- a/lang/po/Firmware_hr.po
+++ b/lang/po/Firmware_hr.po
@@ -1790,13 +1790,13 @@ msgstr "TERMALNA ANOMALIJA"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr ""
+msgstr "Temp model kal. traje cca. 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "Temp model još nije kalibriran."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
index 3a776319..6df7d38e 100644
--- a/lang/po/Firmware_hu.po
+++ b/lang/po/Firmware_hu.po
@@ -1792,13 +1792,13 @@ msgstr "Homersekl. anomalia"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr ""
+msgstr "Hőmérsékleti modell kal. kb. 12 percet."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "A hőmérsékleti modell még nincs kalibrálva."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
index 633503a7..946d7af4 100644
--- a/lang/po/Firmware_ro.po
+++ b/lang/po/Firmware_ro.po
@@ -1790,13 +1790,13 @@ msgstr "ANOMALIE TERMICA"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr ""
+msgstr "Cal. Model de temp dureaza aprox. 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "Modelul de temp. nu este inca calibrat."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
index 67ce287a..ad39380a 100644
--- a/lang/po/Firmware_sk.po
+++ b/lang/po/Firmware_sk.po
@@ -1782,13 +1782,13 @@ msgstr "THERMAL ANOMALY"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr ""
+msgstr "Výpočet teplotného modelu trvá približne 12 minút."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "Teplotný model zatiaľ nebol kalibrovaný"
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816
diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
index 4a758201..e2bcaf6d 100644
--- a/lang/po/Firmware_sv.po
+++ b/lang/po/Firmware_sv.po
@@ -1791,13 +1791,13 @@ msgstr "TERMISK ANOMALI"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Temp model cal. takes approx. 12 mins."
-msgstr ""
+msgstr "Temp modell kal. tar ca. 12 min."
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404
 #: ../../Firmware/messages.cpp:170
 msgid "Temp model not calibrated yet."
-msgstr ""
+msgstr "Temp-modellen är inte kalibrerad ännu."
 
 #. MSG_TEMPERATURE c=18
 #: ../../Firmware/ultralcd.cpp:4816