From c7e382f6ba118e27b71a15e1aa356ac9c7162a13 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 09:36:47 +0200 Subject: [PATCH 01/10] Add new message `Preload to MMU` to po files Inital translation --- lang/po/Firmware.pot | 5 +++++ lang/po/Firmware_cs.po | 5 +++++ lang/po/Firmware_de.po | 5 +++++ lang/po/Firmware_es.po | 5 +++++ lang/po/Firmware_fr.po | 5 +++++ lang/po/Firmware_hr.po | 5 +++++ lang/po/Firmware_hu.po | 5 +++++ lang/po/Firmware_it.po | 5 +++++ lang/po/Firmware_nl.po | 5 +++++ lang/po/Firmware_no.po | 5 +++++ lang/po/Firmware_pl.po | 5 +++++ lang/po/Firmware_ro.po | 5 +++++ lang/po/Firmware_sk.po | 5 +++++ lang/po/Firmware_sv.po | 5 +++++ 14 files changed, 70 insertions(+) diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index b76992fbc..66950b382 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1636,6 +1636,11 @@ msgstr "" msgid "Preheating to unload" msgstr "" +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "" + #. MSG_PROGRESS_PREPARE_BLADE c=20 #: ../../Firmware/mmu2_progress_converter.cpp:22 #: ../../Firmware/mmu2_progress_converter.cpp:53 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 057eba849..5347db3c4 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2530,6 +2530,11 @@ msgstr "" "Verze firmwaru MMU není kompatibilní s FW tiskárny. Aktualizujte na verzi " "2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Předzásobení MMU" + #~ msgid "Eject filament" #~ msgstr "Vysunout fil." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index b876a46f6..4bffa15f0 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2558,6 +2558,11 @@ msgstr "" "Die Firmware-Version der MMU ist mit der FW des Druckers nicht kompatibel. " "Update auf Version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Vorladen in MMU" + #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 5401d8b6d..a18597ee7 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -2554,6 +2554,11 @@ msgstr "" "La versión de firmware de la MMU es incompatible con el FW de la impresora. " "Actualizar a la versión 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Precarga a MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 470a80aad..4165e3821 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -2568,6 +2568,11 @@ msgstr "" "La version du MMU est incompatible avec le FW de l'imprimante. Mise à jour " "vers la version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Précharge à MMU" + #~ msgid "Reset MMU" #~ msgstr "Reini MMU" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index ea0d7c593..ed1ca1860 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -2547,6 +2547,11 @@ msgstr "" "Verzija firmware-a MMU nekompatibilna s FW-om pisača. Ažuriranje na verziju " "2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Predpunjenje MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 63e3970e8..66ff20f29 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2551,6 +2551,11 @@ msgstr "" "Az MMU firmware-verziója nem kompatibilis a nyomtató FW-vel. Frissíts a " "2.1.9-es verzióra." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Előtöltés az MMU" + #~ msgid "Reset MMU" #~ msgstr "MMUreszet" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index ef615e540..b241e6d62 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2552,6 +2552,11 @@ msgstr "" "La versione del firmware dell MMU non è compatibile con il firmware della " "stampante. Aggiornamento alla versione 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Precarico a MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 423118134..048387690 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2556,6 +2556,11 @@ msgstr "" "De firmwareversie van de MMU is niet compatibel met de firmware van de " "printer. Update naar versie 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Preload naar MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 791faf8df..4405649d2 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -2529,6 +2529,11 @@ msgstr "" "MMU fastvareversjon er inkompatibel med skriverens FW. Oppdatering til " "versjon 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Forlast til MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 318593691..247588d20 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2548,6 +2548,11 @@ msgstr "" "Wersja oprogramowania układowego MMU jest niezgodna z oprogramowaniem " "sprzętowym drukarki. Zaktualizuj do wersji 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Zaladuj do MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 775d92fc0..3e614b0a3 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -2552,6 +2552,11 @@ msgstr "" "Versiunea de firmware a MMU este incompatibilă cu FW-ul imprimantei. " "Actualizați la versiunea 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Preîncărcare MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index f95abaf83..fe96f1ba4 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2535,6 +2535,11 @@ msgstr "" "Verzia firmvéru MMU nie je kompatibilná s FW tlačiarne. Aktualizácia na " "verziu 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Předzásobení MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index f0d8e1d21..b514a2cdd 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -2542,6 +2542,11 @@ msgstr "" "MMU firmwareversion är inkompatibel med skrivarens FW. Uppdatering till " "version 2.1.9." +#. MSG_PRELOAD_TO_MMU c=17 +#: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 +msgid "Preload to MMU" +msgstr "Förladdning MMU" + #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 96614297e7c2164626797e0d1dc999ee4229dd99 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:26:49 +0200 Subject: [PATCH 02/10] Thanks to @arekam --- lang/po/Firmware_pl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 247588d20..b052c07ff 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -2551,7 +2551,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Zaladuj do MMU" +msgstr "Załaduj do MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 1ccc05d321704d9f9985db9ec1c36c263065ba02 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:31:51 +0200 Subject: [PATCH 03/10] Thanks to @shatter136 --- lang/po/Firmware_sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index fe96f1ba4..9042d975d 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -2538,7 +2538,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Předzásobení MMU" +msgstr "Predzásobenie MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From 212abfba9ed478ad4eae2c290f37bf0a2f1cdb8e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 10:41:28 +0200 Subject: [PATCH 04/10] Thanks to @AttilaSVK --- 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 66ff20f29..6a77db2af 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -2554,7 +2554,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Előtöltés az MMU" +msgstr "Betöltés az MMUba" #~ msgid "Reset MMU" #~ msgstr "MMUreszet" From 53e1dad772ef6b9a7cd759bed56fbf1072e2456e Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Mon, 22 May 2023 16:25:12 +0200 Subject: [PATCH 05/10] Thanks to @stelgenhof --- lang/po/Firmware_nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 048387690..258dd3499 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -2559,7 +2559,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Preload naar MMU" +msgstr "Voorladen in MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From a36b6755afbc1ee259203dde033d5e877fa3bb14 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 08:34:29 +0200 Subject: [PATCH 06/10] Thanks to @trfunk --- lang/po/Firmware_de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 4bffa15f0..5b07cd629 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -2561,7 +2561,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Vorladen in MMU" +msgstr "In MMU laden" #~ msgid "Eject filament" #~ msgstr "Filamentauswurf" From 5553e45ad3635855ecb0ef0bfa0add10d7ffcc08 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 08:41:45 +0200 Subject: [PATCH 07/10] Thanks to @wavexx and @SNDR0 --- lang/po/Firmware_it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index b241e6d62..db396df8a 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -2555,7 +2555,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Precarico a MMU" +msgstr "Precarica MMU" #~ msgid "Reset MMU" #~ msgstr "Reset MMU" From a37bcbfd8cc4597b8b0a598d9be90d595448e3e9 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 09:31:37 +0200 Subject: [PATCH 08/10] Fix `Load filament` to c=16 --- Firmware/messages.cpp | 2 +- Firmware/ultralcd.cpp | 6 +++--- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 4 ++-- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 4 ++-- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 4 ++-- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 2 +- lang/po/Firmware_sv.po | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 52c657386..fc795021d 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -53,7 +53,7 @@ const char MSG_SELECT_FILAMENT[] PROGMEM_I1 = ISTR("Select filament:"); ////MSG_ const char MSG_LAST_PRINT[] PROGMEM_I1 = ISTR("Last print"); ////MSG_LAST_PRINT c=18 const char MSG_LAST_PRINT_FAILURES[] PROGMEM_I1 = ISTR("Last print failures"); ////MSG_LAST_PRINT_FAILURES c=20 const char MSG_PRELOAD_TO_MMU[] PROGMEM_I1 = ISTR("Preload to MMU"); ////MSG_PRELOAD_TO_MMU c=17 -const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=17 +const char MSG_LOAD_FILAMENT[] PROGMEM_I1 = ISTR("Load filament"); ////MSG_LOAD_FILAMENT c=16 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 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 90ad87796..dbe27f27e 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4765,7 +4765,7 @@ static void mmu_preload_filament_menu() { MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), load_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); ////MSG_PRELOAD_TO_MMU c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', load_filament_wrapper, i); MENU_END(); } @@ -4788,7 +4788,7 @@ static void mmu_load_to_nozzle_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_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', lcd_mmu_load_to_nozzle_wrapper, i); MENU_END(); } @@ -4834,7 +4834,7 @@ static void mmu_loading_test_menu() { MENU_ITEM_BACK_P(_T(MSG_MAIN)); MENU_ITEM_FUNCTION_P(_T(MSG_LOAD_ALL), loading_test_all_wrapper); for (uint8_t i = 0; i < MMU_FILAMENT_COUNT; i++) - MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); ////MSG_LOAD_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), i + '1', loading_test_wrapper, i); MENU_END(); } diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 66950b382..e49dc17f0 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -1033,7 +1033,7 @@ msgstr "" msgid "Load All" msgstr "" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 5347db3c4..bdafdedfe 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -1056,7 +1056,7 @@ msgstr "Doladeni osy Z" msgid "Load All" msgstr "Nacist vse" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 5b07cd629..faa693194 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -1068,7 +1068,7 @@ msgstr "Z einstellen" msgid "Load All" msgstr "Alle laden" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index a18597ee7..8835238d5 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -1069,12 +1069,12 @@ msgstr "Micropaso Eje Z" msgid "Load All" msgstr "Intr. todos fil." -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Introducir filam." +msgstr "Introducir fil." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 4165e3821..5334eeb5a 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -1076,7 +1076,7 @@ msgstr "Ajuster Z en dir." msgid "Load All" msgstr "Tout Charger" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index ed1ca1860..bcff560fd 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -1068,12 +1068,12 @@ msgstr "Live podesavanje Z" msgid "Load All" msgstr "Puni sve" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Napunite filament" +msgstr "Napunite fil." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 6a77db2af..9d56c1834 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -1069,7 +1069,7 @@ msgstr "Z magassag beall." msgid "Load All" msgstr "Ossz.bet" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index db396df8a..0d9e35ae2 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -1071,7 +1071,7 @@ msgstr "Compensazione Z" msgid "Load All" msgstr "Carica tutti" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 258dd3499..a0e6d4e5f 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -1072,7 +1072,7 @@ msgstr "Live Z aanpassen" msgid "Load All" msgstr "Laad alle" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 4405649d2..76f1e1ab5 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -1062,12 +1062,12 @@ msgstr "Juster Live-Z" msgid "Load All" msgstr "Last Alle" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 msgid "Load filament" -msgstr "Last inn filament" +msgstr "Last inn filam." #. MSG_LOAD_TO_NOZZLE c=18 #: ../../Firmware/ultralcd.cpp:5426 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index b052c07ff..7c58bae11 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -1068,7 +1068,7 @@ msgstr "Ustaw. Live Z" msgid "Load All" msgstr "Zalad. wszystkie" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 3e614b0a3..0325d6d8f 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -1070,7 +1070,7 @@ msgstr "Reglare Z live" msgid "Load All" msgstr "Incarca toate" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 9042d975d..ed1a36653 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -1064,7 +1064,7 @@ msgstr "Doladenie osi Z" msgid "Load All" msgstr "Zaviest vsetko" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index b514a2cdd..45c1478aa 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -1069,7 +1069,7 @@ msgstr "Live justera Z" msgid "Load All" msgstr "Ladda alla" -#. MSG_LOAD_FILAMENT c=17 +#. MSG_LOAD_FILAMENT c=16 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:4952 #: ../../Firmware/ultralcd.cpp:4971 ../../Firmware/ultralcd.cpp:5032 #: ../../Firmware/ultralcd.cpp:5425 ../../Firmware/ultralcd.cpp:5442 From f43451f80b83d9cc9651845f274d5b34b029b447 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 09:50:27 +0200 Subject: [PATCH 09/10] Update `MSG_EJECT_FILAMENT` and `MSG_CUT_FILAMENT` to `c=16` Had to shorten SK translation --- Firmware/messages.cpp | 2 +- Firmware/ultralcd.cpp | 4 ++-- lang/po/Firmware.pot | 2 +- lang/po/Firmware_cs.po | 2 +- lang/po/Firmware_de.po | 2 +- lang/po/Firmware_es.po | 2 +- lang/po/Firmware_fr.po | 2 +- lang/po/Firmware_hr.po | 2 +- lang/po/Firmware_hu.po | 2 +- lang/po/Firmware_it.po | 2 +- lang/po/Firmware_nl.po | 2 +- lang/po/Firmware_no.po | 2 +- lang/po/Firmware_pl.po | 2 +- lang/po/Firmware_ro.po | 2 +- lang/po/Firmware_sk.po | 4 ++-- lang/po/Firmware_sv.po | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index fc795021d..a1647d329 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -58,7 +58,7 @@ const char MSG_LOADING_TEST[] PROGMEM_I1 = ISTR("Loading Test"); ////MSG_LOADING 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=16 -const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); ////MSG_CUT_FILAMENT c=17 +const char MSG_CUT_FILAMENT[] PROGMEM_I1 = ISTR("Cut filament"); ////MSG_CUT_FILAMENT c=16 const char MSG_MAIN[] PROGMEM_I1 = ISTR("Main"); ////MSG_MAIN c=18 const char MSG_BACK[] PROGMEM_I1 = ISTR("Back"); ////MSG_BACK c=18 const char MSG_SHEET[] PROGMEM_I1 = ISTR("Sheet"); ////MSG_SHEET c=10 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dbe27f27e..c70ce9af9 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4801,7 +4801,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_FROM_MMU c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_EJECT_FROM_MMU), i + '1', mmu_eject_filament, i); MENU_END(); } @@ -4814,7 +4814,7 @@ static void mmu_cut_filament_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_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); ////MSG_CUT_FILAMENT c=16 + MENU_ITEM_FUNCTION_NR_P(_T(MSG_CUT_FILAMENT), i + '1', mmu_cut_filament_wrapper, i); MENU_END(); } #endif //MMU_HAS_CUTTER diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index e49dc17f0..011591d47 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -383,7 +383,7 @@ msgid "" "Normal mode" msgstr "" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index bdafdedfe..554642e13 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -402,7 +402,7 @@ msgstr "" "funguje pouze v\n" "Normal modu" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index faa693194..7e960fddd 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -405,7 +405,7 @@ msgstr "" "nur im Modus Normal\n" "genutzt werden" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index 8835238d5..13edf460a 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -402,7 +402,7 @@ msgstr "" "ser activada solo en\n" "Modo normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index 5334eeb5a..5375ef7e0 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -405,7 +405,7 @@ msgstr "" "active seulement en\n" "mode Normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index bcff560fd..e6406ee05 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -399,7 +399,7 @@ msgid "" "Normal mode" msgstr "Detekcija udarca moze biti ukljuceno samo u Normalnom nacinu rada" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 9d56c1834..43756b906 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -402,7 +402,7 @@ msgstr "" "normal modban\n" "kapcsolhato be" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index 0d9e35ae2..f95d64b53 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -404,7 +404,7 @@ msgstr "" "attivabile solo\n" "in Modalita normale" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index a0e6d4e5f..c52b95d68 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -404,7 +404,7 @@ msgstr "" "alleen in normaal\n" "gebruikt worden" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 76f1e1ab5..63c539a69 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -403,7 +403,7 @@ msgstr "" "bare skrus på i\n" "Normal modus" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 7c58bae11..dfbae3322 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -404,7 +404,7 @@ msgstr "" "tylko w\n" "trybie Normalnym" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index 0325d6d8f..95ada7ee6 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -405,7 +405,7 @@ msgstr "" "poate fi pornita\n" "doar in modul normal" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index ed1a36653..2ff9248a3 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -402,11 +402,11 @@ msgstr "" "byt zapnuta len v\n" "Normalnom rezime" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" -msgstr "Odstrihnut filam." +msgstr "Odstrihnut fil." #. MSG_CUTTER c=9 #: ../../Firmware/messages.cpp:130 ../../Firmware/ultralcd.cpp:4182 diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 45c1478aa..781d6d903 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -403,7 +403,7 @@ msgstr "" "endast aktiveras i\n" "normalt läge" -#. MSG_CUT_FILAMENT c=17 +#. MSG_CUT_FILAMENT c=16 #: ../../Firmware/messages.cpp:60 ../../Firmware/mmu2_reporting.cpp:327 #: ../../Firmware/ultralcd.cpp:5007 ../../Firmware/ultralcd.cpp:5431 msgid "Cut filament" From d9eadd39b06d4f17c82aba083797c712635784a3 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 23 May 2023 17:18:34 +0200 Subject: [PATCH 10/10] Thanks to @Janys --- lang/po/Firmware_cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 554642e13..cf10b606b 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -2533,7 +2533,7 @@ msgstr "" #. MSG_PRELOAD_TO_MMU c=17 #: ../../Firmware/messages.cpp:55 ../../Firmware/ultralcd.cpp:5227 msgid "Preload to MMU" -msgstr "Předzásobení MMU" +msgstr "Zavést do MMU" #~ msgid "Eject filament" #~ msgstr "Vysunout fil."