Merge pull request MarlinFirmware#4023 from DRracer/rename-eject-mmu

PFW-1497 Change Eject filament -> Eject from MMU
drewmoseley · Feb 23, 2023 · 31bfbb4 · 31bfbb4
2 parents afc866e + e6c3130
commit 31bfbb4
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 50 deletions.
diff --git 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=16
 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
@@ -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
@@ -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
@@ -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_FROM_MMU c=16
         MENU_END();
     } else {
         eFilamentAction = FilamentAction::MmuEject;
@@ -5309,9 +5309,9 @@ static void lcd_sheet_menu()
 //!
 //! | AutoLoad filament  | not printing + not mmu or paused
 //! | Load filament      | not printing + mmu or paused
-//! | Load to nozzle      | not printing + mmu or paused
+//! | Load to nozzle     | not printing + mmu or paused
 //! | Unload filament    | not printing or paused
-//! | Eject filament     | not printing + mmu or paused
+//! | Eject from MMU     | not printing + mmu or paused
 //! | Cut filament       | not printing + mmu or paused + cut atctive
 //! | Settings           | not printing or paused
 //! | Calibration        | not printing 
@@ -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.pot b/lang/po/Firmware.pot
@@ -478,10 +478,10 @@ msgstr ""
 msgid "ERROR:"
 msgstr ""
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
+msgid "Eject from MMU"
 msgstr ""
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20

diff --git 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=16
 #: ../../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
@@ -502,11 +502,11 @@ msgstr "FEHL. Warte Benutzer"
 msgid "ERROR:"
 msgstr "FEHLER:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Filamentauswurf"
+msgid "Eject from MMU"
+msgstr "Auswerf. aus MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po
@@ -500,11 +500,11 @@ msgstr "ERR Espera usuario"
 msgid "ERROR:"
 msgstr "ERROR:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Expulsar fil."
+msgid "Eject from MMU"
+msgstr "Expulsar de MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git 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=16
 #: ../../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_hr.po b/lang/po/Firmware_hr.po
@@ -498,11 +498,11 @@ msgstr "ERR Cekam korisnika"
 msgid "ERROR:"
 msgstr "POGRESKA:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Izbaci filament"
+msgid "Eject from MMU"
+msgstr "Izbaci iz MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po
@@ -501,11 +501,11 @@ msgstr "Felh. varakozas HIBA"
 msgid "ERROR:"
 msgstr "HIBA:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Filament kiadasa"
+msgid "Eject from MMU"
+msgstr "Kiadás az MMUból"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git 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=16
 #: ../../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_nl.po b/lang/po/Firmware_nl.po
@@ -503,11 +503,11 @@ msgstr "FOUT Wacht gebruiker"
 msgid "ERROR:"
 msgstr "FOUT:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Fil. uitwerpen"
+msgid "Eject from MMU"
+msgstr "Uitwerp. van MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po
@@ -501,11 +501,11 @@ msgstr "ERR Vent på Bruker"
 msgid "ERROR:"
 msgstr "FEIL:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Mat ut filament"
+msgid "Eject from MMU"
+msgstr "Løs ut fra MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git 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=16
 #: ../../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

diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po
@@ -503,11 +503,11 @@ msgstr "ERR Astept utilizat."
 msgid "ERROR:"
 msgstr "EROARE:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Scoate filament"
+msgid "Eject from MMU"
+msgstr "Scoateți din MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate

diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po
@@ -500,11 +500,11 @@ msgstr "ERR Wait for User"
 msgid "ERROR:"
 msgstr "ERROR:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Vysunut fil."
+msgid "Eject from MMU"
+msgstr "Vysunúť z MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate
@@ -1221,7 +1221,7 @@ msgstr "Vyrovnanie podl."
 #: ../../Firmware/ultralcd.cpp:5750 ../../Firmware/ultralcd.cpp:5751
 #: ../../Firmware/ultralcd.cpp:5752 ../../Firmware/ultralcd.cpp:5836
 msgid "Mode"
-msgstr "Mod"
+msgstr "Rezim"
 
 #. MSG_MODE_CHANGE_IN_PROGRESS c=20 r=3
 #: ../../Firmware/ultralcd.cpp:3576
@@ -2134,7 +2134,7 @@ msgstr "TMC UNDERVOLTAGE ERR"
 #. MSG_TM_CAL c=20 r=4
 #: ../../Firmware/ultralcd.cpp:4054
 msgid "Thermal model cal. takes approx. 12 mins. See\nprusa.io/tm-cal"
-msgstr "Výpočet termálny modelu trvá asi 12 min. Pozri\nprusa.io/tm-cal"
+msgstr "Výpočet termálneho modelu trvá asi 12 min. Pozri\nprusa.io/tm-cal"
 
 #. MSG_TM_NOT_CAL c=20 r=4
 #: ../../Firmware/Marlin_main.cpp:1527 ../../Firmware/Marlin_main.cpp:3404

diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po
@@ -500,11 +500,11 @@ msgstr "FEL Inväntar anv"
 msgid "ERROR:"
 msgstr "FEL:"
 
-#. MSG_EJECT_FILAMENT c=17
+#. MSG_EJECT_FROM_MMU c=16
 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111
 #: ../../Firmware/ultralcd.cpp:5549
-msgid "Eject filament"
-msgstr "Mata ut filament"
+msgid "Eject from MMU"
+msgstr "Utmat från MMU"
 
 #. MSG_PROGRESS_EJECT_FILAMENT c=20
 #. @@todo duplicate