From 162ab4538f04d602bc7c54cd6a54f5f4cfdf3d22 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Mon, 17 Oct 2022 13:49:18 +0200
Subject: [PATCH 1/2] rename `Extruder fan` to `Hotend fan`

Fix cherry-pick issues
---
 Firmware/Marlin_main.cpp  |  2 +-
 Firmware/fancheck.cpp     | 10 +++++-----
 Firmware/messages.cpp     | 10 +++++-----
 Firmware/messages.h       |  6 +++---
 Firmware/pins_Rambo_1_0.h |  2 +-
 Firmware/pins_Rambo_1_3.h |  2 +-
 Firmware/temperature.cpp  |  2 +-
 Firmware/ultralcd.cpp     | 34 +++++++++++++++++-----------------
 lang/po/Firmware.pot      | 20 ++++++++++----------
 lang/po/Firmware_cs.po    | 22 +++++++++++-----------
 lang/po/Firmware_da.po    | 20 ++++++++++----------
 lang/po/Firmware_de.po    | 22 +++++++++++-----------
 lang/po/Firmware_es.po    | 22 +++++++++++-----------
 lang/po/Firmware_fr.po    | 22 +++++++++++-----------
 lang/po/Firmware_hr.po    | 22 +++++++++++-----------
 lang/po/Firmware_hu.po    | 22 +++++++++++-----------
 lang/po/Firmware_it.po    | 22 +++++++++++-----------
 lang/po/Firmware_lb.po    | 20 ++++++++++----------
 lang/po/Firmware_lt.po    | 20 ++++++++++----------
 lang/po/Firmware_nl.po    | 22 +++++++++++-----------
 lang/po/Firmware_no.po    | 24 ++++++++++++------------
 lang/po/Firmware_pl.po    | 22 +++++++++++-----------
 lang/po/Firmware_ro.po    | 22 +++++++++++-----------
 lang/po/Firmware_sk.po    | 22 +++++++++++-----------
 lang/po/Firmware_sl.po    | 20 ++++++++++----------
 lang/po/Firmware_sv.po    | 22 +++++++++++-----------
 26 files changed, 228 insertions(+), 228 deletions(-)

diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp
index 7824706eacb6..23d8d10c49a6 100644
--- a/Firmware/Marlin_main.cpp
+++ b/Firmware/Marlin_main.cpp
@@ -1266,7 +1266,7 @@ void setup()
     temp_mgr_init();
 
 #ifdef EXTRUDER_ALTFAN_DETECT
-	SERIAL_ECHORPGM(_n("Extruder fan type: "));
+	SERIAL_ECHORPGM(_n("Hotend fan type: "));
 	if (extruder_altfan_detect())
 		SERIAL_ECHOLNRPGM(PSTR("ALTFAN"));
 	else
diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp
index 86797bbc6f8b..d681e66223c2 100755
--- a/Firmware/fancheck.cpp
+++ b/Firmware/fancheck.cpp
@@ -37,7 +37,7 @@ volatile uint8_t fan_check_error = EFCE_OK;
 
 void setExtruderAutoFanState(uint8_t state)
 {
-    //If bit 1 is set (0x02), then the extruder fan speed won't be adjusted according to temperature. Useful for forcing
+    //If bit 1 is set (0x02), then the hotend fan speed won't be adjusted according to temperature. Useful for forcing
     //the fan to either On or Off during certain tests/errors.
 
     fanState = state;
@@ -62,7 +62,7 @@ void countFanSpeed()
     fan_speed[0] = (fan_edge_counter[0] * (float(250) / (_millis() - extruder_autofan_last_check)));
     fan_speed[1] = (fan_edge_counter[1] * (float(250) / (_millis() - extruder_autofan_last_check)));
     /*SERIAL_ECHOPGM("time interval: "); MYSERIAL.println(_millis() - extruder_autofan_last_check);
-    SERIAL_ECHOPGM("extruder fan speed:"); MYSERIAL.print(fan_speed[0]); SERIAL_ECHOPGM("; edge counter:"); MYSERIAL.println(fan_edge_counter[0]);
+    SERIAL_ECHOPGM("hotend fan speed:"); MYSERIAL.print(fan_speed[0]); SERIAL_ECHOPGM("; edge counter:"); MYSERIAL.println(fan_edge_counter[0]);
     SERIAL_ECHOPGM("print fan speed:"); MYSERIAL.print(fan_speed[1]); SERIAL_ECHOPGM("; edge counter:"); MYSERIAL.println(fan_edge_counter[1]);
     SERIAL_ECHOLNPGM(" ");*/
     fan_edge_counter[0] = 0;
@@ -101,7 +101,7 @@ void fanSpeedError(unsigned char _fan) {
     }
     switch (_fan) {
     case 0:	// extracting the same code from case 0 and case 1 into a function saves 72B
-        fanSpeedErrorBeep(PSTR("Extruder fan speed is lower than expected"), MSG_FANCHECK_EXTRUDER);
+        fanSpeedErrorBeep(PSTR("Hotend fan speed is lower than expected"), MSG_FANCHECK_HOTEND);
         break;
     case 1:
         fanSpeedErrorBeep(PSTR("Print fan speed is lower than expected"), MSG_FANCHECK_PRINT);
@@ -114,10 +114,10 @@ void checkFanSpeed()
     uint8_t max_fan_errors[2];
 #ifdef FAN_SOFT_PWM
     max_fan_errors[1] = 3;  // 15 seconds (Print fan)
-    max_fan_errors[0] = 2;  // 10 seconds (Extruder fan)
+    max_fan_errors[0] = 2;  // 10 seconds (Hotend fan)
 #else //FAN_SOFT_PWM
     max_fan_errors[1] = 15; // 15 seconds (Print fan)
-    max_fan_errors[0] = 5;  // 5  seconds (Extruder fan)
+    max_fan_errors[0] = 5;  // 5  seconds (Hotend fan)
 #endif //FAN_SOFT_PWM
 
     if(fans_check_enabled)
diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp
index 5573f00cc082..308988813303 100644
--- a/Firmware/messages.cpp
+++ b/Firmware/messages.cpp
@@ -32,8 +32,8 @@ const char MSG_FANS_CHECK[] PROGMEM_I1 = ISTR("Fans check"); ////MSG_FANS_CHECK
 const char MSG_FIL_RUNOUTS[] PROGMEM_I1 = ISTR("Fil. runouts"); ////MSG_FIL_RUNOUTS c=15
 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////MSG_FILAMENT c=17
 const char MSG_FAN_SPEED[] PROGMEM_I1 = ISTR("Fan speed"); ////MSG_FAN_SPEED c=14
-const char MSG_EXTRUDER_FAN_SPEED[] PROGMEM_I1 = ISTR("Extruder fan:");////MSG_EXTRUDER_FAN_SPEED c=16
-const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=16
+const char MSG_HOTEND_FAN_SPEED[] PROGMEM_I1 = ISTR("Hotend fan:");////MSG_HOTEND_FAN_SPEED c=15
+const char MSG_PRINT_FAN_SPEED[] PROGMEM_I1 = ISTR("Print fan:"); ////MSG_PRINT_FAN_SPEED c=15
 const char MSG_FILAMENT_CLEAN[] PROGMEM_I1 = ISTR("Filament extruding & with correct color?"); ////MSG_FILAMENT_CLEAN c=20 r=2
 const char MSG_FILAMENT_LOADED[] PROGMEM_I1 = ISTR("Is filament loaded?"); ////MSG_FILAMENT_LOADED c=20 r=2
 const char MSG_FILAMENTCHANGE[] PROGMEM_I1 = ISTR("Change filament"); ////MSG_FILAMENTCHANGE c=18
@@ -81,7 +81,7 @@ const char MSG_RESET[] PROGMEM_I1 = ISTR("Reset"); ////MSG_RESET c=14
 const char MSG_RESUME_PRINT[] PROGMEM_I1 = ISTR("Resume print"); ////MSG_RESUME_PRINT c=18
 const char MSG_RESUMING_PRINT[] PROGMEM_I1 = ISTR("Resuming print"); ////MSG_RESUMING_PRINT c=20
 const char MSG_SELFTEST_PART_FAN[] PROGMEM_I1 = ISTR("Front print fan?"); ////MSG_SELFTEST_PART_FAN c=20
-const char MSG_SELFTEST_EXTRUDER_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////MSG_SELFTEST_EXTRUDER_FAN c=20
+const char MSG_SELFTEST_HOTEND_FAN[] PROGMEM_I1 = ISTR("Left hotend fan?"); ////MSG_SELFTEST_HOTEND_FAN c=20
 const char MSG_SELFTEST_FAILED[] PROGMEM_I1 = ISTR("Selftest failed"); ////MSG_SELFTEST_FAILED c=20
 const char MSG_SELFTEST_FAN[] PROGMEM_I1 = ISTR("Fan test"); ////MSG_SELFTEST_FAN c=20
 const char MSG_SELFTEST_FAN_NO[] PROGMEM_I1 = ISTR("Not spinning"); ////MSG_SELFTEST_FAN_NO c=19
@@ -204,8 +204,8 @@ const char MSG_OCTOPRINT_PAUSED[] PROGMEM_N1 = "// action:paused"; ////
 const char MSG_OCTOPRINT_ASK_RESUME[] PROGMEM_N1 = "// action:resume"; ////
 const char MSG_OCTOPRINT_RESUMED[] PROGMEM_N1 = "// action:resumed"; ////
 const char MSG_OCTOPRINT_CANCEL[] PROGMEM_N1 = "// action:cancel"; ////
-const char MSG_FANCHECK_EXTRUDER[] PROGMEM_N1 = "Err: EXTR. FAN ERROR"; ////c=20
-const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err: PRINT FAN ERROR"; ////c=20
+const char MSG_FANCHECK_HOTEND[] PROGMEM_N1 = "Err:HOTEND FAN ERROR"; ////c=20
+const char MSG_FANCHECK_PRINT[] PROGMEM_N1 = "Err:PRINT FAN ERROR"; ////c=20
 const char MSG_M112_KILL[] PROGMEM_N1 = "M112 called. Emergency Stop."; ////c=20
 const char MSG_ADVANCE_K[] PROGMEM_N1 = "Advance K:"; ////c=13
 const char MSG_POWERPANIC_DETECTED[] PROGMEM_N1 = "POWER PANIC DETECTED"; ////c=20
diff --git a/Firmware/messages.h b/Firmware/messages.h
index b02dec61817f..2c7015342b9a 100644
--- a/Firmware/messages.h
+++ b/Firmware/messages.h
@@ -38,7 +38,7 @@ extern const char MSG_FANS_CHECK[];
 extern const char MSG_FIL_RUNOUTS[];
 extern const char MSG_FILAMENT[];
 extern const char MSG_FAN_SPEED[];
-extern const char MSG_EXTRUDER_FAN_SPEED[];
+extern const char MSG_HOTEND_FAN_SPEED[];
 extern const char MSG_PRINT_FAN_SPEED[];
 extern const char MSG_FILAMENT_CLEAN[];
 extern const char MSG_FILAMENT_LOADED[];
@@ -86,7 +86,7 @@ extern const char MSG_RESET[];
 extern const char MSG_RESUME_PRINT[];
 extern const char MSG_RESUMING_PRINT[];
 extern const char MSG_SELFTEST_PART_FAN[];
-extern const char MSG_SELFTEST_EXTRUDER_FAN[];
+extern const char MSG_SELFTEST_HOTEND_FAN[];
 extern const char MSG_SELFTEST_FAILED[];
 extern const char MSG_SELFTEST_FAN[];
 extern const char MSG_SELFTEST_FAN_NO[];
@@ -210,7 +210,7 @@ extern const char MSG_OCTOPRINT_PAUSED[];
 extern const char MSG_OCTOPRINT_ASK_RESUME[];
 extern const char MSG_OCTOPRINT_RESUMED[];
 extern const char MSG_OCTOPRINT_CANCEL[];
-extern const char MSG_FANCHECK_EXTRUDER[];
+extern const char MSG_FANCHECK_HOTEND[];
 extern const char MSG_FANCHECK_PRINT[];
 extern const char MSG_M112_KILL[];
 extern const char MSG_ADVANCE_K[];
diff --git a/Firmware/pins_Rambo_1_0.h b/Firmware/pins_Rambo_1_0.h
index 1bccd5c5782c..b727e52f6bd6 100644
--- a/Firmware/pins_Rambo_1_0.h
+++ b/Firmware/pins_Rambo_1_0.h
@@ -78,7 +78,7 @@
 #define PS_ON_PIN           -1
 #define KILL_PIN            -1  // 80 with Smart Controller LCD
 #define SUICIDE_PIN         -1  // PIN that has to be turned on right after start, to keep power flowing.
-#define TACH_0				30	// noctua extruder fan
+#define TACH_0				30	// noctua hotend fan
 
 
 //#define KILL_PIN            32
diff --git a/Firmware/pins_Rambo_1_3.h b/Firmware/pins_Rambo_1_3.h
index c5f0e4c1cf91..e6bdfd93e78d 100644
--- a/Firmware/pins_Rambo_1_3.h
+++ b/Firmware/pins_Rambo_1_3.h
@@ -81,7 +81,7 @@
 #define PS_ON_PIN           -1
 #define KILL_PIN            -1  // 80 with Smart Controller LCD
 #define SUICIDE_PIN         -1  // PIN that has to be turned on right after start, to keep power flowing.
-#define TACH_0				30	// noctua extruder fan
+#define TACH_0				30	// noctua hotend fan
 
 
 //#define KILL_PIN            32
diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp
index 9148de43bed7..da68c3ee1e9e 100755
--- a/Firmware/temperature.cpp
+++ b/Firmware/temperature.cpp
@@ -886,7 +886,7 @@ void soft_pwm_init()
   OCR2B = 128;
   ENABLE_SOFT_PWM_INTERRUPT();
 
-  timer4_init(); //for tone and Extruder fan PWM
+  timer4_init(); //for tone and Hotend fan PWM
 }
 
 #if (defined (TEMP_RUNAWAY_BED_HYSTERESIS) && TEMP_RUNAWAY_BED_TIMEOUT > 0) || (defined (TEMP_RUNAWAY_EXTRUDER_HYSTERESIS) && TEMP_RUNAWAY_EXTRUDER_TIMEOUT > 0)
diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 98c41a6dde7a..2d8e4f1249bb 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -214,7 +214,7 @@ enum class FanCheck : uint_least8_t {
 /**
  * Try to check fan working and wiring.
  *
- * @param _fan i fan number 0 means extruder fan, 1 means print fan.
+ * @param _fan i fan number 0 means hotend fan, 1 means print fan.
  *
  * @returns a TestError noerror, extruderFan, printFan or swappedFan.
  */
@@ -1111,8 +1111,8 @@ static void pgmtext_with_colon(const char *ipgmLabel, char *dst, uint8_t dstSize
 //!
 //! @code{.unparsed}
 //! |01234567890123456789|
-//! |Extruder fan:   0000|	MSG_EXTRUDER_FAN_SPEED c=16
-//! |Print fan:      0000|	MSG_PRINT_FAN_SPEED c=16
+//! |Hotend fan:     0000|	MSG_HOTEND_FAN_SPEED c=15
+//! |Print fan:      0000|	MSG_PRINT_FAN_SPEED c=15
 //! |                    |
 //! |                    |
 //! ----------------------
@@ -1123,7 +1123,7 @@ void lcd_menu_extruder_info()                     // NOT static due to using ins
 
     lcd_timeoutToStatus.stop(); //infinite timeout
     lcd_home();
-	lcd_printf_P(PSTR("%-16.16S%-4d\n" "%-16.16S%-4d\n"), _T(MSG_EXTRUDER_FAN_SPEED), 60*fan_speed[0], _T(MSG_PRINT_FAN_SPEED), 60*fan_speed[1] ); 
+	lcd_printf_P(PSTR("%-16.16S%-4d\n" "%-16.16S%-4d\n"), _T(MSG_HOTEND_FAN_SPEED), 60*fan_speed[0], _T(MSG_PRINT_FAN_SPEED), 60*fan_speed[1] ); 
     menu_back_if_clicked();
 }
 
@@ -5256,22 +5256,22 @@ static bool fan_error_selftest()
 	fanSpeedSoftPwm = 255;
 #endif //FAN_SOFT_PWM
     manage_heater(); //enables print fan
-    setExtruderAutoFanState(3); //force enables the extruder fan
+    setExtruderAutoFanState(3); //force enables the hotend fan
 #ifdef FAN_SOFT_PWM
     extruder_autofan_last_check = _millis();
     fan_measuring = true;
 #endif //FAN_SOFT_PWM
-    _delay(1000); //delay_keep_alive would turn off extruder fan, because temerature is too low (maybe)
+    _delay(1000); //delay_keep_alive would turn off hotend fan, because temerature is too low (maybe)
     manage_heater();
     fanSpeed = 0;
-	setExtruderAutoFanState(1); //releases lock on the extruder fan
+	setExtruderAutoFanState(1); //releases lock on the hotend fan
 #ifdef FAN_SOFT_PWM
     fanSpeedSoftPwm = 0;
 #endif //FAN_SOFT_PWM
     manage_heater();
 #ifdef TACH_0
-    if (fan_speed[0] <= 20) { //extruder fan error
-        LCD_ALERTMESSAGERPGM(MSG_FANCHECK_EXTRUDER);
+    if (fan_speed[0] <= 20) { //hotend fan error
+        LCD_ALERTMESSAGERPGM(MSG_FANCHECK_HOTEND);
         return 1;
     }
 #endif
@@ -6297,7 +6297,7 @@ bool lcd_selftest()
 
 	_progress = lcd_selftest_screen(TestScreen::ExtruderFan, _progress, 3, true, 2000);
 #if (defined(FANCHECK) && defined(TACH_0))
-	switch (lcd_selftest_fan_auto(0)){		// check extruder Fan
+	switch (lcd_selftest_fan_auto(0)){		// check hotend fan
     case FanCheck::SwappedFan:
         _swapped_fan = true; // swapped is merely a hint (checked later)
         // FALLTHRU
@@ -6341,7 +6341,7 @@ bool lcd_selftest()
 	}
 
 	if (_swapped_fan) {
-		//turn on print fan and check that left extruder fan is not spinning
+		//turn on print fan and check that left hotend fan is not spinning
 		_result = lcd_selftest_manual_fan_check(1, true);
 		if (_result) {
 			//print fan is stil turned on; check that it is spinning
@@ -6999,7 +6999,7 @@ static void lcd_selftest_error(TestError testError, const char *_error_1, const
 		lcd_print(_error_1);
 		break;
 	case TestError::ExtruderFan:
-		lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_EXTRUDER_FAN));
+		lcd_puts_at_P(0, 2, _T(MSG_SELFTEST_HOTEND_FAN));
 		lcd_puts_at_P(0, 3, _T(MSG_SELFTEST_WIRINGERROR));
 		lcd_set_cursor(18, 3);
 		lcd_print(_error_1);
@@ -7146,12 +7146,12 @@ static bool lcd_selftest_manual_fan_check(int _fan, bool check_opposite,
 	{
 	case 0:
 		// extruder cooling fan
-		lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_PART_FAN) : _T(MSG_SELFTEST_EXTRUDER_FAN));
+		lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_PART_FAN) : _T(MSG_SELFTEST_HOTEND_FAN));
 		setExtruderAutoFanState(3);
 		break;
 	case 1:
 		// object cooling fan
-		lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_EXTRUDER_FAN) : _T(MSG_SELFTEST_PART_FAN));
+		lcd_puts_at_P(0, 1, check_opposite ? _T(MSG_SELFTEST_HOTEND_FAN) : _T(MSG_SELFTEST_PART_FAN));
 		SET_OUTPUT(FAN_PIN);
 #ifdef FAN_SOFT_PWM
 		fanSpeedSoftPwm = 255;
@@ -7258,10 +7258,10 @@ static FanCheck lcd_selftest_fan_auto(uint8_t _fan)
 
 	switch (_fan) {
 	case 0:
-        setExtruderAutoFanState(3); // extruder fan
+        setExtruderAutoFanState(3); // hotend fan
         lcd_selftest_setfan(0); // print fan off
         lcd_selftest_measure_fans(2, 18, 2);
-        setExtruderAutoFanState(0); // extruder fan off
+        setExtruderAutoFanState(0); // hotend fan off
 		if (fan_speed[0] < failThr) {
 			return FanCheck::ExtruderFan;
 		}
@@ -7318,7 +7318,7 @@ static uint8_t lcd_selftest_screen(TestScreen screen, uint8_t _progress, uint8_t
 	if ((screen >= TestScreen::ExtruderFan) && (screen <= TestScreen::FansOk))
 	{
 		//SERIAL_ECHOLNPGM("Fan test");
-		lcd_puts_at_P(0, 2, _T(MSG_EXTRUDER_FAN_SPEED));
+		lcd_puts_at_P(0, 2, _T(MSG_HOTEND_FAN_SPEED));
 		lcd_set_cursor(18, 2);
 		(screen < TestScreen::PrintFan) ? lcd_print(_indicator) : lcd_print("OK");
 		lcd_puts_at_P(0, 3, _T(MSG_PRINT_FAN_SPEED));
diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot
index a8713d30c887..f5832c280aed 100644
--- a/lang/po/Firmware.pot
+++ b/lang/po/Firmware.pot
@@ -454,10 +454,10 @@ msgstr ""
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
 msgstr ""
 
 #. MSG_INFO_EXTRUDER c=18
@@ -788,9 +788,9 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr ""
 
@@ -1367,9 +1367,9 @@ msgstr ""
 msgid "Print aborted"
 msgstr ""
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr ""
 
diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po
index 9ac49b4feee5..49ca13204d15 100644
--- a/lang/po/Firmware_cs.po
+++ b/lang/po/Firmware_cs.po
@@ -478,11 +478,11 @@ msgstr "Konc. spinace"
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Levy vent.:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Vent. hotendu:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -826,9 +826,9 @@ msgstr "Selhani posl. tisku"
 msgid "Left"
 msgstr "Vlevo"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Levy vent na trysce?"
 
@@ -1415,9 +1415,9 @@ msgstr "Pro pokracovani nahrivani trysky stisknete tlacitko."
 msgid "Print aborted"
 msgstr "Tisk prerusen"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Tiskovy vent.:"
 
diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po
index 631bd5af8def..d962574df45d 100644
--- a/lang/po/Firmware_da.po
+++ b/lang/po/Firmware_da.po
@@ -463,10 +463,10 @@ msgstr ""
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
 msgstr ""
 
 #. MSG_INFO_EXTRUDER c=18
@@ -799,9 +799,9 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr ""
 
@@ -1378,9 +1378,9 @@ msgstr ""
 msgid "Print aborted"
 msgstr ""
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr ""
 
diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po
index d7e190487ba2..a4ffa1381134 100644
--- a/lang/po/Firmware_de.po
+++ b/lang/po/Firmware_de.po
@@ -479,11 +479,11 @@ msgstr "Endschalter"
 msgid "Extruder"
 msgstr "Extruder"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Extruderlüfter:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend-Lüfter:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -832,9 +832,9 @@ msgstr "Letzte Druckfehler"
 msgid "Left"
 msgstr "Links"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Extruderlüfter?"
 
@@ -1425,9 +1425,9 @@ msgstr "Drücken Sie den Knopf um die Düsentemperatur wiederherzustellen"
 msgid "Print aborted"
 msgstr "Druck abgebrochen"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Drucklüfter:"
 
diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
index 57a20523f6c5..8809b5207b5b 100644
--- a/lang/po/Firmware_es.po
+++ b/lang/po/Firmware_es.po
@@ -478,11 +478,11 @@ msgstr ""
 msgid "Extruder"
 msgstr "Extruir"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Vent.extrusor:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Vent. d. fusor:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -828,9 +828,9 @@ msgstr "Ultimos imp. fallos"
 msgid "Left"
 msgstr "Izquierda"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Vent. izquierdo?"
 
@@ -1425,9 +1425,9 @@ msgstr "Presione el dial para continuar con la temperatura de la boquilla."
 msgid "Print aborted"
 msgstr "Impresion cancelada"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Vent.fusor:"
 
diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po
index bfa20f2a52cf..10be28c58161 100644
--- a/lang/po/Firmware_fr.po
+++ b/lang/po/Firmware_fr.po
@@ -480,11 +480,11 @@ msgstr "Butees"
 msgid "Extruder"
 msgstr "Extrudeur"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Vent. extrudeur:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Vent. hotend:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -834,9 +834,9 @@ msgstr "Echecs derniere imp."
 msgid "Left"
 msgstr "Gauche"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Ventilo gauche?"
 
@@ -1427,9 +1427,9 @@ msgstr "Appuyez sur le bouton pour rechauffer la buse."
 msgid "Print aborted"
 msgstr "Impression annulee"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Vent. impr:"
 
diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po
index 6a9a6dd49f73..f451d628c373 100644
--- a/lang/po/Firmware_hr.po
+++ b/lang/po/Firmware_hr.po
@@ -476,11 +476,11 @@ msgstr "Granicnici"
 msgid "Extruder"
 msgstr "Ekstruder"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Ekstruder vent:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend vent:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -826,9 +826,9 @@ msgstr "Zadnji neusp. print"
 msgid "Left"
 msgstr "Lijevo"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Lijevi hotend vent?"
 
@@ -1414,9 +1414,9 @@ msgstr "Pritisnite gumb za nastavak temperature mlaznice."
 msgid "Print aborted"
 msgstr "Print je prekinut"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Vent printa:"
 
diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
index 84a4770baaf7..b47139a00e14 100644
--- a/lang/po/Firmware_hu.po
+++ b/lang/po/Firmware_hu.po
@@ -477,11 +477,11 @@ msgstr "Vegallaskapcsolok"
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Extruder vent.:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend vent.:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -828,9 +828,9 @@ msgstr "Utolso nyomt. hibak"
 msgid "Left"
 msgstr "Bal"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Bal hotend vent.?"
 
@@ -1419,9 +1419,9 @@ msgstr "Nyomd meg a gombot a fuvoka ismetelt felfutesehez."
 msgid "Print aborted"
 msgstr "Nyomt. megszakitva"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Targyhuto:"
 
diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po
index 05aacfaca237..1725f1cf52b1 100644
--- a/lang/po/Firmware_it.po
+++ b/lang/po/Firmware_it.po
@@ -478,11 +478,11 @@ msgstr "Finecorsa"
 msgid "Extruder"
 msgstr "Estrusore"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Vent. estrusore:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1131
+#: ../../Firmware/ultralcd.cpp:7302
+msgid "Hotend fan:"
+msgstr "Ventola hotend:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -828,9 +828,9 @@ msgstr "Errori ultima stampa"
 msgid "Left"
 msgstr "Sinistra"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:6984
+#: ../../Firmware/ultralcd.cpp:7130 ../../Firmware/ultralcd.cpp:7135
 msgid "Left hotend fan?"
 msgstr "Vent SX hotend?"
 
@@ -1418,9 +1418,9 @@ msgstr "Premete la manopola per recuperare la temperatura dell'ugello."
 msgid "Print aborted"
 msgstr "Stampa interrotta"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1131
+#: ../../Firmware/ultralcd.cpp:7305
 msgid "Print fan:"
 msgstr "Vent.stam:"
 
diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po
index 62520b630f72..a72289406b8b 100644
--- a/lang/po/Firmware_lb.po
+++ b/lang/po/Firmware_lb.po
@@ -463,10 +463,10 @@ msgstr ""
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
 msgstr ""
 
 #. MSG_INFO_EXTRUDER c=18
@@ -799,9 +799,9 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr ""
 
@@ -1378,9 +1378,9 @@ msgstr ""
 msgid "Print aborted"
 msgstr ""
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr ""
 
diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po
index 0c33b49c0fe1..0ec3bc23df59 100644
--- a/lang/po/Firmware_lt.po
+++ b/lang/po/Firmware_lt.po
@@ -463,10 +463,10 @@ msgstr ""
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
 msgstr ""
 
 #. MSG_INFO_EXTRUDER c=18
@@ -799,9 +799,9 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr ""
 
@@ -1378,9 +1378,9 @@ msgstr ""
 msgid "Print aborted"
 msgstr ""
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr ""
 
diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po
index 5f709f8514a4..80e21e1120fe 100644
--- a/lang/po/Firmware_nl.po
+++ b/lang/po/Firmware_nl.po
@@ -480,11 +480,11 @@ msgstr "Eindstops"
 msgid "Extruder"
 msgstr "Extruder"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend fan:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -830,9 +830,9 @@ msgstr "Laatste printfouten"
 msgid "Left"
 msgstr "Links"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Linker hotend fan?"
 
@@ -1421,9 +1421,9 @@ msgstr "Druk op de knop om de temperatuur van de tuit te hervatten."
 msgid "Print aborted"
 msgstr "Print afgebroken"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Print fan:"
 
diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
index 308446e73271..100014857d1b 100644
--- a/lang/po/Firmware_no.po
+++ b/lang/po/Firmware_no.po
@@ -478,11 +478,11 @@ msgstr "Endesensorer"
 msgid "Extruder"
 msgstr "Ekstruder"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Ekstrudervifte:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend-vifte:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -822,11 +822,11 @@ msgstr "Siste printfeil"
 msgid "Left"
 msgstr "Venstre"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
-msgstr "Venst. ekstr. vifte?"
+msgstr "Venst. hotendvifte?"
 
 #. MSG_BED_CORRECTION_LEFT c=14
 #: ../../Firmware/ultralcd.cpp:2752
@@ -1410,9 +1410,9 @@ msgstr "Trykk valghjulet for å fortsette oppvarming."
 msgid "Print aborted"
 msgstr "Print avbrutt"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Printvifte:"
 
diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po
index 4383510425a1..6ac8c168f7ca 100644
--- a/lang/po/Firmware_pl.po
+++ b/lang/po/Firmware_pl.po
@@ -478,11 +478,11 @@ msgstr "Krancowki"
 msgid "Extruder"
 msgstr "Ekstruder"
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "WentHotend:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Went. hotend:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -826,9 +826,9 @@ msgstr "Ostatnie bledy druku"
 msgid "Left"
 msgstr "Lewa"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Lewy went hotendu?"
 
@@ -1416,9 +1416,9 @@ msgstr "Wcisnij pokretlo aby wznowic podgrzewanie dyszy."
 msgid "Print aborted"
 msgstr "Druk przerwany"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "WentWydruk:"
 
diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
index a08039ae2531..f3448e7ecdbb 100644
--- a/lang/po/Firmware_ro.po
+++ b/lang/po/Firmware_ro.po
@@ -479,11 +479,11 @@ msgstr "Endstop-uri"
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Vent. extruder:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Vent. hotend:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -827,9 +827,9 @@ msgstr "Err. ultimului print"
 msgid "Left"
 msgstr "Stanga"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Vent. hotend?"
 
@@ -1416,9 +1416,9 @@ msgstr "Apasati butonul pentru a restabili temperatura extruder-ului."
 msgid "Print aborted"
 msgstr "Print anulat"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Vent. print:"
 
diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
index 344c03c9469f..5ff3343cc5dc 100644
--- a/lang/po/Firmware_sk.po
+++ b/lang/po/Firmware_sk.po
@@ -477,11 +477,11 @@ msgstr "Konc. spinace"
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Lavy vent.:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend vent.:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -824,9 +824,9 @@ msgstr "Zlyhanie posl. tlace"
 msgid "Left"
 msgstr "Vlavo"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Lavy vent na tryske?"
 
@@ -1414,9 +1414,9 @@ msgstr "Pre pokracovanie nahrievania trysky stlacte tlacidlo."
 msgid "Print aborted"
 msgstr "Tlac prerusena"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Tlacovy vent.:"
 
diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po
index 5810b1ae1e1d..e70b7dd6c3ee 100644
--- a/lang/po/Firmware_sl.po
+++ b/lang/po/Firmware_sl.po
@@ -463,10 +463,10 @@ msgstr ""
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
 msgstr ""
 
 #. MSG_INFO_EXTRUDER c=18
@@ -799,9 +799,9 @@ msgstr ""
 msgid "Left"
 msgstr ""
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr ""
 
@@ -1378,9 +1378,9 @@ msgstr ""
 msgid "Print aborted"
 msgstr ""
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr ""
 
diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
index a2f3200f28b7..9d5698b41026 100644
--- a/lang/po/Firmware_sv.po
+++ b/lang/po/Firmware_sv.po
@@ -477,11 +477,11 @@ msgstr "Ändlägen"
 msgid "Extruder"
 msgstr ""
 
-#. MSG_EXTRUDER_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7321
-msgid "Extruder fan:"
-msgstr "Extruderfläkt:"
+#. MSG_HOTEND_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7319
+msgid "Hotend fan:"
+msgstr "Hotend-fläkt:"
 
 #. MSG_INFO_EXTRUDER c=18
 #: ../../Firmware/ultralcd.cpp:1722
@@ -828,9 +828,9 @@ msgstr "Senaste utskriftsfel"
 msgid "Left"
 msgstr "Vänster"
 
-#. MSG_SELFTEST_EXTRUDER_FAN c=20
-#: ../../Firmware/messages.cpp:84 ../../Firmware/ultralcd.cpp:7002
-#: ../../Firmware/ultralcd.cpp:7149 ../../Firmware/ultralcd.cpp:7154
+#. MSG_SELFTEST_HOTEND_FAN c=20
+#: ../../Firmware/messages.cpp:88 ../../Firmware/ultralcd.cpp:7001
+#: ../../Firmware/ultralcd.cpp:7147 ../../Firmware/ultralcd.cpp:7152
 msgid "Left hotend fan?"
 msgstr "Vänst hotend fläkt?"
 
@@ -1420,9 +1420,9 @@ msgstr "Tryck på knappen för att återställa munstyckstemperaturen."
 msgid "Print aborted"
 msgstr "Utskriften avbröts"
 
-#. MSG_PRINT_FAN_SPEED c=16
-#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1126
-#: ../../Firmware/ultralcd.cpp:7324
+#. MSG_PRINT_FAN_SPEED c=15
+#: ../../Firmware/messages.cpp:36 ../../Firmware/ultralcd.cpp:1144
+#: ../../Firmware/ultralcd.cpp:7322
 msgid "Print fan:"
 msgstr "Utskriftsfläkt:"
 

From 1b087768737a9edf76235064c9b20cacecf124d1 Mon Sep 17 00:00:00 2001
From: 3d-gussner <3d.gussner@gmail.com>
Date: Mon, 17 Oct 2022 15:41:05 +0200
Subject: [PATCH 2/2] Change fan RPM display to 5 digits All credits to @
 WarrenSchultz for initial PR
 https://github.com/prusa3d/Prusa-Firmware/pull/3656

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

diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp
index 2d8e4f1249bb..a6fb35254f30 100755
--- a/Firmware/ultralcd.cpp
+++ b/Firmware/ultralcd.cpp
@@ -1123,7 +1123,7 @@ void lcd_menu_extruder_info()                     // NOT static due to using ins
 
     lcd_timeoutToStatus.stop(); //infinite timeout
     lcd_home();
-	lcd_printf_P(PSTR("%-16.16S%-4d\n" "%-16.16S%-4d\n"), _T(MSG_HOTEND_FAN_SPEED), 60*fan_speed[0], _T(MSG_PRINT_FAN_SPEED), 60*fan_speed[1] ); 
+	lcd_printf_P(PSTR("%-15.15S%-5d\n" "%-15.15S%-5d\n"), _T(MSG_HOTEND_FAN_SPEED), 60*fan_speed[0], _T(MSG_PRINT_FAN_SPEED), 60*fan_speed[1] ); 
     menu_back_if_clicked();
 }