🚸 Avoid LCD messages starting with "Error:" (MarlinFirmware#26164)

EvilGremlin · Oct 26, 2023 · e0d88ba · e0d88ba
1 parent 8c08065
commit e0d88ba
Show file tree

Hide file tree

Showing 34 changed files with 107 additions and 165 deletions.
diff --git a/Marlin/src/core/language.h b/Marlin/src/core/language.h
@@ -154,7 +154,7 @@
 #define STR_ERR_ARC_ARGS                    "G2/G3 bad parameters"
 #define STR_ERR_PROTECTED_PIN               "Protected Pin"
 #define STR_ERR_M420_FAILED                 "Failed to enable Bed Leveling"
-#define STR_ERR_M428_TOO_FAR                "Too far from reference point"
+#define STR_ERR_M428_TOO_FAR                "Too far from MIN/MAX"
 #define STR_ERR_M303_DISABLED               "PIDTEMP disabled"
 #define STR_M119_REPORT                     "Reporting endstop status"
 #define STR_ON                              "ON"
@@ -254,7 +254,7 @@
 #define STR_REDUNDANCY                      "Heater switched off. Temperature difference between temp sensors is too high !"
 #define STR_T_HEATING_FAILED                "Heating failed"
 #define STR_T_THERMAL_RUNAWAY               "Thermal Runaway"
-#define STR_T_MALFUNCTION                   "Thermal Malfunction"
+#define STR_T_THERMAL_MALFUNCTION           "Thermal Malfunction"
 #define STR_T_MAXTEMP                       "MAXTEMP triggered"
 #define STR_T_MINTEMP                       "MINTEMP triggered"
 #define STR_ERR_PROBING_FAILED              "Probing Failed"

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1825,7 +1825,7 @@ void MarlinUI::refresh() { /* Nothing to see here */ }
   void MarlinUI::_set_brightness() { dwinLCDBrightness(backlight ? brightness : 0); }
 #endif
 
-void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component) {
+void MarlinUI::kill_screen(FSTR_P const lcd_error, FSTR_P const) {
   dwinDrawPopup(ICON_BLTouch, GET_TEXT_F(MSG_PRINTER_KILLED), lcd_error);
   DWINUI::drawCenteredString(hmiData.colorPopupTxt, 270, GET_TEXT_F(MSG_TURN_OFF));
   dwinUpdateLCD();

diff --git a/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp b/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
@@ -293,7 +293,7 @@ namespace Anycubic {
       DEBUG_ECHOLNPGM("printerKilled()\nerror: ", error, "\ncomponent: ", component);
     #endif
 
-    if (strcmp_P(error, PSTR("Heating Failed")) == 0) {
+    if (strcmp_P(error, GET_TEXT(MSG_ERR_HEATING_FAILED)) == 0) {
 
       if (strcmp_P(component, PSTR("Bed")) == 0) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
@@ -305,7 +305,7 @@ namespace Anycubic {
       }
 
     }
-    else if (strcmp_P(error, PSTR("Err: MINTEMP")) == 0) {
+    else if (strcmp_P(error, GET_TEXT(MSG_ERR_MINTEMP)) == 0) {
 
       if (strcmp_P(component, PSTR("Bed")) == 0) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
@@ -317,7 +317,7 @@ namespace Anycubic {
       }
 
     }
-    else if (strcmp_P(error, PSTR("Err: MAXTEMP")) == 0) {
+    else if (strcmp_P(error, GET_TEXT(MSG_ERR_MAXTEMP)) == 0) {
 
       if (strcmp_P(component, PSTR("Bed")) == 0) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_BED_NTC);
@@ -329,7 +329,7 @@ namespace Anycubic {
       }
 
     }
-    else if (strcmp_P(error, PSTR("THERMAL RUNAWAY")) == 0) {
+    else if (strcmp_P(error, GET_TEXT(MSG_ERR_THERMAL_RUNAWAY)) == 0) {
 
       if (strcmp_P(component, PSTR("Bed")) == 0) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_BED_HEATER);
@@ -341,7 +341,7 @@ namespace Anycubic {
       }
 
     }
-    else if (strcmp_P(error, PSTR("Homing Failed")) == 0) {
+    else if (strcmp_P(error, GET_TEXT(MSG_KILL_HOMING_FAILED)) == 0) {
 
       if (strcmp_P(component, PSTR("X")) == 0) {
         changePageOfTFT(PAGE_CHS_ABNORMAL_X_ENDSTOP);

diff --git a/Marlin/src/lcd/language/language_an.h b/Marlin/src/lcd/language/language_an.h
@@ -167,11 +167,11 @@ namespace LanguageNarrow_an {
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropaso Z");
   LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error: en calentar");
-  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Error: temperatura");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Error de temperatura");
-  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Error: Temp Max");
-  LSTR MSG_ERR_MINTEMP                    = _UxGT("Error: Temp Min");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Error en calentar");
+  LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Error temp adicional");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("Error de temperatura");
+  LSTR MSG_ERR_MAXTEMP                    = _UxGT("Error Temp Max");
+  LSTR MSG_ERR_MINTEMP                    = _UxGT("Error Temp Min");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA ATURADA");
   LSTR MSG_PLEASE_RESET                   = _UxGT("Per favor reinic.");
   LSTR MSG_HEATING                        = _UxGT("Calentando...");

diff --git a/Marlin/src/lcd/language/language_ca.h b/Marlin/src/lcd/language/language_ca.h
@@ -158,9 +158,9 @@ namespace LanguageNarrow_ca {
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Micropas Z");
   LSTR MSG_BABYSTEP_N                     = _UxGT("Micropas @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancel. Endstop");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Error al escalfar");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Error al escalfar");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP REDUNDANT");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("THERMAL RUNAWAY");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: TEMP MAXIMA");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: TEMP MINIMA");
   LSTR MSG_HALTED                         = _UxGT("IMPRESSORA PARADA");

diff --git a/Marlin/src/lcd/language/language_cz.h b/Marlin/src/lcd/language/language_cz.h
@@ -397,11 +397,9 @@ namespace LanguageNarrow_cz {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Celkem");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop abort");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Chyba zahřívání");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Chyba zahřívání");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("REDUND. TEPLOTA");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TEPLOTNÍ ÚNIK");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("TEPL. ÚNIK PODL.");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("TEPL. ÚNIK KOMORA");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("TEPLOTNÍ ÚNIK");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("VYSOKÁ TEPLOTA");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("NÍZKA TEPLOTA");
   LSTR MSG_HALTED                         = _UxGT("TISK. ZASTAVENA");

diff --git a/Marlin/src/lcd/language/language_da.h b/Marlin/src/lcd/language/language_da.h
@@ -139,9 +139,9 @@ namespace LanguageNarrow_da {
   LSTR MSG_ZPROBE_OUT                     = _UxGT("Probe udenfor plade");
   LSTR MSG_BLTOUCH_SELFTEST               = _UxGT("BLTouch Selv-Test");
   LSTR MSG_HOME_FIRST                     = _UxGT("Home %s først");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Opvarmning fejlet");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Opvarmning fejlet");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Fejl: reserve temp");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Temp løber løbsk");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("Temp løber løbsk");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Fejl: Maks temp");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Fejl: Min temp");
   LSTR MSG_HALTED                         = _UxGT("PRINTER STOPPET");

diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
@@ -546,14 +546,11 @@ namespace LanguageNarrow_de {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Abbr. mit Endstopp");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("HEIZEN ERFOLGLOS");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("HEIZEN ERFOLGLOS");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("REDUND. TEMP-ABWEI.");
-  LSTR MSG_THERMAL_RUNAWAY                = " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("TEMP-FEHLER");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BETT") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("GEH.") " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
-  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Kühler Runaway");
-  LSTR MSG_COOLING_FAILED                 = _UxGT("Kühlung fehlgeschla.");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = " " LCD_STR_THERMOMETER _UxGT(" NICHT ERREICHT");
+  LSTR MSG_ERR_TEMP_MALFUNCTION           = _UxGT("TEMP-FEHLER");
+  LSTR MSG_ERR_COOLING_FAILED             = _UxGT("Kühlung fehlgeschla.");
   LSTR MSG_ERR_MAXTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" ÜBERSCHRITTEN");
   LSTR MSG_ERR_MINTEMP                    = " " LCD_STR_THERMOMETER _UxGT(" UNTERSCHRITTEN");
   LSTR MSG_HALTED                         = _UxGT("DRUCKER GESTOPPT");

diff --git a/Marlin/src/lcd/language/language_el.h b/Marlin/src/lcd/language/language_el.h
@@ -192,10 +192,10 @@ namespace LanguageNarrow_el {
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Μικρό βήμα Υ");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Μικρό βήμα Ζ");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Ακύρωση endstop");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Αποτυχία θέρμανσης");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Αποτυχία θέρμανσης");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ΘΕΡΜΙΚΗ ΔΙΑΦΥΓΗ");
-  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("ΘΕΡΜΙΚΗ ΔΥΣΛΕΙΤΟΥΡΓΙΑ");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("ΘΕΡΜΙΚΗ ΔΙΑΦΥΓΗ");
+  LSTR MSG_ERR_TEMP_MALFUNCTION           = _UxGT("ΘΕΡΜΙΚΗ ΔΥΣΛΕΙΤΟΥΡΓΙΑ");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("ΠΕΡΙΤΤΗ ΘΕΡΜΟΚΡΑΣΙΑ");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("ΑΝΕΠΑΡΚΗΣ ΘΕΡΜΟΚΡΑΣΙΑ");
   LSTR MSG_HALTED                         = _UxGT("Εκτυπωτής διεκόπη");

diff --git a/Marlin/src/lcd/language/language_el_gr.h b/Marlin/src/lcd/language/language_el_gr.h
@@ -182,9 +182,9 @@ namespace LanguageNarrow_el_gr {
   LSTR MSG_BABYSTEP_Y                     = _UxGT("Μικρό βήμα Υ");
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Μικρό βήμα Ζ");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Ματαίωση endstop ");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Ανεπιτυχής θέρμανση");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Ανεπιτυχής θέρμανση");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Λάθος: ΠΛΕΟΝΑΖΟΥΣΑ ΘΕΡΜΟΤΗΤΑ");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("ΔΙΑΦΥΓΗ ΘΕΡΜΟΤΗΤΑΣ");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Λάθος: ΜΕΓΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Λάθος: ΕΛΑΧΙΣΤΗ ΘΕΡΜΟΤΗΤΑ");
   LSTR MSG_HEATING                        = _UxGT("Θερμαίνεται…");

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -113,7 +113,7 @@ namespace LanguageNarrow_en {
   LSTR MSG_HOME_OFFSET_Y                  = _UxGT("Home Offset Y");
   LSTR MSG_HOME_OFFSET_Z                  = _UxGT("Home Offset Z");
   LSTR MSG_HOME_OFFSETS_APPLIED           = _UxGT("Offsets Applied");
-  LSTR MSG_ERR_M428_TOO_FAR               = _UxGT("Err: Too far!");
+  LSTR MSG_ERR_M428_TOO_FAR               = _UxGT("MIN/MAX Too Far");
   LSTR MSG_TRAMMING_WIZARD                = _UxGT("Tramming Wizard");
   LSTR MSG_SELECT_ORIGIN                  = _UxGT("Select Origin");
   LSTR MSG_LAST_VALUE_SP                  = _UxGT("Last value ");
@@ -271,8 +271,8 @@ namespace LanguageNarrow_en {
   LSTR MSG_MESH_SAVED                     = _UxGT("Mesh %i Saved");
   LSTR MSG_MESH_ACTIVE                    = _UxGT("Mesh %i active");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("No Storage");
-  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Err: UBL Save");
-  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Err: UBL Restore");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("UBL Save Error");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("UBL Restore Error");
   LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Z-Offset: ");
   LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Z-Offset Stopped");
   LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("Step-By-Step UBL");
@@ -611,14 +611,11 @@ namespace LanguageNarrow_en {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop Abort");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Heating Failed");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Heating Failed");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: REDUNDANT TEMP");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("THERMAL RUNAWAY");
-  LSTR MSG_TEMP_MALFUNCTION               = _UxGT("TEMP MALFUNCTION");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("BED THERMAL RUNAWAY");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("CHAMBER T. RUNAWAY");
-  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Cooler Runaway");
-  LSTR MSG_COOLING_FAILED                 = _UxGT("Cooling Failed");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("THERMAL RUNAWAY");
+  LSTR MSG_ERR_TEMP_MALFUNCTION           = _UxGT("TEMP MALFUNCTION");
+  LSTR MSG_ERR_COOLING_FAILED             = _UxGT("Cooling Failed");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: MAXTEMP");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: MINTEMP");
   LSTR MSG_HALTED                         = _UxGT("PRINTER HALTED");

diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
@@ -187,8 +187,8 @@ namespace LanguageNarrow_es {
   LSTR MSG_MESH_LOADED                    = _UxGT("Malla %i Cargada");
   LSTR MSG_MESH_SAVED                     = _UxGT("Malla %i Guardada");
   LSTR MSG_UBL_NO_STORAGE                 = _UxGT("Sin guardar");
-  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Error: Guardar UBL");
-  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Error: Restaurar UBL");
+  LSTR MSG_UBL_SAVE_ERROR                 = _UxGT("Error Guardar UBL");
+  LSTR MSG_UBL_RESTORE_ERROR              = _UxGT("Error Restaurar UBL");
   LSTR MSG_UBL_Z_OFFSET                   = _UxGT("Desfase de Z: ");
   LSTR MSG_UBL_Z_OFFSET_STOPPED           = _UxGT("Desfase de Z Parado");
   LSTR MSG_UBL_STEP_BY_STEP_MENU          = _UxGT("UBL Paso a Paso");
@@ -407,11 +407,9 @@ namespace LanguageNarrow_es {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Cancelado - Endstop");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Calent. fallido");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Calent. fallido");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: TEMP. REDUN.");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FUGA TÉRMICA");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("FUGA TÉRMICA CAMA");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("FUGA TÉRMICA CAMARA");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("FUGA TÉRMICA");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err:TEMP. MÁX");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err:TEMP. MIN");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETENIDA");

diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h
@@ -240,9 +240,9 @@ namespace LanguageNarrow_eu {
   LSTR MSG_BABYSTEP_Z                     = _UxGT("Mikro-urratsa Z");
   LSTR MSG_BABYSTEP_N                     = _UxGT("Mikro-urratsa @");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Endstop deusezta.");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err: Beroketa");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Err: Beroketa");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err: Tenperatura");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("TENP. KONTROL EZA");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("TENP. KONTROL EZA");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err: Tenp Maximoa");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err: Tenp Minimoa");
   LSTR MSG_HALTED                         = _UxGT("INPRIMA. GELDIRIK");

diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h
@@ -433,9 +433,9 @@ namespace LanguageNarrow_fr {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Butée abandon");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err de chauffe");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Err de chauffe");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err TEMP. REDONDANTE");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Err THERMIQUE");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("Err THERMIQUE");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err TEMP. MAX");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err TEMP. MIN");
 

diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h
@@ -433,9 +433,9 @@ namespace LanguageNarrow_fr_na {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Babystep @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Butee abandon");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Err de chauffe");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Err de chauffe");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Err TEMP. REDONDANTE");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("Err THERMIQUE");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("Err THERMIQUE");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Err TEMP. MAX");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Err TEMP. MIN");
 

diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
@@ -422,11 +422,9 @@ namespace LanguageNarrow_gl {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Micropaso @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Total");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Erro FinCarro");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fallo Quentando");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Fallo Quentando");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Erro:Temp Redundante");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FUGA TÉRMICA");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("FUGA TÉRMICA CAMA");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("FUGA TÉRMICA CÁMARA");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("FUGA TÉRMICA");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Erro:TEMP MÁX");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Erro:TEMP MÍN");
   LSTR MSG_HALTED                         = _UxGT("IMPRESORA DETIDA");

