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"