From 98e7c159288791450fb5126a406a50cc46b305b6 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 17 Feb 2023 08:45:31 +0100 Subject: [PATCH 1/6] 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 From ec1ae321b3b41ecd1e321451bb493df6074dfac9 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 17 Feb 2023 11:18:44 +0100 Subject: [PATCH 2/6] ES translation --- lang/po/Firmware_es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 1209df712..c4b9c8cfb 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -504,7 +504,7 @@ msgstr "ERROR:" #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" -msgstr "Expulsar fil." +msgstr "Expulsar de MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate From 5cd60636f9cb9c3ef64d135e0f395d75ff2db399 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 17 Feb 2023 12:25:23 +0100 Subject: [PATCH 3/6] Add missing translations + shorten to 16 chars --- Firmware/messages.cpp | 2 +- Firmware/ultralcd.cpp | 6 +++--- lang/po/Firmware.pot | 4 ++-- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 4 ++-- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 6 +++--- lang/po/Firmware_hu.po | 6 +++--- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 6 +++--- lang/po/Firmware_no.po | 6 +++--- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 6 +++--- lang/po/Firmware_sk.po | 6 +++--- lang/po/Firmware_sv.po | 6 +++--- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 63a57ee24..8bbfd1fb7 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_FROM_MMU[] PROGMEM_I1 = ISTR("Eject from MMU"); ////MSG_EJECT_FROM_MMU 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/ultralcd.cpp b/Firmware/ultralcd.cpp index 5125032ac..bae490163 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_FROM_MMU), 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 diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 763fb7fba..b15bd4b9e 100644 --- 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 index e7dadc465..d8ddbfea8 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -499,7 +499,7 @@ msgstr "ERR: Cekam na uziv." msgid "ERROR:" msgstr "CHYBA:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 9a7dbb270..e100de481 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -503,11 +503,11 @@ msgstr "FEHL. Warte Benutzer" msgid "ERROR:" msgstr "FEHLER:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" -msgstr "Filamentauswurf" +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 index c4b9c8cfb..cc68b395b 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -500,7 +500,7 @@ msgstr "ERR Espera usuario" msgid "ERROR:" msgstr "ERROR:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 0c9ca84fa..7ae779591 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -503,7 +503,7 @@ msgstr "ERR Att. Utilisateur" msgid "ERROR:" msgstr "ERREUR:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index df738c193..70008b700 100644 --- 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 index 33e73c4ea..e636c042a 100644 --- 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 MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 843b2be2a..60f9a7cdd 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -501,7 +501,7 @@ msgstr "ERR Attendere utente" msgid "ERROR:" msgstr "ERRORE:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index af0d56de8..e96cf6e96 100644 --- 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 index 5b796e479..8631efb80 100644 --- 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 "Utkast fra MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 76c8e0aa7..4e55d25e7 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -501,7 +501,7 @@ msgstr "ERR czekam na uzytk." msgid "ERROR:" msgstr "BLAD:" -#. MSG_EJECT_FROM_MMU c=17 +#. MSG_EJECT_FROM_MMU c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index e3de5d5c8..156e4897a 100644 --- 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 index ddbca1d75..360a983ee 100644 --- 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 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 1e94b42e7..a4e21da0a 100644 --- 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 From 6f066db4439ea857eec690a5324da735601d4ff4 Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Fri, 17 Feb 2023 12:51:52 +0100 Subject: [PATCH 4/6] Update HU translation --- lang/po/Firmware_hu.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index e636c042a..373438841 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -505,7 +505,7 @@ msgstr "HIBA:" #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" -msgstr "Kiadás az MMU" +msgstr "Kiadás az MMUból" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate From fe71fa77a6aab3ec9f1509680a57a57fad4cd4df Mon Sep 17 00:00:00 2001 From: "D.R.racer" Date: Sat, 18 Feb 2023 17:40:09 +0100 Subject: [PATCH 5/6] Update NO translation --- lang/po/Firmware_no.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 8631efb80..463d50155 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -505,7 +505,7 @@ msgstr "FEIL:" #: ../../Firmware/messages.cpp:60 ../../Firmware/ultralcd.cpp:5111 #: ../../Firmware/ultralcd.cpp:5549 msgid "Eject from MMU" -msgstr "Utkast fra MMU" +msgstr "Løs ut fra MMU" #. MSG_PROGRESS_EJECT_FILAMENT c=20 #. @@todo duplicate From e6c3130ef34d6ee23f7a66db6001eb5ec405879a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 21 Feb 2023 07:24:21 +0100 Subject: [PATCH 6/6] Update SK po file Thanks to @ingbrzy see https://github.com/prusa3d/Prusa-Firmware/pull/4023#issuecomment-1436084153 --- lang/po/Firmware_sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 360a983ee..bf9f2c874 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -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