diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 247f796dc..45d5021fa 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -917,7 +917,7 @@ void show_fw_version_warnings() { //! @brief try to check if firmware is on right type of printer static void check_if_fw_is_on_right_printer() { if (fsensor.probeOtherType()) { - lcd_show_fullscreen_message_and_wait_P(_i(PRINTER_NAME " firmware detected on " PRINTER_NAME_ALTERNATE " printer"));////c=20 r=4 + lcd_show_fullscreen_message_and_wait_P(_T(MSG_FW_MK3_DETECTED)); } } #endif //defined(FILAMENT_SENSOR) && defined(FSENSOR_PROBING) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 51200d507..2de76b75f 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -364,7 +364,7 @@ extern const char MSG_FILE_INCOMPLETE [] PROGMEM_I1 = ISTR("File incomplete. Con extern const char MSG_SD_REMOVED [] PROGMEM_I1 = ISTR("Card removed"); ////MSG_SD_REMOVED c=20 extern const char MSG_NEW_FIRMWARE_AVAILABLE [] PROGMEM_I1 = ISTR("New firmware version available:"); ////MSG_NEW_FIRMWARE_AVAILABLE c=20 r=2 extern const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE [] PROGMEM_I1 = ISTR("Please upgrade."); ////MSG_NEW_FIRMWARE_PLEASE_UPGRADE c=20 - +extern const char MSG_FW_MK3_DETECTED [] PROGMEM_I1 = ISTR(PRINTER_NAME " firmware detected on " PRINTER_NAME_ALTERNATE " printer"); ////MSG_FW_MK3_DETECTED c=20 r=4 //not internationalized messages #if 0 const char MSG_FW_VERSION_BETA[] PROGMEM_N1 = "You are using a BETA firmware version! It is in a development state! Use this version with CAUTION as it may DAMAGE the printer!"; ////MSG_FW_VERSION_BETA c=20 r=8 diff --git a/Firmware/messages.h b/Firmware/messages.h index 78caf0017..a6559ac28 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -365,6 +365,7 @@ extern const char MSG_FILE_INCOMPLETE []; extern const char MSG_SD_REMOVED []; extern const char MSG_NEW_FIRMWARE_AVAILABLE []; extern const char MSG_NEW_FIRMWARE_PLEASE_UPGRADE []; +extern const char MSG_FW_MK3_DETECTED []; //not internationalized messages #if 0 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 3fb0eebd8..1ecbc185b 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -2481,11 +2481,11 @@ msgid "🔃Refresh" msgstr "" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 4d1af61d4..682d071ea 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2514,12 +2514,12 @@ msgid "Preload to MMU" msgstr "ZavĂ©st do MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3 firmware detekovĂĄn na MK3S tiskarně" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detekovĂĄn na tiskarně MK3" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 366cbf662..d9434d49d 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2540,12 +2540,12 @@ msgid "Preload to MMU" msgstr "In MMU laden" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-Firmware am MK3S-Drucker erkannt" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-Firmware auf MK3-Drucker erkannt" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 0acf015dc..823932047 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2536,12 +2536,12 @@ msgid "Preload to MMU" msgstr "Precarga a MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectado en impresora MK3S" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectado en impresora MK3" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 7b1c57667..233ae4809 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2547,12 +2547,12 @@ msgid "Preload to MMU" msgstr "PrĂ©charge Ă  MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 dĂ©tectĂ© sur imprimante MK3S" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S dĂ©tectĂ© sur imprimante MK3" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index fe4675591..f858ca304 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2531,12 +2531,12 @@ msgid "Preload to MMU" msgstr "Predpunjenje MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3 firmware otkriven na MK3S printeru" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware detektiran na MK3 printeru" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 50aa2e604..510725f8f 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2535,12 +2535,12 @@ msgid "Preload to MMU" msgstr "BetöltĂ©s az MMUba" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3 firmver telepitve MK3S nyomtatora" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmver eszlelve MK3 nyomtaton" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 8ff15057a..14a08ce5f 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2536,12 +2536,12 @@ msgid "Preload to MMU" msgstr "Precarica MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 rilevato su stampante MK3S" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S rilevato su stampante MK3" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index a075d1260..732e43518 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2539,12 +2539,12 @@ msgid "Preload to MMU" msgstr "Voorladen in MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-firmware bij MK3S-printer gedetecteerd" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-firmware op MK3-printer ontdekt" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index e3742da65..b8e98a782 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2513,12 +2513,12 @@ msgid "Preload to MMU" msgstr "Forlast til MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3 system funnet pĂ„ MK3S printer" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S systemvare funnet pĂ„ MK3 printer" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index b8833f6fc..d092150ea 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2529,12 +2529,12 @@ msgid "Preload to MMU" msgstr "ZaƂaduj do MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "Wykryto firmware MK3 w drukarce MK3S" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "Wykryto firmware MK3S w drukarce MK3" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 63b75d01d..84fc5630f 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2537,12 +2537,12 @@ msgid "Preload to MMU" msgstr "PreĂźncărcare MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "Firmware MK3 detectat pe imprimanta MK3S" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "Firmware MK3S detectat pe imprimanta MK3" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 6b42523be..61898c0b6 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2519,12 +2519,12 @@ msgid "Preload to MMU" msgstr "PredzĂĄsobenie MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3 firmware na MK3S tlačiarni" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S firmware na MK3 tlačiarni" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index d02fa6a23..1559852ea 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2526,12 +2526,12 @@ msgid "Preload to MMU" msgstr "Förladdning MMU" #. MSG_FW_MK3_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3 firmware detected on MK3S printer" msgstr "MK3-firmware upptĂ€ckt pĂ„ MK3S-skrivare" #. MSG_FW_MK3S_DETECTED c=20 r=4 -#: ../../Firmware/Marlin_main.cpp:920 +#: ../../Firmware/messages.cpp:367 ../../Firmware/Marlin_main.cpp:920 msgid "MK3S firmware detected on MK3 printer" msgstr "MK3S-firmware upptĂ€ckt pĂ„ MK3-skrivare"