diff --git a/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp b/Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp index f27e638b32801..9c122774f2f8c 100644 --- 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_HEATING_FAILED_LCD)) == 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_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_de.h b/Marlin/src/lcd/language/language_de.h index 30e2521d23027..ced81ad566545 100644 --- a/Marlin/src/lcd/language/language_de.h +++ b/Marlin/src/lcd/language/language_de.h @@ -243,8 +243,8 @@ namespace LanguageNarrow_de { LSTR MSG_MESH_LOADED = _UxGT("Netz %i geladen"); LSTR MSG_MESH_SAVED = _UxGT("Netz %i gespeichert"); LSTR MSG_UBL_NO_STORAGE = _UxGT("Kein Speicher"); - LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err:UBL speichern"); - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err:UBL wiederherst."); + LSTR MSG_UBL_SAVE_ERROR = _UxGT("UBL speichern Error"); + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("UBL wiederherst. Error"); LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Versatz: "); LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Versatz angehalten"); LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Schrittweises UBL"); diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 9fdc33e5f2028..e1a94d5fae93f 100644 --- 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("Too Far From HOME"); 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"); @@ -462,10 +462,10 @@ namespace LanguageNarrow_en { LSTR MSG_LOAD_EEPROM = _UxGT("Load Settings"); LSTR MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults"); LSTR MSG_INIT_EEPROM = _UxGT("Initialize EEPROM"); - LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC"); - LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: EEPROM Size"); - LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: EEPROM Version"); - LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("Err: EEPROM Corrupt"); + LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error"); + LSTR MSG_ERR_EEPROM_SIZE = _UxGT("EEPROM Size Error"); + LSTR MSG_ERR_EEPROM_VERSION = _UxGT("EEPROM Version Error"); + LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("EEPROM Corrupt Error"); LSTR MSG_SETTINGS_STORED = _UxGT("Settings Stored"); LSTR MSG_HAS_PREVIEW = _UxGT("Has preview"); LSTR MSG_RESET_PRINTER = _UxGT("Reset Printer"); diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h index 3726e25270fb2..b4a8f01cad9e7 100644 --- a/Marlin/src/lcd/language/language_es.h +++ b/Marlin/src/lcd/language/language_es.h @@ -312,9 +312,9 @@ namespace LanguageNarrow_es { LSTR MSG_LOAD_EEPROM = _UxGT("Cargar EEPROM"); LSTR MSG_RESTORE_DEFAULTS = _UxGT("Rest. fábrica"); LSTR MSG_INIT_EEPROM = _UxGT("Inicializar EEPROM"); - LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC"); - LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: EEPROM Tamaño"); - LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versión EEPROM"); + LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error"); + LSTR MSG_ERR_EEPROM_SIZE = _UxGT("EEPROM Tamaño Error"); + LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versión EEPROM Error"); LSTR MSG_MEDIA_UPDATE = _UxGT("Actualizar SD/FD"); LSTR MSG_RESET_PRINTER = _UxGT("Resetear Impresora"); LSTR MSG_REFRESH = LCD_STR_REFRESH _UxGT("Recargar"); diff --git a/Marlin/src/lcd/language/language_eu.h b/Marlin/src/lcd/language/language_eu.h index d96b099f3e4af..9943ad0afa2cb 100644 --- a/Marlin/src/lcd/language/language_eu.h +++ b/Marlin/src/lcd/language/language_eu.h @@ -240,8 +240,8 @@ 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_REDUNDANT_TEMP = _UxGT("Err: Tenperatura"); + LSTR MSG_HEATING_FAILED_LCD = _UxGT("Beroketa Error"); LSTR MSG_THERMAL_RUNAWAY = _UxGT("TENP. KONTROL EZA"); LSTR MSG_ERR_MAXTEMP = _UxGT("Err: Tenp Maximoa"); LSTR MSG_ERR_MINTEMP = _UxGT("Err: Tenp Minimoa"); diff --git a/Marlin/src/lcd/language/language_fr.h b/Marlin/src/lcd/language/language_fr.h index c281497e96293..d5096c922f533 100644 --- a/Marlin/src/lcd/language/language_fr.h +++ b/Marlin/src/lcd/language/language_fr.h @@ -191,8 +191,8 @@ namespace LanguageNarrow_fr { LSTR MSG_MESH_LOADED = _UxGT("Grille %i chargée"); LSTR MSG_MESH_SAVED = _UxGT("Grille %i enreg."); LSTR MSG_UBL_NO_STORAGE = _UxGT("Pas de mémoire"); - LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Enreg. UBL"); - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ouvrir UBL"); + LSTR MSG_UBL_SAVE_ERROR = _UxGT("Enreg. UBL Error"); + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ouvrir UBL Error"); LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: "); LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Décal. Z arrêté"); LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Assistant UBL"); diff --git a/Marlin/src/lcd/language/language_fr_na.h b/Marlin/src/lcd/language/language_fr_na.h index 05e5b061ddef5..165a62f4d9bcf 100644 --- a/Marlin/src/lcd/language/language_fr_na.h +++ b/Marlin/src/lcd/language/language_fr_na.h @@ -191,8 +191,8 @@ namespace LanguageNarrow_fr_na { LSTR MSG_MESH_LOADED = _UxGT("Grille %i chargee"); LSTR MSG_MESH_SAVED = _UxGT("Grille %i enreg."); LSTR MSG_UBL_NO_STORAGE = _UxGT("Pas de memoire"); - LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Enreg. UBL"); - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ouvrir UBL"); + LSTR MSG_UBL_SAVE_ERROR = _UxGT("Enreg. UBL Error"); + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ouvrir UBL Error"); LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: "); LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Decal. Z arrete"); LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("Assistant UBL"); diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h index 9c78918fcf236..b87306d9d1bb9 100644 --- a/Marlin/src/lcd/language/language_it.h +++ b/Marlin/src/lcd/language/language_it.h @@ -102,7 +102,7 @@ namespace LanguageNarrow_it { LSTR MSG_HOME_OFFSET_Y = _UxGT("Offset home Y"); LSTR MSG_HOME_OFFSET_Z = _UxGT("Offset home Z"); LSTR MSG_HOME_OFFSETS_APPLIED = _UxGT("Offset applicato"); - LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Err: Troppo lontano!"); + LSTR MSG_ERR_M428_TOO_FAR = _UxGT("Troppo lontano! Error"); LSTR MSG_TRAMMING_WIZARD = _UxGT("Wizard Tramming"); LSTR MSG_SELECT_ORIGIN = _UxGT("Selez. origine"); LSTR MSG_LAST_VALUE_SP = _UxGT("Ultimo valore "); @@ -259,8 +259,8 @@ namespace LanguageNarrow_it { LSTR MSG_MESH_SAVED = _UxGT("Mesh %i salvata"); LSTR MSG_MESH_ACTIVE = _UxGT("Mesh %i attiva"); LSTR MSG_UBL_NO_STORAGE = _UxGT("Nessuna memoria"); - LSTR MSG_UBL_SAVE_ERROR = _UxGT("Err: Salvataggio UBL"); - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Err: Ripristino UBL"); + LSTR MSG_UBL_SAVE_ERROR = _UxGT("Salvataggio UBL Error"); + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("Ripristino UBL Error"); LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-Offset: "); LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z-Offset Fermato"); LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("UBL passo passo"); @@ -443,10 +443,10 @@ namespace LanguageNarrow_it { LSTR MSG_LOAD_EEPROM = _UxGT("Carica impostazioni"); LSTR MSG_RESTORE_DEFAULTS = _UxGT("Ripristina imp."); LSTR MSG_INIT_EEPROM = _UxGT("Inizializza EEPROM"); - LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: CRC EEPROM"); - LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: Dimens.EEPROM"); - LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versione EEPROM"); - LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("Err: EEPROM corrotta"); + LSTR MSG_ERR_EEPROM_CRC = _UxGT("CRC EEPROM Error"); + LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Dimens.EEPROM Error"); + LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versione EEPROM Error"); + LSTR MSG_ERR_EEPROM_CORRUPT = _UxGT("EEPROM corrotta Error"); LSTR MSG_SETTINGS_STORED = _UxGT("Impostazioni mem."); LSTR MSG_MEDIA_UPDATE = _UxGT("Aggiorna media"); LSTR MSG_RESET_PRINTER = _UxGT("Resetta stampante"); diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h index 579c7eb224675..cdaf81ff1fe02 100644 --- a/Marlin/src/lcd/language/language_ro.h +++ b/Marlin/src/lcd/language/language_ro.h @@ -183,8 +183,8 @@ namespace LanguageNarrow_ro { LSTR MSG_MESH_LOADED = _UxGT("Mesh %i Loaded"); LSTR MSG_MESH_SAVED = _UxGT("Mesh %i Saved"); 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"); @@ -315,9 +315,9 @@ namespace LanguageNarrow_ro { LSTR MSG_LOAD_EEPROM = _UxGT("Load Settings"); LSTR MSG_RESTORE_DEFAULTS = _UxGT("Restore Defaults"); LSTR MSG_INIT_EEPROM = _UxGT("Initialize EEPROM"); - LSTR MSG_ERR_EEPROM_CRC = _UxGT("Err: EEPROM CRC"); - LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Err: Mărimea EEPROM"); - LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Err: Versiunea EEPROM"); + LSTR MSG_ERR_EEPROM_CRC = _UxGT("EEPROM CRC Error"); + LSTR MSG_ERR_EEPROM_SIZE = _UxGT("Mărimea EEPROM Error"); + LSTR MSG_ERR_EEPROM_VERSION = _UxGT("Versiunea EEPROM Error"); LSTR MSG_SETTINGS_STORED = _UxGT("Settings Stored"); LSTR MSG_MEDIA_UPDATE = _UxGT("Media Update"); LSTR MSG_RESET_PRINTER = _UxGT("Reset Imprimanta"); diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h index 7f4d5af374560..1ffdd57e3cdb6 100644 --- a/Marlin/src/lcd/language/language_zh_CN.h +++ b/Marlin/src/lcd/language/language_zh_CN.h @@ -183,8 +183,8 @@ namespace LanguageNarrow_zh_CN { LSTR MSG_MESH_LOADED = _UxGT("网格 %i 已装载"); // "Mesh %i loaded" LSTR MSG_MESH_SAVED = _UxGT("网格 %i 已保存"); // "Mesh %i saved" LSTR MSG_UBL_NO_STORAGE = _UxGT("没有存储"); // "No storage" - LSTR MSG_UBL_SAVE_ERROR = _UxGT("错误: UBL保存"); // "Err: UBL Save" - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("错误: UBL还原"); // "Err: UBL Restore" + LSTR MSG_UBL_SAVE_ERROR = _UxGT("错误: UBL保存"); // "UBL Save Error" + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("错误: UBL还原"); // "UBL Restore Error" LSTR MSG_UBL_Z_OFFSET = _UxGT("Z偏移量: "); LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z偏移已停止"); // "Z-Offset Stopped" LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("一步步UBL"); // "Step-By-Step UBL" diff --git a/Marlin/src/lcd/language/language_zh_TW.h b/Marlin/src/lcd/language/language_zh_TW.h index b22a3cd1ac923..e09d15d2444d7 100644 --- a/Marlin/src/lcd/language/language_zh_TW.h +++ b/Marlin/src/lcd/language/language_zh_TW.h @@ -179,8 +179,8 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_MESH_LOADED = _UxGT("網格 %i 已裝載"); // "Mesh %i loaded" LSTR MSG_MESH_SAVED = _UxGT("網格 %i 已保存"); // "Mesh %i saved" LSTR MSG_UBL_NO_STORAGE = _UxGT("沒有存儲"); // "No storage" - LSTR MSG_UBL_SAVE_ERROR = _UxGT("錯誤: UBL保存"); // "Err: UBL Save" - LSTR MSG_UBL_RESTORE_ERROR = _UxGT("錯誤: UBL還原"); // "Err: UBL Restore" + LSTR MSG_UBL_SAVE_ERROR = _UxGT("錯誤: UBL保存"); // "UBL Save Error" + LSTR MSG_UBL_RESTORE_ERROR = _UxGT("錯誤: UBL還原"); // "UBL Restore Error" LSTR MSG_UBL_Z_OFFSET = _UxGT("Z-偏移:"); // "Z-Offset: " LSTR MSG_UBL_Z_OFFSET_STOPPED = _UxGT("Z偏移已停止"); // "Z-Offset Stopped" LSTR MSG_UBL_STEP_BY_STEP_MENU = _UxGT("一步步UBL"); // "Step-By-Step UBL" @@ -296,8 +296,8 @@ namespace LanguageNarrow_zh_TW { LSTR MSG_LOAD_EEPROM = _UxGT("載入設置"); // "Load memory" LSTR MSG_RESTORE_DEFAULTS = _UxGT("恢復安全值"); // "Restore failsafe" LSTR MSG_INIT_EEPROM = _UxGT("初始化設置"); // "Initialize EEPROM" - LSTR MSG_ERR_EEPROM_CRC = _UxGT("錯誤: EEPROM CRC"); // "Err: EEPROM CRC" - LSTR MSG_ERR_EEPROM_SIZE = _UxGT("錯誤: EEPROM 尺寸"); // "Err: EEPROM Index" + LSTR MSG_ERR_EEPROM_CRC = _UxGT("錯誤: EEPROM CRC"); // "EEPROM CRC Error" + LSTR MSG_ERR_EEPROM_SIZE = _UxGT("錯誤: EEPROM 尺寸"); // "EEPROM Index Error" LSTR MSG_ERR_EEPROM_VERSION = _UxGT("錯誤: EEPROM 版本"); // "EEPROM Version" LSTR MSG_MEDIA_UPDATE = _UxGT("媒體更新"); // "Media Update" LSTR MSG_RESET_PRINTER = _UxGT("重置打印機"); // "Reset Printer diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp index 989965d6d8849..d381cbe6da34c 100644 --- a/Marlin/src/module/probe.cpp +++ b/Marlin/src/module/probe.cpp @@ -548,7 +548,7 @@ bool Probe::set_deployed(const bool deploy, const bool no_return/*=false*/) { if (PROBE_TRIGGERED() == deploy) { // Unchanged after deploy/stow action? if (IsRunning()) { SERIAL_ERROR_MSG("Z-Probe failed"); - LCD_ALERTMESSAGE_F("Err: ZPROBE"); + LCD_ALERTMESSAGE_F("ZPROBE Error"); } stop(); return true;