From d87f499443c371a6456bf6df985daee930c7c8b1 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 23 Nov 2022 11:39:26 +0100 Subject: [PATCH 1/4] Nozzle change menu Fix cherry pick --- Firmware/messages.cpp | 3 +++ Firmware/messages.h | 3 +++ Firmware/ultralcd.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++ Firmware/ultralcd.h | 1 + lang/po/Firmware.pot | 17 ++++++++++++++ lang/po/Firmware_cs.po | 19 +++++++++++++++ lang/po/Firmware_da.po | 17 ++++++++++++++ lang/po/Firmware_de.po | 21 +++++++++++++++++ lang/po/Firmware_es.po | 20 ++++++++++++++++ lang/po/Firmware_fr.po | 19 +++++++++++++++ lang/po/Firmware_hr.po | 17 ++++++++++++++ lang/po/Firmware_hu.po | 17 ++++++++++++++ lang/po/Firmware_it.po | 19 +++++++++++++++ lang/po/Firmware_lb.po | 17 ++++++++++++++ lang/po/Firmware_lt.po | 17 ++++++++++++++ lang/po/Firmware_nl.po | 19 +++++++++++++++ lang/po/Firmware_no.po | 17 ++++++++++++++ lang/po/Firmware_pl.po | 19 +++++++++++++++ lang/po/Firmware_ro.po | 17 ++++++++++++++ lang/po/Firmware_sk.po | 17 ++++++++++++++ lang/po/Firmware_sl.po | 17 ++++++++++++++ lang/po/Firmware_sv.po | 17 ++++++++++++++ 22 files changed, 383 insertions(+) diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index 308988813..7ac90e006 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -165,6 +165,9 @@ extern const char MSG_PAUSED_THERMAL_ERROR[] PROGMEM_I1 = ISTR("PAUSED THERMAL E #ifdef TEMP_MODEL extern const char MSG_THERMAL_ANOMALY[] PROGMEM_I1 = ISTR("THERMAL ANOMALY");////MSG_THERMAL_ANOMALY c=20 #endif +extern const char MSG_NOZZLE_CNG_MENU [] PROGMEM_I1 = ISTR("Nozzle change");////MSG_NOZZLE_CNG_MENU c=18 +extern const char MSG_NOZZLE_CNG_READ_HELP [] PROGMEM_I1 = ISTR("For a Nozzle change please read\nprusa.io/nozzle-mk3s");////MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +extern const char MSG_NOZZLE_CNG_CHANGED [] PROGMEM_I1 = ISTR("Hotend at 280C! Nozzle changed and tightened to specs?");////MSG_NOZZLE_CNG_CHANGED c=20 r=6 //not internationalized messages #if 0 diff --git a/Firmware/messages.h b/Firmware/messages.h index 2c7015342..e9fc7b082 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -169,6 +169,9 @@ extern const char MSG_PAUSED_THERMAL_ERROR[]; #ifdef TEMP_MODEL extern const char MSG_THERMAL_ANOMALY[]; #endif +extern const char MSG_NOZZLE_CNG_MENU []; +extern const char MSG_NOZZLE_CNG_READ_HELP []; +extern const char MSG_NOZZLE_CNG_CHANGED []; //not internationalized messages #if 0 diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 1fa915d90..2015ef028 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1061,6 +1061,52 @@ void lcd_commands() } } #endif //TEMP_MODEL + + if (lcd_commands_type == LcdCommands::NozzleCNG) + { + if (!blocks_queued() && cmd_buffer_empty() && !saved_printing) + { + switch(lcd_commands_step) + { + case 0: + lcd_commands_step = 3; + break; + case 3: + lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP)); + enquecommand_P(PSTR("G28W")); + enquecommand_P(PSTR("G1 X125 Y10 Z150 F1000")); + enquecommand_P(PSTR("M109 S280")); +#ifdef TEMP_MODEL + //enquecommand_P(PSTR("M310 S0")); + temp_model_set_enabled(false); +#endif //TEMP_MODEL + lcd_commands_step = 2; + break; + case 2: + //|0123456789012456789| + //|Hotend at 280C! + //|Nozzle changed and + //|tightend to specs? + //| Yes No + enquecommand_P(PSTR("M84 XY")); + if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) { +#ifdef TEMP_MODEL + //enquecommand_P(PSTR("M310 S1")); + temp_model_set_enabled(true); +#endif //TEMP_MODEL + //enquecommand_P(PSTR("M104 S0")); + setTargetHotendSafe(0,0); + lcd_commands_step = 1; + } + break; + case 1: + lcd_setstatuspgm(MSG_WELCOME); + lcd_commands_step = 0; + lcd_commands_type = LcdCommands::Idle; + break; + } + } + } } void lcd_return_to_status() @@ -4755,6 +4801,12 @@ static void sheets_menu() MENU_END(); } +static void nozzle_change() +{ + lcd_commands_type = LcdCommands::NozzleCNG; + lcd_return_to_status(); +} + void lcd_hw_setup_menu(void) // can not be "static" { typedef struct @@ -4782,6 +4834,7 @@ void lcd_hw_setup_menu(void) // can not be "static" MENU_ITEM_SUBMENU_P(_T(MSG_STEEL_SHEETS), sheets_menu); SETTINGS_NOZZLE; + MENU_ITEM_FUNCTION_P(_T(MSG_NOZZLE_CNG_MENU),nozzle_change); MENU_ITEM_SUBMENU_P(_i("Checks"), lcd_checking_menu); ////MSG_CHECKS c=18 #ifdef IR_SENSOR_ANALOG diff --git a/Firmware/ultralcd.h b/Firmware/ultralcd.h index ef89dccaa..2c34c5128 100755 --- a/Firmware/ultralcd.h +++ b/Firmware/ultralcd.h @@ -114,6 +114,7 @@ enum class LcdCommands : uint_least8_t #ifdef TEMP_MODEL TempModel, #endif //TEMP_MODEL + NozzleCNG, }; extern LcdCommands lcd_commands_type; diff --git a/lang/po/Firmware.pot b/lang/po/Firmware.pot index 5578f3365..ecda8e1d6 100644 --- a/lang/po/Firmware.pot +++ b/lang/po/Firmware.pot @@ -592,6 +592,13 @@ msgstr "" msgid "Flow" msgstr "" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -703,6 +710,11 @@ msgstr "" msgid "High power" msgstr "" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1092,6 +1104,11 @@ msgstr "" msgid "Nozzle" msgstr "" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index aaa8d1714..7d9d480f3 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -618,6 +618,15 @@ msgstr "Opravte chybu a pote stisknete tlacitko na jednotce MMU." msgid "Flow" msgstr "Prutok" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"Pro výměnu trysek si přečtěte\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -739,6 +748,11 @@ msgstr "" msgid "High power" msgstr "Vys. vykon" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend při 280C! Tryska vyměněna a dotažena podle specifikací?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1130,6 +1144,11 @@ msgstr "Nyni odstrante testovaci vytisk z tiskoveho platu." msgid "Nozzle" msgstr "Tryska" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Výměna trysek" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_da.po b/lang/po/Firmware_da.po index 0620c7ce6..0b1620ac4 100644 --- a/lang/po/Firmware_da.po +++ b/lang/po/Firmware_da.po @@ -601,6 +601,13 @@ msgstr "" msgid "Flow" msgstr "" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -714,6 +721,11 @@ msgstr "" msgid "High power" msgstr "" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1103,6 +1115,11 @@ msgstr "" msgid "Nozzle" msgstr "" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index 5cd08f2f7..bacbecd9d 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -619,6 +619,15 @@ msgstr "Beseitigen Sie das Problem und drücken Sie dann den Knopf am MMU." msgid "Flow" msgstr "Durchfluss" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"Für Düsenwechsel lesen Sie bitte\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -741,6 +750,13 @@ msgstr "" msgid "High power" msgstr "Hohe leist" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" +"Hotend bei 280C! Wurde die Düse ausgetauscht und entsprechend den " +"Spezifikationen angezogen?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1137,6 +1153,11 @@ msgstr "Testdruck jetzt von Stahlblech entfernen." msgid "Nozzle" msgstr "Düse" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Düsenwechsel" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index ffa9bb747..b773610b0 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -618,6 +618,15 @@ msgstr "Corrige el problema y pulsa el boton en la unidad MMU." msgid "Flow" msgstr "Flujo" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"Para un cambio de boquilla por fa. lea\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -740,6 +749,12 @@ msgstr "" msgid "High power" msgstr "Rend.pleno" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Calentador a 280C! Se ha cambiado la boquilla y se ha ajustado a " +"las especificaciones?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1134,6 +1149,11 @@ msgstr "Ahora retira la prueba de la lamina de acero." msgid "Nozzle" msgstr "Boquilla" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Cambio de boquilla" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index b4cd2b05b..c9559f4b9 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -620,6 +620,15 @@ msgstr "Corrigez le probleme et appuyez sur le bouton sur la MMU." msgid "Flow" msgstr "Flux" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -744,6 +753,11 @@ msgstr "" msgid "High power" msgstr "Haut.puiss" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend at 280C! Nozzle changed and tightened to specs?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1140,6 +1154,11 @@ msgstr "Retirez maintenant l'impression de test de la plaque en acier." msgid "Nozzle" msgstr "Buse" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Changement de buse" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_hr.po b/lang/po/Firmware_hr.po index a180a23a9..c5622bbc2 100644 --- a/lang/po/Firmware_hr.po +++ b/lang/po/Firmware_hr.po @@ -616,6 +616,13 @@ msgstr "Rijesite problem, a zatim pritisnite gumb na MMU jedinici." msgid "Flow" msgstr "Protok" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -738,6 +745,11 @@ msgstr "" msgid "High power" msgstr "Visoka sna" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1132,6 +1144,11 @@ msgstr "Sada uklonite probni print sa celicne ploce." msgid "Nozzle" msgstr "Mlaznica" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_hu.po b/lang/po/Firmware_hu.po index 784b94897..3462a41ae 100644 --- a/lang/po/Firmware_hu.po +++ b/lang/po/Firmware_hu.po @@ -617,6 +617,13 @@ msgstr "Hozd helyre a hibat, majd nyomd meg a gombot az MMU egysegen." msgid "Flow" msgstr "Flow" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -739,6 +746,11 @@ msgstr "" msgid "High power" msgstr "Magas ero" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1133,6 +1145,11 @@ msgstr "Vedd le a tesztnyomatot az acellaprol." msgid "Nozzle" msgstr "Fuvoka" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_it.po b/lang/po/Firmware_it.po index efdefcb03..8375c92e4 100644 --- a/lang/po/Firmware_it.po +++ b/lang/po/Firmware_it.po @@ -618,6 +618,15 @@ msgstr "Risolvere il problema e premere il bottone sull'unita MMU." msgid "Flow" msgstr "Flusso" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"Per la sostituzione dell'ugello, leggere\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -740,6 +749,11 @@ msgstr "" msgid "High power" msgstr "Forte" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend a 280C! Ugello cambiato e serrato secondo le specifiche?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1132,6 +1146,11 @@ msgstr "Ora rimuovete la stampa di prova dalla piastra in acciaio." msgid "Nozzle" msgstr "Ugello" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Cambio dell'ugello" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_lb.po b/lang/po/Firmware_lb.po index 571d96078..714e8466d 100644 --- a/lang/po/Firmware_lb.po +++ b/lang/po/Firmware_lb.po @@ -601,6 +601,13 @@ msgstr "" msgid "Flow" msgstr "" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -714,6 +721,11 @@ msgstr "" msgid "High power" msgstr "" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1103,6 +1115,11 @@ msgstr "" msgid "Nozzle" msgstr "" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_lt.po b/lang/po/Firmware_lt.po index 0b863189b..382b587a6 100644 --- a/lang/po/Firmware_lt.po +++ b/lang/po/Firmware_lt.po @@ -601,6 +601,13 @@ msgstr "" msgid "Flow" msgstr "" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -714,6 +721,11 @@ msgstr "" msgid "High power" msgstr "" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1103,6 +1115,11 @@ msgstr "" msgid "Nozzle" msgstr "" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_nl.po b/lang/po/Firmware_nl.po index 7801321be..79445ce41 100644 --- a/lang/po/Firmware_nl.po +++ b/lang/po/Firmware_nl.po @@ -620,6 +620,15 @@ msgstr "Los het probleem op en druk vervolgens op de knop op de MMU-eenheid." msgid "Flow" msgstr "Stromen" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"Voor een spuitstukwissel lees\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -742,6 +751,11 @@ msgstr "" msgid "High power" msgstr "Hoog verm." +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend op 280C! Mondstuk vervangen en aangedraaid volgens specificaties?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1134,6 +1148,11 @@ msgstr "Verwijder nu de testprint van staalplaat." msgid "Nozzle" msgstr "Tuit" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Tuit wisselen" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_no.po b/lang/po/Firmware_no.po index 9cbd9a7a1..cd1a84bfd 100644 --- a/lang/po/Firmware_no.po +++ b/lang/po/Firmware_no.po @@ -616,6 +616,13 @@ msgstr "Løs problemet og trykk på MM-enhetens knapp." msgid "Flow" msgstr "Flyt" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -734,6 +741,11 @@ msgstr "" msgid "High power" msgstr "Høy styrke" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1125,6 +1137,11 @@ msgstr "Fjern nå testprintet fra stålplaten." msgid "Nozzle" msgstr "Dyse" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 69a57a736..4a2535dfc 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -618,6 +618,15 @@ msgstr "Rozwiaz problem i wcisnij przycisk na MMU." msgid "Flow" msgstr "Przeplyw" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" +"W celu wymiany dyszy należy przeczytać\n" +"prusa.io/nozzle-mk3s" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -737,6 +746,11 @@ msgstr "" msgid "High power" msgstr "Wysoka wyd" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend w temperaturze 280C! Wymieniona dysza i dokręcona do specyfikacji?" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1130,6 +1144,11 @@ msgstr "Teraz zdejmij wydruk testowy ze stolu." msgid "Nozzle" msgstr "Dysza" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "Wymiana dyszy" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_ro.po b/lang/po/Firmware_ro.po index cabc78fa1..4ab6976f7 100644 --- a/lang/po/Firmware_ro.po +++ b/lang/po/Firmware_ro.po @@ -619,6 +619,13 @@ msgstr "Rezolvati problema si apasati butonul pe unitatea MMU." msgid "Flow" msgstr "Flow" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -740,6 +747,11 @@ msgstr "" msgid "High power" msgstr "Put. max" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1131,6 +1143,11 @@ msgstr "Acum inlaturati printul de test de pe suprafata de print." msgid "Nozzle" msgstr "Varf" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_sk.po b/lang/po/Firmware_sk.po index 96effa882..af867ab6e 100644 --- a/lang/po/Firmware_sk.po +++ b/lang/po/Firmware_sk.po @@ -617,6 +617,13 @@ msgstr "Opravte chybu a potom stlacte tlacidlo na jednotke MMU." msgid "Flow" msgstr "Prietok" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -737,6 +744,11 @@ msgstr "" msgid "High power" msgstr "Vys. vykon" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1128,6 +1140,11 @@ msgstr "Teraz odstrante testovaci vytlacok z platne." msgid "Nozzle" msgstr "Tryska" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_sl.po b/lang/po/Firmware_sl.po index 3e3c5cc4b..dd5f8d588 100644 --- a/lang/po/Firmware_sl.po +++ b/lang/po/Firmware_sl.po @@ -601,6 +601,13 @@ msgstr "" msgid "Flow" msgstr "" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -714,6 +721,11 @@ msgstr "" msgid "High power" msgstr "" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1103,6 +1115,11 @@ msgstr "" msgid "Nozzle" msgstr "" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." diff --git a/lang/po/Firmware_sv.po b/lang/po/Firmware_sv.po index 03639995a..d6dbd119b 100644 --- a/lang/po/Firmware_sv.po +++ b/lang/po/Firmware_sv.po @@ -617,6 +617,13 @@ msgstr "Åtgärda problemet och tryck sedan på knappen på MMU-enheten." msgid "Flow" msgstr "Flöde" +#. MSG_NOZZLE_CNG_READ_HELP c=20 r=4 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:1019 +msgid "" +"For a Nozzle change please read\n" +"prusa.io/nozzle-mk3s" +msgstr "" + #. MSG_SELFTEST_PART_FAN c=20 #: ../../Firmware/messages.cpp:83 ../../Firmware/ultralcd.cpp:7026 #: ../../Firmware/ultralcd.cpp:7179 ../../Firmware/ultralcd.cpp:7184 @@ -739,6 +746,11 @@ msgstr "" msgid "High power" msgstr "Hög kraft" +#. MSG_NOZZLE_CNG_CHANGED c=20 r=6 +#: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 +msgid "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "" + #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 #: ../../Firmware/ultralcd.cpp:7351 @@ -1133,6 +1145,11 @@ msgstr "Ta nu bort testutskriften från metallskivan." msgid "Nozzle" msgstr "Munstycke" +#. MSG_NOZZLE_CNG_MENU c=18 +#: ../../Firmware/messages.cpp:173 ../../Firmware/ultralcd.cpp:4580 +msgid "Nozzle change" +msgstr "" + #. MSG_NOZZLE_DIAMETER c=10 #: ../../Firmware/messages.cpp:133 ../../Firmware/ultralcd.cpp:4565 msgid "Nozzle d." From 8261712635728b5560d67f1e3efb509e3f86aa78 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Thu, 24 Nov 2022 16:15:51 +0100 Subject: [PATCH 2/4] Fix recursion --- Firmware/ultralcd.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 2015ef028..d2589aef8 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -839,6 +839,7 @@ void print_stop(); void lcd_commands() { + // printf_P(PSTR("lcd_commands begin, lcd_commands_type=%u, lcd_commands_step=%u\n"), (uint8_t)lcd_commands_type, lcd_commands_step); if (planner_aborted) { // we are still within an aborted command. do not process any LCD command until we return return; @@ -1072,7 +1073,10 @@ void lcd_commands() lcd_commands_step = 3; break; case 3: + lcd_update_enabled = false; //hack to avoid lcd_update recursion. lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP)); + lcd_update_enabled = true; + lcd_draw_update = 2; //force lcd clear and update after the stack unwinds. enquecommand_P(PSTR("G28W")); enquecommand_P(PSTR("G1 X125 Y10 Z150 F1000")); enquecommand_P(PSTR("M109 S280")); @@ -1089,6 +1093,7 @@ void lcd_commands() //|tightend to specs? //| Yes No enquecommand_P(PSTR("M84 XY")); + lcd_update_enabled = false; //hack to avoid lcd_update recursion. if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_NOZZLE_CNG_CHANGED), false) == LCD_LEFT_BUTTON_CHOICE) { #ifdef TEMP_MODEL //enquecommand_P(PSTR("M310 S1")); @@ -1098,6 +1103,7 @@ void lcd_commands() setTargetHotendSafe(0,0); lcd_commands_step = 1; } + lcd_update_enabled = true; break; case 1: lcd_setstatuspgm(MSG_WELCOME); From ade8a87a3fed650d0630d9be803cea95ceab98df Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 30 Nov 2022 10:17:28 +0100 Subject: [PATCH 3/4] fullscreen message: use \n to force the next word on the next line Useful for printing short URLs since those contain punctuation characters, which get treated at the end of a word under usual circumstances --- Firmware/ultralcd.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d2589aef8..6549cc3e5 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -3135,6 +3135,11 @@ static const char* lcd_display_message_fullscreen_nonBlocking_P(const char *msg, char c = char(pgm_read_byte(msg)); if (c == '~') c = ' '; + else if (c == '\n') { + // Abort early if '\n' is encontered. + // This character is used to force the following words to be printed on the next line. + break; + } lcd_print(c); } } From 7a42af1ba60b08b397a2ec21db5b3a914f234330 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 30 Nov 2022 15:01:24 +0100 Subject: [PATCH 4/4] Update internal translations Fix G28 W --- Firmware/ultralcd.cpp | 2 +- lang/po/Firmware_cs.po | 4 ++-- lang/po/Firmware_de.po | 4 +--- lang/po/Firmware_es.po | 5 ++--- lang/po/Firmware_fr.po | 4 ++-- lang/po/Firmware_pl.po | 2 +- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 6549cc3e5..50c334ef2 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1077,7 +1077,7 @@ void lcd_commands() lcd_show_fullscreen_message_and_wait_P(_T(MSG_NOZZLE_CNG_READ_HELP)); lcd_update_enabled = true; lcd_draw_update = 2; //force lcd clear and update after the stack unwinds. - enquecommand_P(PSTR("G28W")); + enquecommand_P(PSTR("G28 W")); enquecommand_P(PSTR("G1 X125 Y10 Z150 F1000")); enquecommand_P(PSTR("M109 S280")); #ifdef TEMP_MODEL diff --git a/lang/po/Firmware_cs.po b/lang/po/Firmware_cs.po index 7d9d480f3..8048f2041 100644 --- a/lang/po/Firmware_cs.po +++ b/lang/po/Firmware_cs.po @@ -624,7 +624,7 @@ msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" -"Pro výměnu trysek si přečtěte\n" +"Instrukce pro výměnu trysky najdete na\n" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 @@ -751,7 +751,7 @@ msgstr "Vys. vykon" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Hotend při 280C! Tryska vyměněna a dotažena podle specifikací?" +msgstr "Hotend má 280C! Tryska vyměněna a dotažena dle instrukcí?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 diff --git a/lang/po/Firmware_de.po b/lang/po/Firmware_de.po index bacbecd9d..47fb7bd74 100644 --- a/lang/po/Firmware_de.po +++ b/lang/po/Firmware_de.po @@ -753,9 +753,7 @@ msgstr "Hohe leist" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "" -"Hotend bei 280C! Wurde die Düse ausgetauscht und entsprechend den " -"Spezifikationen angezogen?" +msgstr "Hotend bei 280C! Düse gewechselt, gemäß Spezifikation angezogen?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 diff --git a/lang/po/Firmware_es.po b/lang/po/Firmware_es.po index b773610b0..e7392d89c 100644 --- a/lang/po/Firmware_es.po +++ b/lang/po/Firmware_es.po @@ -624,7 +624,7 @@ msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" -"Para un cambio de boquilla por fa. lea\n" +"Para un cambio de boquilla, lee\n" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 @@ -752,8 +752,7 @@ msgstr "Rend.pleno" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Calentador a 280C! Se ha cambiado la boquilla y se ha ajustado a " -"las especificaciones?" +msgstr "Fusor a 280C! Boquilla cambiado y ajust. a la medida?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 diff --git a/lang/po/Firmware_fr.po b/lang/po/Firmware_fr.po index c9559f4b9..353141833 100644 --- a/lang/po/Firmware_fr.po +++ b/lang/po/Firmware_fr.po @@ -626,7 +626,7 @@ msgid "" "For a Nozzle change please read\n" "prusa.io/nozzle-mk3s" msgstr "" -"For a Nozzle change please read\n" +"Pour un changement de buse, lire\n" "prusa.io/nozzle-mk3s" #. MSG_SELFTEST_PART_FAN c=20 @@ -756,7 +756,7 @@ msgstr "Haut.puiss" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Hotend at 280C! Nozzle changed and tightened to specs?" +msgstr "Hotend à 280C! Buse changée et resserrée aux spécifications?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145 diff --git a/lang/po/Firmware_pl.po b/lang/po/Firmware_pl.po index 4a2535dfc..b77e13799 100644 --- a/lang/po/Firmware_pl.po +++ b/lang/po/Firmware_pl.po @@ -749,7 +749,7 @@ msgstr "Wysoka wyd" #. MSG_NOZZLE_CNG_CHANGED c=20 r=6 #: ../../Firmware/messages.cpp:174 ../../Firmware/ultralcd.cpp:1036 msgid "Hotend at 280C! Nozzle changed and tightened to specs?" -msgstr "Hotend w temperaturze 280C! Wymieniona dysza i dokręcona do specyfikacji?" +msgstr "Hotend rozgrzany do 280°C! Dysza wymieniona i dokręcona wg specyfikacji?" #. MSG_HOTEND_FAN_SPEED c=15 #: ../../Firmware/messages.cpp:35 ../../Firmware/ultralcd.cpp:1145