diff --git a/Marlin/src/lcd/language/language_hr.h b/Marlin/src/lcd/language/language_hr.h
@@ -120,7 +120,7 @@ namespace LanguageNarrow_hr {
   LSTR MSG_FILAMENTCHANGE_E               = _UxGT("Promijeni filament *");
   LSTR MSG_ATTACH_MEDIA                   = _UxGT("Init. SD karticu");
   LSTR MSG_CHANGE_MEDIA                   = _UxGT("Promijeni SD karticu");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Grijanje neuspješno");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Grijanje neuspješno");
   LSTR MSG_HEATING                        = _UxGT("Grijanje...");
   LSTR MSG_BED_HEATING                    = _UxGT("Grijanje Bed-a...");
   LSTR MSG_DELTA_CALIBRATE                = _UxGT("Delta Kalibracija");

diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
@@ -479,13 +479,10 @@ namespace LanguageNarrow_hu {
   LSTR MSG_BABYSTEP_N                     = _UxGT("Mikrolépés @");
   LSTR MSG_BABYSTEP_TOTAL                 = _UxGT("Teljes");
   LSTR MSG_ENDSTOP_ABORT                  = _UxGT("Végállás megszakítva!");
-  LSTR MSG_HEATING_FAILED_LCD             = _UxGT("Fütés hiba!");
+  LSTR MSG_ERR_HEATING_FAILED             = _UxGT("Fütés hiba!");
   LSTR MSG_ERR_REDUNDANT_TEMP             = _UxGT("Hiba: SZÜKSÉGTELEN HÖFOK");
-  LSTR MSG_THERMAL_RUNAWAY                = _UxGT("FÜTÉS KIMARADÁS");
-  LSTR MSG_THERMAL_RUNAWAY_BED            = _UxGT("ÁGY FÜTÉS KIMARADÁS");
-  LSTR MSG_THERMAL_RUNAWAY_CHAMBER        = _UxGT("KAMRA FÜTÉS KIMARADÁS");
-  LSTR MSG_THERMAL_RUNAWAY_COOLER         = _UxGT("Hütés kimaradás");
-  LSTR MSG_COOLING_FAILED                 = _UxGT("Hütés sikertelen");
+  LSTR MSG_ERR_THERMAL_RUNAWAY            = _UxGT("FÜTÉS KIMARADÁS");
+  LSTR MSG_ERR_COOLING_FAILED             = _UxGT("Hütés sikertelen");
   LSTR MSG_ERR_MAXTEMP                    = _UxGT("Hiba: MAX höfok");
   LSTR MSG_ERR_MINTEMP                    = _UxGT("Hiba: MIN höfok");
   LSTR MSG_HALTED                         = _UxGT("A NYOMTATÓ LEÁLLT");