From 98e7c159288791450fb5126a406a50cc46b305b6 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 17 Feb 2023 08:45:31 +0100 Subject: [PATCH] Change Eject filament -> Eject from MMU PFW-1497 --- Firmware/messages.cpp | 2 +- Firmware/messages.h | 2 +- Firmware/mmu2_reporting.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/po/Firmware_cs.po | 6 +++--- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 4 ++-- lang/po/Firmware_fr.po | 6 +++--- lang/po/Firmware_it.po | 6 +++--- lang/po/Firmware_pl.po | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 41fa50825..63a57ee24 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -57,7 +57,7 @@ const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_ const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING_TEST c=18 const char MSG_LOADING_FILAMENT[] PROGMEM_I1 = ISTR("Loading filament"); ////MSG_LOADING_FILAMENT c=20 const char MSG_TESTING_FILAMENT[] PROGMEM_I1 = ISTR("Testing filament"); ////MSG_TESTING_FILAMENT c=20 -const char MSG_EJECT_FILAMENT[] PROGMEM_I1 = ISTR("Eject filament"); ////MSG_EJECT_FILAMENT c=17 +const char MSG_EJECT_FROM_MMU[] PROGMEM_I1 = ISTR("Eject from MMU"); ////MSG_EJECT_FROM_MMU c=17 const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); ////MSG_CUT_FILAMENT c=17 const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////MSG_MAIN c=18 const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////MSG_BACK c=18 diff --git a/Firmware/messages.h b/Firmware/messages.h index 4c9abe779..fa6c08a81 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -221,7 +221,7 @@ extern const char MSG_ENDSTOP_OPEN[]; extern const char MSG_POWERUP[]; extern const char MSG_ERR_STOPPED[]; extern const char MSG_ENDSTOP_HIT[]; -extern const char MSG_EJECT_FILAMENT[]; +extern const char MSG_EJECT_FROM_MMU[]; extern const char MSG_CUT_FILAMENT[]; extern const char MSG_OCTOPRINT_ASK_PAUSE[]; extern const char MSG_OCTOPRINT_PAUSED[]; diff --git a/Firmware/mmu2_reporting.cpp b/Firmware/mmu2_reporting.cpp index 8a96424e8..9ca27eedf 100644 --- a/Firmware/mmu2_reporting.cpp +++ b/Firmware/mmu2_reporting.cpp @@ -316,7 +316,7 @@ void FullScreenMsgCut(uint8_t slot){ } void FullScreenMsgEject(uint8_t slot){ - FullScreenMsg(_T(MSG_EJECT_FILAMENT), slot); + FullScreenMsg(_T(MSG_EJECT_FROM_MMU), slot); } void FullScreenMsgTest(uint8_t slot){ diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d2acf60cc..5125032ac 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4981,7 +4981,7 @@ static void mmu_fil_eject_menu() { MENU_BEGIN(); MENU_ITEM_BACK_P(_T(MSG_MAIN)); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FILAMENT), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); ////MSG_EJECT_FILAMENT c=16 MENU_END(); } else { eFilamentAction = FilamentAction::MmuEject; @@ -5420,7 +5420,7 @@ static void lcd_main_menu() MENU_ITEM_SUBMENU_P(_T(MSG_LOAD_FILAMENT), mmu_load_filament_menu); MENU_ITEM_SUBMENU_P(_i("Load to nozzle"), mmu_load_to_nozzle_menu);////MSG_LOAD_TO_NOZZLE c=18 MENU_ITEM_SUBMENU_P(_T(MSG_UNLOAD_FILAMENT), mmu_unload_filament); - MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FILAMENT), mmu_fil_eject_menu); + MENU_ITEM_SUBMENU_P(_T(MSG_EJECT_FROM_MMU), mmu_fil_eject_menu); #ifdef MMU_HAS_CUTTER if (eeprom_read_byte((uint8_t*)EEPROM_MMU_CUTTER_ENABLED) != 0) { MENU_ITEM_SUBMENU_P(_T(MSG_CUT_FILAMENT), mmu_cut_filament_menu); diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 41987a69e..e7dadc465 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -499,11 +499,11 @@ msgstr "ERR: Cekam na uziv." msgid "ERROR:" msgstr "CHYBA:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Vysunout fil." +msgid "Eject from MMU" +msgstr "Vysunout z MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 953d2292d..9a7dbb270 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -503,10 +503,10 @@ msgstr "FEHL. Warte Benutzer" msgid "ERROR:" msgstr "FEHLER:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" +msgid "Eject from MMU" msgstr "Filamentauswurf" #. MSG_PROGRESS_EJECT_FILAMENT c=20 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index b8059cdbd..1209df712 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -500,10 +500,10 @@ msgstr "ERR Espera usuario" msgid "ERROR:" msgstr "ERROR:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" +msgid "Eject from MMU" msgstr "Expulsar fil." #. MSG_PROGRESS_EJECT_FILAMENT c=20 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 25fe1a932..0c9ca84fa 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -503,11 +503,11 @@ msgstr "ERR Att. Utilisateur" msgid "ERROR:" msgstr "ERREUR:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Remonter le fil." +msgid "Eject from MMU" +msgstr "Éjecter du MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 141e490c1..843b2be2a 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -501,11 +501,11 @@ msgstr "ERR Attendere utente" msgid "ERROR:" msgstr "ERRORE:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Espelli fil." +msgid "Eject from MMU" +msgstr "Espelli da MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 54fe76299..76c8e0aa7 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -501,11 +501,11 @@ msgstr "ERR czekam na uzytk." msgid "ERROR:" msgstr "BLAD:" -#. MSG_EJECT_FILAMENT c=17 +#. MSG_EJECT_FROM_MMU c=17 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 -msgid "Eject filament" -msgstr "Wysun filament" +msgid "Eject from MMU" +msgstr "Wysun z MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate