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